From 78a9505da6fba9192de5861041fe4eae4962adb7 Mon Sep 17 00:00:00 2001 From: Logan Allred Date: Thu, 15 May 2025 09:00:16 -0600 Subject: [PATCH 1/5] rename babel proposals to transforms --- CHANGELOG-FRONTIER.md | 6 ++ package-lock.json | 96 +++++++++---------- packages/react-scripts/.nvmrc | 2 +- .../config/simple-webpack.config.js | 10 +- packages/react-scripts/package.json | 6 +- 5 files changed, 58 insertions(+), 62 deletions(-) diff --git a/CHANGELOG-FRONTIER.md b/CHANGELOG-FRONTIER.md index 937cb1dce6e..e527cf24a0b 100644 --- a/CHANGELOG-FRONTIER.md +++ b/CHANGELOG-FRONTIER.md @@ -1,3 +1,9 @@ +## 8.10.7 + +- Rename released proposal plugins to transform plugins +- Update babel-preset-frontier to latest with transform renames +- Update to Node 20 + ## 8.10.6 - Add optional override to "title" in layout.ejs diff --git a/package-lock.json b/package-lock.json index e6ec54f4682..4ff50ee02b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1093,26 +1093,6 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-proposal-object-rest-spread": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz", - "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==", - "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.", - "license": "MIT", - "dependencies": { - "@babel/compat-data": "^7.20.5", - "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.20.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-proposal-optional-chaining": { "version": "7.21.0", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz", @@ -1148,25 +1128,6 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.21.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz", - "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==", - "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.", - "license": "MIT", - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-create-class-features-plugin": "^7.21.0", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-syntax-async-generators": { "version": "7.8.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", @@ -5245,21 +5206,20 @@ "license": "MIT" }, "node_modules/@fs/babel-preset-frontier": { - "version": "5.1.0", - "resolved": "https://familysearch.jfrog.io/artifactory/api/npm/fs-npm-prod-virtual/@fs/babel-preset-frontier/-/@fs/babel-preset-frontier-5.1.0.tgz", - "integrity": "sha512-aEa1gLkVhhC4ORRDniSKRNZYr1yWO3AB8w/+1CjGKLYJ+UW/ohT8kqG2SQ3UXaFgr1s4N2zfINx3PgTrLS86pA==", - "license": "ISC", + "version": "5.2.0-alpha.0", + "resolved": "https://familysearch.jfrog.io/artifactory/api/npm/fs-npm-prod-virtual/@fs/babel-preset-frontier/-/@fs/babel-preset-frontier-5.2.0-alpha.0.tgz", + "integrity": "sha512-KgBs5aq/1J2VJ5DMUSJnIZcrWmKF23UcGoGpke/zaSGANuTbST6V1luwkN4DGU0D+1qo8MI87qADwNv1PNNlCA==", "dependencies": { "@babel/core": "^7.16.0", - "@babel/plugin-proposal-class-properties": "^7.16.0", "@babel/plugin-proposal-decorators": "^7.16.4", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0", - "@babel/plugin-proposal-numeric-separator": "^7.16.0", - "@babel/plugin-proposal-object-rest-spread": "^7.16.0", - "@babel/plugin-proposal-optional-chaining": "^7.16.0", - "@babel/plugin-proposal-private-methods": "^7.16.0", - "@babel/plugin-proposal-private-property-in-object": "^7.16.0", + "@babel/plugin-transform-class-properties": "^7.16.0", "@babel/plugin-transform-flow-strip-types": "^7.16.0", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.16.0", + "@babel/plugin-transform-numeric-separator": "^7.16.0", + "@babel/plugin-transform-object-rest-spread": "^7.16.0", + "@babel/plugin-transform-optional-chaining": "^7.16.0", + "@babel/plugin-transform-private-methods": "^7.16.0", + "@babel/plugin-transform-private-property-in-object": "^7.16.0", "@babel/plugin-transform-react-display-name": "^7.16.0", "@babel/plugin-transform-react-jsx-self": "^7.16.0", "@babel/plugin-transform-react-jsx-source": "^7.16.0", @@ -5269,11 +5229,41 @@ "@babel/preset-typescript": "^7.16.0", "@babel/runtime": "^7.16.3", "@emotion/babel-preset-css-prop": "^10.0.9", - "babel-plugin-istanbul": "^6.1.1", + "babel-plugin-istanbul": "^7.0.0", "babel-plugin-macros": "^3.1.0", "babel-plugin-transform-react-remove-prop-types": "^0.4.24" } }, + "node_modules/@fs/babel-preset-frontier/node_modules/babel-plugin-istanbul": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz", + "integrity": "sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-instrument": "^6.0.2", + "test-exclude": "^6.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@fs/babel-preset-frontier/node_modules/istanbul-lib-instrument": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", + "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", + "dependencies": { + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@fs/binding-registry-client": { "version": "3.2.2", "resolved": "https://familysearch.jfrog.io/artifactory/api/npm/fs-npm-prod-virtual/@fs/binding-registry-client/-/@fs/binding-registry-client-3.2.2.tgz", @@ -41252,13 +41242,13 @@ }, "packages/react-scripts": { "name": "@fs/react-scripts", - "version": "8.10.5", + "version": "8.10.7", "license": "MIT", "dependencies": { "@babel/core": "^7.16.0", "@emotion/babel-plugin": "^11.13.5", "@fs/auth-middleware": "^2.0.1", - "@fs/babel-preset-frontier": "^5.0.0", + "@fs/babel-preset-frontier": "^5.2.0-alpha.0", "@fs/webpack-wci18n": "^1.0.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3", "@svgr/webpack": "^5.5.0", diff --git a/packages/react-scripts/.nvmrc b/packages/react-scripts/.nvmrc index b6a7d89c68e..209e3ef4b62 100644 --- a/packages/react-scripts/.nvmrc +++ b/packages/react-scripts/.nvmrc @@ -1 +1 @@ -16 +20 diff --git a/packages/react-scripts/config/simple-webpack.config.js b/packages/react-scripts/config/simple-webpack.config.js index 153bba94d73..2621626a92e 100644 --- a/packages/react-scripts/config/simple-webpack.config.js +++ b/packages/react-scripts/config/simple-webpack.config.js @@ -57,23 +57,23 @@ module.exports = { exclude: ['cypress/**/*.*', 'src/locales/**/*.*', 'src/**/fixtures/*.js'], }, ], - '@babel/plugin-proposal-optional-chaining', - '@babel/plugin-proposal-nullish-coalescing-operator', + '@babel/plugin-transform-optional-chaining', + '@babel/plugin-transform-nullish-coalescing-operator', 'babel-plugin-macros', [ - '@babel/plugin-proposal-class-properties', + '@babel/plugin-transform-class-properties', { loose: true, }, ], [ - '@babel/plugin-proposal-private-methods', + '@babel/plugin-transform-private-methods', { loose: true, }, ], [ - '@babel/plugin-proposal-private-property-in-object', + '@babel/plugin-transform-private-property-in-object', { loose: true, }, diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 31855227c05..e6c927fc04d 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@fs/react-scripts", - "version": "8.10.6", + "version": "8.10.7", "upstreamVersion": "5.0.1", "description": "Configuration and scripts for Create React App.", "repository": { @@ -10,7 +10,7 @@ }, "license": "MIT", "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" }, "bugs": { "url": "https://github.com/fs-webdev/create-react-app/issues" @@ -52,7 +52,7 @@ "@babel/core": "^7.16.0", "@emotion/babel-plugin": "^11.13.5", "@fs/auth-middleware": "^2.0.1", - "@fs/babel-preset-frontier": "^5.0.0", + "@fs/babel-preset-frontier": "^5.2.0", "@fs/webpack-wci18n": "^1.0.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3", "@svgr/webpack": "^5.5.0", From 97d033b3f42fbb8acf0d06eea6680dad511ec243 Mon Sep 17 00:00:00 2001 From: Logan Allred Date: Thu, 15 May 2025 09:30:39 -0600 Subject: [PATCH 2/5] consume new version --- package-lock.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4ff50ee02b3..1d1faa3325c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5206,9 +5206,10 @@ "license": "MIT" }, "node_modules/@fs/babel-preset-frontier": { - "version": "5.2.0-alpha.0", - "resolved": "https://familysearch.jfrog.io/artifactory/api/npm/fs-npm-prod-virtual/@fs/babel-preset-frontier/-/@fs/babel-preset-frontier-5.2.0-alpha.0.tgz", - "integrity": "sha512-KgBs5aq/1J2VJ5DMUSJnIZcrWmKF23UcGoGpke/zaSGANuTbST6V1luwkN4DGU0D+1qo8MI87qADwNv1PNNlCA==", + "version": "5.2.0", + "resolved": "https://familysearch.jfrog.io/artifactory/api/npm/fs-npm-prod-virtual/@fs/babel-preset-frontier/-/@fs/babel-preset-frontier-5.2.0.tgz", + "integrity": "sha512-qkvGiQE/w7UI8IizwAEmzsFBdiLGC/cYYIFXs/vZDffWtoRCnMRfa8x9aqiqr3P2EGLNNKayKY7yks2gaWWIxA==", + "license": "ISC", "dependencies": { "@babel/core": "^7.16.0", "@babel/plugin-proposal-decorators": "^7.16.4", @@ -41248,7 +41249,7 @@ "@babel/core": "^7.16.0", "@emotion/babel-plugin": "^11.13.5", "@fs/auth-middleware": "^2.0.1", - "@fs/babel-preset-frontier": "^5.2.0-alpha.0", + "@fs/babel-preset-frontier": "^5.2.0", "@fs/webpack-wci18n": "^1.0.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3", "@svgr/webpack": "^5.5.0", @@ -41337,7 +41338,7 @@ "typescript": "^4.4.4" }, "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" }, "optionalDependencies": { "fsevents": "^2.3.2" From 90c69e828e91e004a34f6ef0c1ecdd25b97e15fc Mon Sep 17 00:00:00 2001 From: Logan Allred Date: Thu, 15 May 2025 09:38:17 -0600 Subject: [PATCH 3/5] fix travis node version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c9daafb639e..5f6ccf16020 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - "16" + - "20" before_install: - git config --global url."https://git@".insteadOf git:// - echo -e "machine github.com\n login $CI_USER_TOKEN" > ~/.netrc From fe411175cc2937744ad2d1753bf21c2c0f0b992d Mon Sep 17 00:00:00 2001 From: Logan Allred Date: Thu, 15 May 2025 09:40:35 -0600 Subject: [PATCH 4/5] fix travis dist --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5f6ccf16020..ef33dd3b1c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: xenial language: node_js node_js: - "20" From ee882133f2812d48c73ca5298465e254864ad36b Mon Sep 17 00:00:00 2001 From: Logan Allred Date: Thu, 15 May 2025 09:45:54 -0600 Subject: [PATCH 5/5] fix travis again --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ef33dd3b1c4..bc6da2da20e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: xenial +dist: noble language: node_js node_js: - "20"