4.7.0 release

sjro · sjro · commit 2fdd529071e3 · 2023-06-21T14:22:58.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ dist: focal
 language: node_js
 node_js:
     - lts/*
-    #- node
+    - node
 sudo: false
 install:
     - npm config set prefer-offline false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 The following is a curated list of changes in the Enact docs-utils module, newest changes on the top.
 
+## [4.7.0] - 2023-05-23
+
+- Changed to require node 18 or later.
+- Updated `gatsby` version to ^5.8.0.
+
 ## [4.6.0] - 2023-05-23
 
 - Updated `jsonata` version to ^2.0.2.
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "docs",
   "description": "Enact JavaScript Framework Docs",
-  "version": "4.5.0",
+  "version": "4.7.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "dependencies": {
     "@enact/core": "^4.6.2",
@@ -20,28 +20,28 @@
     "css-loader": "^6.7.3",
     "elasticlunr": "^0.9.5",
     "find-cache-dir": "^3.3.2",
-    "gatsby": "^4.25.6",
-    "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.1",
-    "gatsby-plugin-typography": "^4.25.0",
-    "gatsby-remark-autolink-headers": "^5.25.0",
-    "gatsby-remark-copy-linked-files": "^5.25.0",
+    "gatsby": "^5.8.0",
+    "gatsby-plugin-catch-links": "^5.8.0",
+    "gatsby-plugin-google-gtag": "^5.8.0",
+    "gatsby-plugin-image": "^3.8.0",
+    "gatsby-plugin-less": "^7.8.0",
+    "gatsby-plugin-manifest": "^5.8.0",
+    "gatsby-plugin-offline": "^6.8.0",
+    "gatsby-plugin-postcss": "^6.8.0",
+    "gatsby-plugin-react-helmet": "^6.8.0",
+    "gatsby-plugin-sharp": "^5.8.1",
+    "gatsby-plugin-typography": "^5.8.0",
+    "gatsby-remark-autolink-headers": "^6.8.0",
+    "gatsby-remark-copy-linked-files": "^6.8.0",
     "gatsby-remark-embed-youtube": "0.0.7",
-    "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",
+    "gatsby-remark-images": "^7.8.0",
+    "gatsby-remark-prismjs": "^7.8.0",
+    "gatsby-remark-responsive-iframe": "^6.8.0",
+    "gatsby-remark-smartypants": "^6.8.0",
+    "gatsby-source-filesystem": "^5.8.0",
+    "gatsby-transformer-javascript-frontmatter": "^5.8.0",
+    "gatsby-transformer-json": "^5.8.0",
+    "gatsby-transformer-remark": "^6.8.0",
     "global-modules": "^2.0.0",
     "gray-matter": "^4.0.3",
     "json-loader": "^0.5.7",
diff --git a/sample-runner/agate/package.json b/sample-runner/agate/package.json
@@ -39,6 +39,6 @@
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-live": "^3.1.1"
+    "react-live": "^4.1.2"
   }
 }
diff --git a/sample-runner/core/package.json b/sample-runner/core/package.json
@@ -35,6 +35,6 @@
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-live": "^3.1.1"
+    "react-live": "^4.1.2"
   }
 }
diff --git a/sample-runner/moonstone/package.json b/sample-runner/moonstone/package.json
@@ -39,6 +39,6 @@
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-live": "^3.1.1"
+    "react-live": "^4.1.2"
   }
 }
diff --git a/sample-runner/sandstone/package.json b/sample-runner/sandstone/package.json
@@ -39,6 +39,6 @@
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-live": "^3.1.1"
+    "react-live": "^4.1.2"
   }
 }
diff --git a/src/pages/docs/developer-guide/index.js b/src/pages/docs/developer-guide/index.js
@@ -59,12 +59,10 @@ export const devGuideQuery = graphql`
 		guidesList: allMarkdownRemark(
 			filter:{
 				fields:{
-					slug: {regex: "/docs\\/developer-guide\\/[^/]*\/$/"}
+					slug: {regex: "/docs\\/developer-guide\\/[^/]*/$/"}
 				}
 			},
