Skip to content

Commit

Permalink
4.5.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
sjro committed Apr 6, 2023
2 parents 43615cc + d41b7e1 commit 02d10e6
Show file tree
Hide file tree
Showing 68 changed files with 691 additions and 527 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ raw/**
**/dist/**
**/node_modules/**
static/**
src/html.js
17 changes: 10 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
dist: focal
language: node_js
node_js:
- 12
- lts/*
- node
sudo: false
cache:
directories:
- $(npm config get cache)
install:
- npm config set prefer-offline true
- npm install -g @enact/cli
- npm config set prefer-offline false
- git clone --branch=develop --depth 1 https://github.com/enactjs/cli ../cli
- pushd ../cli
- npm install
- npm link
- popd
- npm install --legacy-peer-deps
script:
- echo -e "\x1b\x5b35;1m*** Linting docs...\x1b\x5b0m"
- enact lint -- --max-warnings 0 .
- npm run lint -- -- --report-unused-disable-directives --max-warnings 0 .
- echo -e "\x1b\x5b35;1m*** Linting complete\x1b\x5b0m"
- echo -e "\x1b\x5b35;1m*** Parsing docs...\x1b\x5b0m"
- npm run parse
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Change Log

The following is a curated list of changes in the Enact docs-utils module, newest changes on the top.

## [4.5.0] - 2023-04-06

- Changed to require node 14 or later

12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ files and in-line documentation in JSDoc-style format.

## Building

> Note: Requires Node 10.10+
> Note: Requires Node 14+
Before serving or building documentation, you must first run the `parse` command to generate the
documentation from the Enact source:
Expand All @@ -14,6 +14,12 @@ documentation from the Enact source:
npm run parse
```

Additional repos can be pulled into the docs using the `extra-repos` command line argument:

```
e.g. npm run parse -- --extra-repos enactjs/agate#develop,enactjs/moonstone#3.2.5
```

Then, the docs site can be built in a 'debug' server mode or as a standalone static site. For testing,
use the `serve` command:

Expand All @@ -27,10 +33,6 @@ To produce the final documentation, build a static site with the `build` command
npm run build
```

## Caveats

Doc building currently only works on Mac or Linux filesystems.

## Linking Enact and Related Libraries

Copies of the source of Enact and other related libraries are placed into the `raw/` directory. If you need to link local copies, link them into that directory. E.g.:
Expand Down
38 changes: 37 additions & 1 deletion gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,22 @@ module.exports = {
title: 'Enact'
},
plugins: [
{
resolve: `gatsby-plugin-google-gtag`,
options: {
// You can add multiple tracking ids and a pageview event will be fired for all of them.
trackingIds: [
"G-ZNPW7ST2D8" // Google Analytics / GA
],
// This object is used for configuration specific to this plugin
pluginConfig: {
// Puts tracking script in the head instead of the body
head: false,
// Setting this parameter is also optional
respectDNT: true
}
}
},
{
resolve: 'gatsby-source-filesystem',
options: {
Expand Down Expand Up @@ -48,7 +64,27 @@ module.exports = {
pathToConfigModule: 'src/utils/typography.js'
}
},
'gatsby-plugin-less',
{
resolve: `gatsby-plugin-less`,
options: {
cssLoaderOptions: {
modules: {
namedExport: false
}
}
}
},
{
resolve: `gatsby-plugin-postcss`,
options: {
cssLoaderOptions: {
modules: {
namedExport: false
}
}
}
},
'gatsby-plugin-image',
'gatsby-plugin-sharp',
'gatsby-plugin-catch-links',
'gatsby-transformer-javascript-frontmatter',
Expand Down
14 changes: 10 additions & 4 deletions gatsby-node.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint-env node */
// const GracefulFSPlugin = require('graceful-fs-webpack-plugin');
// const autoprefixer = require('autoprefixer');
// const FilterWarningsPlugin = require("webpack-filter-warnings-plugin");
const webpack = require('webpack');
const crypto = require('crypto');
const path = require('path');
Expand All @@ -12,6 +13,7 @@ exports.onCreateWebpackConfig = ({
actions
}) => {
actions.setWebpackConfig({
devtool: 'eval-source-map',
module: {
rules: [
{
Expand All @@ -30,7 +32,11 @@ exports.onCreateWebpackConfig = ({
}
}),
ignore: () => new webpack.IgnorePlugin(/^(xor|props)$/)
})
})/* ,
new FilterWarningsPlugin({
exclude:
/mini-css-extract-plugin[^]*Conflicting order. Following module has been added:/
}), */
]
});
};
Expand Down Expand Up @@ -73,10 +79,10 @@ exports.onCreateBabelConfig = ({actions}) => {
actions.setBabelPlugin({
name: '@babel/plugin-transform-react-jsx',
options: {
runtime: 'automatic',
},
runtime: 'automatic'
}
});
};
};

