Skip to content

Commit c71da58

Browse files
justin808claude
andauthored
[codex] finish dependency consolidation and restore CI (#1402)
* chore(deps): consolidate all dependabot dependency updates Combines all 12 open dependabot PRs into a single update: Root (yarn.lock): - bump serialize-javascript from 6.0.1 to 6.0.2 - bump nanoid from 3.3.6 to 3.3.11 - bump postcss from 8.4.25 to 8.5.6 - bump webpack from 5.83.1 to 5.104.1 test/dummy: - bump js-yaml from 4.1.0 to 4.1.1 - bump node-forge from 1.3.1 to 1.3.3 - bump brace-expansion from 1.1.11 to 1.1.12 - bump webpack-dev-server from 4.13.1 to 5.2.1 - bump shakapacker from 7.2.0 to 9.5.0 - bump webpack from 5.76.3 to 5.104.1 react-builds: - bump webpack from 5.85.0 to 5.104.1 - bump qs from 6.11.2 to 6.14.2 Consolidates PRs: #1370, #1371, #1372, #1373, #1374, #1375, #1376, #1379, #1381, #1382, #1383, #1384 https://claude.ai/code/session_01VRfTFW5v4wn4nwMyyyxLYv * chore: regenerate build artifacts after dependency updates Rebuild react and ujs assets with updated webpack to ensure built files match the updated dependencies. https://claude.ai/code/session_01VRfTFW5v4wn4nwMyyyxLYv * Regenerate the React development bundle * Normalize the dummy app Yarn lockfile * Update react-builds polyfills for CI * Restore process polyfill in server bundle --------- Co-authored-by: Claude <noreply@anthropic.com>
1 parent c2006e3 commit c71da58

File tree

8 files changed

+2061
-1705
lines changed

8 files changed

+2061
-1705
lines changed

lib/assets/react-source/development/react-server.js

Lines changed: 12 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/assets/react-source/production/react-server.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

react-builds/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"create-react-class": "^15.6.2",
1111
"fast-text-encoding": "^1.0.6",
1212
"immutability-helper": "^2.4.0",
13-
"node-polyfill-webpack-plugin": "^2.0.1",
13+
"node-polyfill-webpack-plugin": "^4.1.0",
1414
"prop-types": "^15.6.0",
1515
"react": "^18.2.0",
1616
"react-dom": "^18.2.0",
17-
"webpack": "^5.74.0"
17+
"webpack": "^5.105.4"
1818
},
1919
"packageManager": "yarn@1.22.21"
2020
}

react-builds/webpack.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ module.exports = {
1515
plugins: [
1616
new NodePolyfillPlugin({
1717
excludeAliases: ['console', 'Buffer'],
18+
additionalAliases: ['process'],
1819
}),
1920
],
2021
};

react-builds/yarn.lock

Lines changed: 253 additions & 131 deletions
Large diffs are not rendered by default.

test/dummy/config/shakapacker.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ default: &default
55
source_entry_path: packs
66
public_output_path: packs
77
cache_path: tmp/cache/shakapacker
8+
assets_bundler: webpack
9+
javascript_transpiler: babel
810

911
# Additional paths webpack should lookup modules
1012
# ['app/assets', 'engine/foo/app/assets']

test/dummy/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@
1515
"babel-plugin-macros": "^3.1.0",
1616
"compression-webpack-plugin": "^9.2.0",
1717
"create-react-class": "^15.6.2",
18-
"css-loader": "^5.2.7",
18+
"css-loader": "^7.1.4",
1919
"css-minimizer-webpack-plugin": "^2.0.0",
20-
"mini-css-extract-plugin": "^1.6.2",
20+
"mini-css-extract-plugin": "^2.10.2",
2121
"pnp-webpack-plugin": "^1.7.0",
2222
"react": "^18.2.0",
2323
"react-dom": "^18.2.0",
2424
"react_ujs": "file:.yalc/react_ujs",
25-
"shakapacker": "7.2.0",
25+
"shakapacker": "9.7.0",
2626
"style-loader": "^3.3.1",
2727
"terser-webpack-plugin": "^5.3.3",
28-
"webpack": "^5.73.0",
28+
"webpack": "^5.105.4",
2929
"webpack-assets-manifest": "^5.1.0",
3030
"webpack-cli": "^4.9.2",
3131
"webpack-merge": "^5.8.0",
3232
"webpack-sources": "^3.2.3"
3333
},
3434
"devDependencies": {
35-
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
35+
"@pmmmwh/react-refresh-webpack-plugin": "^0.6.2",
3636
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
3737
"react-refresh": "^0.13.0",
38-
"webpack-dev-server": "^4.9.2"
38+
"webpack-dev-server": "^5.2.3"
3939
}
4040
}

test/dummy/yarn.lock

Lines changed: 1784 additions & 1554 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)