-			sort: {
-				fields: [frontmatter___order, frontmatter___title], order: ASC
-			}
+			sort: [{frontmatter: {order: ASC}}, {frontmatter: {title: ASC}}]
 		) {
 			...pageFields
 		}
diff --git a/src/pages/docs/developer-tools/index.js b/src/pages/docs/developer-tools/index.js
@@ -59,12 +59,10 @@ export const devToolsQuery = graphql`
 		toolsList: allMarkdownRemark(
 			filter:{
 				fields:{
-					slug: {regex: "/docs\\/developer-tools\\/[^/]*\/$/"}
+					slug: {regex: "/docs\\/developer-tools\\/[^/]*/$/"}
 				}
 			},
-			sort: {
-				fields: [frontmatter___order, frontmatter___title], order: ASC
-			}
+			sort: [{frontmatter: {order: ASC}}, {frontmatter: {title: ASC}}]
 		) {
 			...pageFields
 		}
diff --git a/src/pages/docs/index.js b/src/pages/docs/index.js
@@ -142,16 +142,14 @@ export const pageQuery = graphql`
 		guidesList: allMarkdownRemark(
 			filter:{
 				fields:{
-					slug: {regex: "/docs\\/developer-guide\\/[^/]*\/$/"}
+					slug: {regex: "/docs\\/developer-guide\\/[^/]*/$/"}
 				}
 			},
-			sort: {
-				fields: [frontmatter___order, frontmatter___title], order: ASC
-			}
+			sort: [{frontmatter: {order: ASC}}, {frontmatter: {title: ASC}}]
 		) {
 			...pageFields
 		}