function createSlug ({relativePath}) {
let slug;
Expand Down
129 changes: 64 additions & 65 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,80 +1,79 @@
{
"name": "docs",
"description": "Enact JavaScript Framework Docs",
"version": "4.0.1",
"version": "4.5.0",
"engines": {
"node": ">=8.0.0"
"node": ">=14"
},
"dependencies": {
"@enact/core": "^4.0.0-alpha.1",
"@enact/docs-utils": "^0.3.5",
"@enact/ui": "^4.0.0-alpha.1",
"@primer/octicons": "^9.1.1",
"babel-plugin-dev-expression": "^0.2.2",
"broken-link-checker": "^0.7.3",
"chalk": "^2.4.2",
"chokidar": "^1.6.1",
"chroma-js": "^0.7.2",
"classnames": "^2.2.5",
"color-pairs-picker": "^1.3.5",
"create-react-class": "^15.6.0",
"css-loader": "^3.2.0",
"@enact/core": "^4.6.0",
"@enact/docs-utils": "^0.4.0",
"@enact/ui": "^4.6.0",
"@primer/octicons": "^17.10.2",
"babel-plugin-dev-expression": "^0.2.3",
"broken-link-checker": "^0.7.8",
"chokidar": "^3.5.3",
"chroma-js": "^2.4.2",
"classnames": "^2.3.2",
"color-pairs-picker": "^1.3.6",
"create-react-class": "^15.7.0",
"css-loader": "^6.7.3",
"elasticlunr": "^0.9.5",
"find-cache-dir": "^0.1.1",
"gatsby": "^2.20.23",
"gatsby-plugin-catch-links": "^2.1.5",
"gatsby-plugin-google-analytics": "^2.1.11",
"gatsby-plugin-less": "^3.0.2",
"gatsby-plugin-manifest": "^2.0.0",
"gatsby-plugin-offline": "^3.0.2",
"gatsby-plugin-react-helmet": "^3.1.6",
"gatsby-plugin-sharp": "^2.2.18",
"gatsby-plugin-typography": "^2.3.5",
"gatsby-remark-autolink-headers": "^2.1.8",
"gatsby-remark-copy-linked-files": "^2.1.13",
"find-cache-dir": "^3.3.2",
"gatsby": "^4.25.4",
"gatsby-plugin-catch-links": "^4.25.0",
"gatsby-plugin-google-gtag": "^4.25.0",
"gatsby-plugin-image": "^2.25.0",
"gatsby-plugin-less": "^6.25.0",
"gatsby-plugin-manifest": "^4.25.0",
"gatsby-plugin-offline": "^5.25.0",
"gatsby-plugin-postcss": "^5.25.0",
"gatsby-plugin-react-helmet": "^5.25.0",
"gatsby-plugin-sharp": "^4.25.0",
"gatsby-plugin-typography": "^4.25.0",
"gatsby-remark-autolink-headers": "^5.25.0",
"gatsby-remark-copy-linked-files": "^5.25.0",
"gatsby-remark-embed-youtube": "0.0.7",
"gatsby-remark-images": "^3.1.19",
"gatsby-remark-prismjs": "^3.3.9",
"gatsby-remark-responsive-iframe": "^2.2.10",
"gatsby-remark-smartypants": "^2.1.5",
"gatsby-source-filesystem": "^2.1.18",
"gatsby-transformer-javascript-frontmatter": "^2.1.5",
"gatsby-transformer-json": "^2.2.6",
"gatsby-transformer-remark": "^2.6.19",
"global-modules": "^0.2.3",
"gray-matter": "^4.0.2",
"json-loader": "^0.5.4",
"jsonata": "^1.6.4",
"jsonfile": "^3.0.0",
"less": "~3.9.0",
"less-loader": "^5.0.0",
"lodash": "^4.17.20",
"markdown-it": "^9.1.0",
"gatsby-remark-images": "^6.25.0",
"gatsby-remark-prismjs": "^6.25.0",
"gatsby-remark-responsive-iframe": "^5.25.0",
"gatsby-remark-smartypants": "^5.25.0",
"gatsby-source-filesystem": "^4.25.0",
"gatsby-transformer-javascript-frontmatter": "^4.25.0",
"gatsby-transformer-json": "^4.25.0",
"gatsby-transformer-remark": "^5.25.1",
"global-modules": "^2.0.0",
"gray-matter": "^4.0.3",
"json-loader": "^0.5.7",
"jsonata": "^1.8.6",
"jsonfile": "^6.1.0",
"less": "~4.1.3",
"less-loader": "^11.1.0",
"lodash": "^4.17.21",
"markdown-it": "^13.0.1",
"markdown-it-jsx": "^1.1.0",
"markdown-toc": "^1.2.0",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
"postcss": "^7.0.17",
"postcss-loader": "^3.0.0",
"prismjs": "^1.15.0",
"progress": "~1.1.8",
"prop-types": "^15.6.1",
"ramda": "^0.25.0",
"react": "^17.0.1",
"react-document-title": "^2.0.1",
"react-dom": "^17.0.1",
"react-helmet": "^5.2.1",
"react-motion": "^0.1.0",
"react-responsive-grid": "^0.3.3",
"react-typography": "^0.16.19",
"readdirp": "^2.1.0",
"recompose": "^0.26.0",
"shelljs": "^0.7.5",
"typography": "^0.16.19",
"typography-plugin-code": "^0.16.11"
"minimist": "^1.2.7",
"mkdirp": "^1.0.4",
"postcss": "^8.4.21",
"postcss-loader": "^7.0.2",
"prismjs": "^1.29.0",
"progress": "~2.0.3",
"prop-types": "^15.8.1",
"ramda": "^0.28.0",
"react": "^18.2.0",
"react-document-title": "^2.0.3",
"react-dom": "^18.2.0",
"react-helmet": "^6.1.0",
"react-responsive-grid": "^0.3.4",
"react-typography": "^0.16.23",
"readdirp": "^3.6.0",
"shelljs": "^0.8.5",
"typography": "^0.16.21",
"typography-plugin-code": "^0.16.20"
},
"devDependencies": {
"eslint-config-enact-proxy": "^1.0.0"
"eslint-config-enact-proxy": "^1.0.5"
},
"eslintConfig": {
"extends": "enact-proxy/strict"
Expand Down
20 changes: 10 additions & 10 deletions sample-runner/agate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@
"theme": "agate"
},
"eslintConfig": {
"extends": "enact"
"extends": "enact-proxy"
},
"eslintIgnore": [
"node_modules/*",
"build/*",
"dist/*"
],
"dependencies": {
"@enact/core": "^4.0.0-alpha.1",
"@enact/i18n": "^4.0.0-alpha.1",
"@enact/core": "^4.6.0",
"@enact/i18n": "^4.6.0",
"@enact/agate": "enactjs/agate#develop",
"@enact/spotlight": "^4.0.0-alpha.1",
"@enact/ui": "^4.0.0-alpha.1",
"ilib": "^14.4.0",
"prop-types": "^15.6.2",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-live": "^1.11.0"
"@enact/spotlight": "^4.6.0",
"@enact/ui": "^4.6.0",
"ilib": "^14.15.1",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-live": "^3.1.1"
}
}
2 changes: 1 addition & 1 deletion sample-runner/agate/src/App/App.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {on, off} from '@enact/core/dispatcher';
import { Component } from 'react';
import {Component} from 'react';

import MainPanel from '../../../shared/MainPanel';

Expand Down
6 changes: 0 additions & 6 deletions sample-runner/agate/src/EnactImporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import DateTimePicker from '@enact/agate/DateTimePicker';
import Drawer from '@enact/agate/Drawer';
import Dropdown from '@enact/agate/Dropdown';
import FanSpeedControl from '@enact/agate/FanSpeedControl';
import FullscreenPopup from '@enact/agate/FullscreenPopup';
import GridListImageItem from '@enact/agate/GridListImageItem';
import Header from '@enact/agate/Header';
import Heading from '@enact/agate/Heading';
import Icon from '@enact/agate/Icon';
Expand All @@ -27,7 +25,6 @@ import Item from '@enact/agate/Item';
import Keypad from '@enact/agate/Keypad';
import LabeledIcon from '@enact/agate/LabeledIcon';
import LabeledIconButton from '@enact/agate/LabeledIconButton';
import LabeledItem from '@enact/agate/LabeledItem';
import Marquee from '@enact/agate/Marquee';
import MediaPlayer from '@enact/agate/MediaPlayer';
import Panels from '@enact/agate/Panels';
Expand Down Expand Up @@ -78,8 +75,6 @@ const agateExports = {
Drawer,
Dropdown,
FanSpeedControl,
FullscreenPopup,
GridListImageItem,
Header,
Heading,
Icon,
Expand All @@ -91,7 +86,6 @@ const agateExports = {
Keypad,
LabeledIcon,
LabeledIconButton,
LabeledItem,
Marquee,
MediaPlayer,
Panels,
Expand Down
Loading

0 comments on commit 02d10e6

Please sign in to comment.