From c2caf2d972c2cd2b5d2bacf3b3445681f8d4d392 Mon Sep 17 00:00:00 2001 From: Daniel Rowe Date: Thu, 12 Dec 2024 08:28:54 -0800 Subject: [PATCH] update child packages Signed-off-by: Daniel Rowe --- packages/osd-ace/package.json | 2 +- .../package.json | 2 +- packages/osd-interpreter/package.json | 2 +- packages/osd-monaco/package.json | 3 +- packages/osd-monaco/webpack.config.js | 1 - packages/osd-optimizer/package.json | 1 - .../src/worker/webpack.config.ts | 1 - packages/osd-pm/package.json | 3 +- packages/osd-pm/webpack.config.js | 1 - packages/osd-ui-shared-deps/package.json | 3 +- packages/osd-ui-shared-deps/webpack.config.js | 1 - yarn.lock | 46 ------------------- 12 files changed, 6 insertions(+), 60 deletions(-) diff --git a/packages/osd-ace/package.json b/packages/osd-ace/package.json index 0778cbc40a12..9525663a3397 100644 --- a/packages/osd-ace/package.json +++ b/packages/osd-ace/package.json @@ -14,7 +14,7 @@ "@osd/babel-preset": "1.0.0", "raw-loader": "^4.0.2", "typescript": "4.0.2", - "webpack": "npm:@amoo-miki/webpack@4.46.0-xxhash.1" + "webpack": "^4.47.0" }, "@osd/pm": { "web": true diff --git a/packages/osd-eslint-import-resolver-opensearch-dashboards/package.json b/packages/osd-eslint-import-resolver-opensearch-dashboards/package.json index fe6b8a19bb73..6c4992bea069 100755 --- a/packages/osd-eslint-import-resolver-opensearch-dashboards/package.json +++ b/packages/osd-eslint-import-resolver-opensearch-dashboards/package.json @@ -19,6 +19,6 @@ "glob-all": "^3.2.1", "lru-cache": "^4.1.5", "resolve": "^1.7.1", - "webpack": "npm:@amoo-miki/webpack@4.46.0-xxhash.1" + "webpack": "^4.47.0" } } diff --git a/packages/osd-interpreter/package.json b/packages/osd-interpreter/package.json index 4bf4b61d9835..3755b8571f5d 100644 --- a/packages/osd-interpreter/package.json +++ b/packages/osd-interpreter/package.json @@ -31,7 +31,7 @@ "style-loader": "^1.1.3", "supports-color": "^7.0.0", "url-loader": "^2.2.0", - "webpack": "npm:@amoo-miki/webpack@4.46.0-xxhash.1", + "webpack": "^4.47.0", "webpack-cli": "^4.9.2" } } diff --git a/packages/osd-monaco/package.json b/packages/osd-monaco/package.json index 0c9a459d129b..a918a9d13c3d 100644 --- a/packages/osd-monaco/package.json +++ b/packages/osd-monaco/package.json @@ -13,7 +13,6 @@ "monaco-editor": "~0.17.0" }, "devDependencies": { - "@node-rs/xxhash": "^1.3.0", "@osd/babel-preset": "1.0.0", "@osd/dev-utils": "1.0.0", "babel-loader": "^8.2.3", @@ -22,7 +21,7 @@ "raw-loader": "^4.0.2", "supports-color": "^7.0.0", "typescript": "4.0.2", - "webpack": "npm:@amoo-miki/webpack@4.46.0-xxhash.1", + "webpack": "^4.47.0", "webpack-cli": "^4.9.2" } } diff --git a/packages/osd-monaco/webpack.config.js b/packages/osd-monaco/webpack.config.js index b111fcb2608d..1e3f108b95e5 100644 --- a/packages/osd-monaco/webpack.config.js +++ b/packages/osd-monaco/webpack.config.js @@ -36,7 +36,6 @@ const createLangWorkerConfig = (lang) => ({ output: { path: path.resolve(__dirname, 'target/public'), filename: `${lang}.editor.worker.js`, - hashFunction: 'Xxh64', }, resolve: { modules: ['node_modules'], diff --git a/packages/osd-optimizer/package.json b/packages/osd-optimizer/package.json index 835f7e09fd03..062c1cfe64a3 100644 --- a/packages/osd-optimizer/package.json +++ b/packages/osd-optimizer/package.json @@ -39,7 +39,6 @@ "webpack-merge": "^4.2.2" }, "devDependencies": { - "@node-rs/xxhash": "^1.3.0", "@types/babel__core": "^7.1.17", "@types/compression-webpack-plugin": "^6.0.6", "@types/loader-utils": "^1.1.3", diff --git a/packages/osd-optimizer/src/worker/webpack.config.ts b/packages/osd-optimizer/src/worker/webpack.config.ts index 1917b145a712..2a05a05eaaa5 100644 --- a/packages/osd-optimizer/src/worker/webpack.config.ts +++ b/packages/osd-optimizer/src/worker/webpack.config.ts @@ -69,7 +69,6 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker: info.absoluteResourcePath )}${info.query}`, jsonpFunction: `${bundle.id}_bundle_jsonpfunction`, - hashFunction: 'Xxh64', }, optimization: { diff --git a/packages/osd-pm/package.json b/packages/osd-pm/package.json index 226264b828e3..f86df6e6fdc2 100644 --- a/packages/osd-pm/package.json +++ b/packages/osd-pm/package.json @@ -16,7 +16,6 @@ "@babel/core": "^7.22.9", "@babel/preset-env": "^7.22.9", "@babel/preset-typescript": "^7.22.9", - "@node-rs/xxhash": "^1.3.0", "@osd/babel-preset": "1.0.0", "@osd/dev-utils": "1.0.0", "@types/cmd-shim": "^2.0.0", @@ -61,7 +60,7 @@ "tempy": "^0.3.0", "typescript": "4.0.2", "unlazy-loader": "^0.1.3", - "webpack": "npm:@amoo-miki/webpack@4.46.0-xxhash.1", + "webpack": "^4.47.0", "webpack-cli": "^4.9.2", "write-pkg": "^4.0.0" }, diff --git a/packages/osd-pm/webpack.config.js b/packages/osd-pm/webpack.config.js index fd8cdcbfde27..66b9e0a81ee4 100644 --- a/packages/osd-pm/webpack.config.js +++ b/packages/osd-pm/webpack.config.js @@ -41,7 +41,6 @@ module.exports = { path: path.resolve(__dirname, 'dist'), filename: '[name].js', libraryTarget: 'commonjs2', - hashFunction: 'Xxh64', }, resolve: { diff --git a/packages/osd-ui-shared-deps/package.json b/packages/osd-ui-shared-deps/package.json index 2249c83ef2b5..bd6bb7cf1902 100644 --- a/packages/osd-ui-shared-deps/package.json +++ b/packages/osd-ui-shared-deps/package.json @@ -38,7 +38,6 @@ "whatwg-fetch": "^3.0.0" }, "devDependencies": { - "@node-rs/xxhash": "^1.3.0", "@osd/babel-preset": "1.0.0", "@osd/dev-utils": "1.0.0", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", @@ -49,6 +48,6 @@ "sass-embedded": "1.66.1", "sass-loader": "npm:@amoo-miki/sass-loader@10.4.1-node-sass-9.0.0-libsass-3.6.5-with-sass-embedded.rc1", "val-loader": "^2.1.2", - "webpack": "npm:@amoo-miki/webpack@4.46.0-xxhash.1" + "webpack": "^4.47.0" } } diff --git a/packages/osd-ui-shared-deps/webpack.config.js b/packages/osd-ui-shared-deps/webpack.config.js index 91140cb32c7d..5c4598c7c42d 100644 --- a/packages/osd-ui-shared-deps/webpack.config.js +++ b/packages/osd-ui-shared-deps/webpack.config.js @@ -59,7 +59,6 @@ exports.getWebpackConfig = ({ dev = false } = {}) => ({ devtoolModuleFilenameTemplate: (info) => `osd-ui-shared-deps/${Path.relative(REPO_ROOT, info.absoluteResourcePath)}`, library: '__osdSharedDeps__', - hashFunction: 'Xxh64', }, module: { diff --git a/yarn.lock b/yarn.lock index 5a6ec4b4258e..5e5a81e0e630 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17029,22 +17029,6 @@ terser-webpack-plugin@^2.1.2: terser "^4.6.12" webpack-sources "^1.4.3" -"terser-webpack-plugin@npm:@amoo-miki/terser-webpack-plugin@1.4.5-rc.2": - version "1.4.5-rc.2" - resolved "https://registry.yarnpkg.com/@amoo-miki/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5-rc.2.tgz#046c062ef22c126c2544718674bc6624e3651b9c" - integrity sha512-JFSGSzsWgSHEqQXlnHDh3gw+jdVdVlWM2Irdps9P/yWYNY/5VjuG8sdoW4mbuP8/HM893/k8N+ipbeqsd8/xpA== - dependencies: - "@node-rs/xxhash" "^1.3.0" - cacache "^12.0.2" - find-cache-dir "^2.1.0" - is-wsl "^1.1.0" - schema-utils "^1.0.0" - serialize-javascript "^4.0.0" - source-map "^0.6.1" - terser "^4.1.2" - webpack-sources "^1.4.0" - worker-farm "^1.7.0" - terser@^4.1.2, terser@^4.6.12: version "4.8.1" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" @@ -18652,36 +18636,6 @@ webpack@^4.47.0: watchpack "^1.7.4" webpack-sources "^1.4.1" -"webpack@npm:@amoo-miki/webpack@4.46.0-xxhash.1": - version "4.46.0-xxhash.1" - resolved "https://registry.yarnpkg.com/@amoo-miki/webpack/-/webpack-4.46.0-xxhash.1.tgz#e8fdb0399d36715e558ad35e3ff70fd1d4ea47a7" - integrity sha512-gPwQMqfrE9326g+rZoU4BPOfcYvEcAR0XxfpV9AGUcRwl2oHoqEwq7nxSWchilpGV1i9XI7mCa8u8k4ePz6ziA== - dependencies: - "@node-rs/xxhash" "^1.3.0" - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-module-context" "1.9.0" - "@webassemblyjs/wasm-edit" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - acorn "^6.4.1" - ajv "^6.10.2" - ajv-keywords "^3.4.1" - chrome-trace-event "^1.0.2" - enhanced-resolve "^4.5.0" - eslint-scope "^4.0.3" - glob-to-regexp "^0.4.1" - json-parse-better-errors "^1.0.2" - loader-runner "^2.4.0" - loader-utils "^2.0.4" - memory-fs "^0.4.1" - mkdirp "^0.5.3" - neo-async "^2.6.1" - node-libs-browser "^2.2.1" - schema-utils "^1.0.0" - tapable "^1.1.3" - terser-webpack-plugin "npm:@amoo-miki/terser-webpack-plugin@1.4.5-rc.2" - watchpack "^1.7.4" - webpack-sources "^1.4.1" - whatwg-encoding@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"