-		modulesList: allJsonDoc(sort: {fields: [fields___slug], order: ASC}) {
+		modulesList: allJsonDoc(sort: {fields: {slug: ASC}}) {
 			edges {
 				node {
 					fields {
@@ -163,24 +161,20 @@ export const pageQuery = graphql`
 		toolsList: allMarkdownRemark(
 			filter:{
 				fields:{
-					slug: {regex: "/docs\\/developer-tools\\/[^/]*\/$/"}
+					slug: {regex: "/docs\\/developer-tools\\/[^/]*/$/"}
 				}
 			},
-			sort: {
-				fields: [frontmatter___order, frontmatter___title], order: ASC
-			}
+			sort: [{frontmatter: {order: ASC}}, {frontmatter: {title: ASC}}]
 		) {
 			...pageFields
 		}
 		tutorialsList: allMarkdownRemark(
 			filter:{
 				fields:{
-					slug: {regex: "/docs\\/tutorials\\/[^/]*\/$/"}
+					slug: {regex: "/docs\\/tutorials\\/[^/]*/$/"}
 				}
 			},
-			sort: {
-				fields: [frontmatter___order, frontmatter___title], order: ASC
-			}
+			sort: [{frontmatter: {order: ASC}}, {frontmatter: {title: ASC}}]
 		) {
 			...pageFields
 		}
diff --git a/src/pages/docs/modules/index.js b/src/pages/docs/modules/index.js
@@ -1,6 +1,5 @@
-import {graphql} from 'gatsby';
-import {withPrefix} from 'gatsby-link';
-import {StaticImage as Image} from "gatsby-plugin-image";
+import {graphql, withPrefix} from 'gatsby';
+import {StaticImage as Image} from 'gatsby-plugin-image';
 import PropTypes from 'prop-types';
 import {Component} from 'react';
 import {Helmet} from 'react-helmet';
@@ -89,7 +88,7 @@ const Doc = class ReduxDocList extends Component {
 export const jsonQuery = graphql`
 	query modulesDoc {
 		modulesList: allJsonDoc(
-			sort: {fields: [fields___slug], order: ASC}
+			sort: {fields: {slug: ASC}}
 		) {
 			edges {
 				node {
diff --git a/src/pages/docs/tutorials/index.js b/src/pages/docs/tutorials/index.js
@@ -1,6 +1,6 @@
 import {Column} from '@enact/ui/Layout';
 import {graphql} from 'gatsby';
-import {StaticImage as Image} from "gatsby-plugin-image";
+import {StaticImage as Image} from 'gatsby-plugin-image';
 import PropTypes from 'prop-types';
 import {Component} from 'react';
 import {Helmet} from 'react-helmet';
@@ -80,9 +80,7 @@ export const tutorialsQuery = graphql`
 					slug: {regex: "/docs\\/tutorials\\/[^/]*\/$/"}
 				}
 			},
-			sort: {
-				fields: [frontmatter___order, frontmatter___title], order: ASC
-			}
+			sort: [{frontmatter: {order: ASC}}, {frontmatter: {title: ASC}}]
 		) {
 			...pageFields
 		}
diff --git a/src/pages/docs/tutorials/setup/index.md b/src/pages/docs/tutorials/setup/index.md
@@ -7,7 +7,7 @@ Enact provides a handy command-line tool (the [Enact CLI](https://www.npmjs.com/
 
 ## Prerequisites
 
-Before the Enact framework can function on your computer, it is necessary to install some software. The most important piece is the [Node JavaScript runtime](https://nodejs.org) version 10.10 or newer (you can check to see what version of Node is installed by typing `node --version` into your command prompt or terminal window).  If needed, follow the instructions on the site to install it.
+Before the Enact framework can function on your computer, it is necessary to install some software. The most important piece is the [Node JavaScript runtime](https://nodejs.org) version 18 or newer (you can check to see what version of Node is installed by typing `node --version` into your command prompt or terminal window).  If needed, follow the instructions on the site to install it.
 
 ## Installing Enact CLI
 
@@ -17,7 +17,7 @@ The Enact CLI provides a set of commands to ease creation, testing, maintenance,
 npm install -g @enact/cli
 ```
 
-Once installed, you can run `enact` from anywhere to run a command.
+Once installed, run `enact -v` to see the Enact CLI version. You can run `enact` from anywhere to run a command.
 
 > We'll cover some of the available commands below but the [package README](https://github.com/enactjs/cli/blob/master/README.md) contains further detail.
 
diff --git a/src/templates/json.js b/src/templates/json.js
@@ -77,7 +77,7 @@ export const jsonQuery = graphql`
 				content
 			}
 		}
-		modulesList: allJsonDoc(sort: {fields: [fields___slug], order: ASC}) {
+		modulesList: allJsonDoc(sort: {fields: {slug: ASC}}) {
 			edges {
 				node {
 					fields {
diff --git a/src/templates/markdown.js b/src/templates/markdown.js
@@ -77,13 +77,10 @@ export const pageQuery = graphql`
 		allMarkdownRemark(
 			filter: {
 				fields: {
-					slug: {regex: $parentRegex }
+					slug: {regex: $parentRegex}
 				}
 			},
-			sort: {
-				fields: [frontmatter___order, frontmatter___title],
-				order: ASC
-			}
+			sort: [{frontmatter: {order: ASC}}, {frontmatter: {title: ASC}}]
 		) {
 			edges {
 				node {

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,6 @@`
`39`	`39`	`"prop-types": "^15.8.1",`
`40`	`40`	`"react": "^18.2.0",`
`41`	`41`	`"react-dom": "^18.2.0",`
`42`		`- "react-live": "^3.1.1"`
	`42`	`+ "react-live": "^4.1.2"`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@`
`35`	`35`	`"prop-types": "^15.8.1",`
`36`	`36`	`"react": "^18.2.0",`
`37`	`37`	`"react-dom": "^18.2.0",`
`38`		`- "react-live": "^3.1.1"`
	`38`	`+ "react-live": "^4.1.2"`
`39`	`39`	`}`
`40`	`40`	`}`