diff --git a/package.json b/package.json index 7f2021befe..7d45a54af8 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "packElectron:win": "yarn build:release:electron && electron-builder build --win", "postinstall": "polkadot-dev-yarn-only", "postinstall:electron": "electron-builder install-app-deps", - "start": "yarn clean && cd packages/apps && yarn webpack-cli serve --config webpack.serve.cjs --port 3000", + "start": "yarn clean && cd packages/apps && yarn polkadot-exec-webpack serve --config webpack.serve.cjs --port 3000", "start:electron": "yarn clean:electronBuild && concurrently 'yarn build:devElectronMain && cd packages/apps-electron && electron ./build/electron.js' 'yarn build:devElectronRenderer'", "test": "polkadot-dev-run-test --runInBand --testPathIgnorePatterns slow --testNamePattern='^((?!--SLOW--).)*$'", "test:all": "polkadot-dev-run-test --runInBand --config ./jest-slow.config.cjs", @@ -69,7 +69,7 @@ "@babel/runtime": "^7.18.9", "@crustio/crust-pin": "^1.0.0", "@pinata/sdk": "^1.1.26", - "@polkadot/dev": "^0.67.110", + "@polkadot/dev": "^0.67.111", "@types/chart.js": "^2.9.37", "@types/file-saver": "^2.0.5", "@types/jest": "^28.1.7", @@ -91,9 +91,7 @@ "react-dom": "^18.2.0", "react-is": "^18.2.0", "source-map-explorer": "^2.5.2", - "styled-components": "^5.3.5", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0" + "styled-components": "^5.3.5" }, "resolutions": { "@polkadot/api": "^9.2.2", diff --git a/packages/apps-electron/package.json b/packages/apps-electron/package.json index 8b0abeb193..75750c0251 100644 --- a/packages/apps-electron/package.json +++ b/packages/apps-electron/package.json @@ -14,7 +14,7 @@ "dependencies": { "@babel/core": "^7.18.10", "@babel/polyfill": "^7.12.1", - "@polkadot/dev": "^0.67.110", + "@polkadot/dev": "^0.67.111", "@polkadot/react-components": "^0.120.2-26-x", "electron-log": "^4.4.8", "electron-updater": "^4.6.5" diff --git a/packages/apps/package.json b/packages/apps/package.json index 29ace1ef40..003621baf8 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -18,7 +18,7 @@ "@babel/runtime": "^7.18.9", "@polkadot/apps-config": "^0.120.2-26-x", "@polkadot/apps-routing": "^0.120.2-26-x", - "@polkadot/dev": "^0.67.110", + "@polkadot/dev": "^0.67.111", "@polkadot/react-api": "^0.120.2-26-x", "@polkadot/react-components": "^0.120.2-26-x", "@polkadot/react-hooks": "^0.120.2-26-x", @@ -37,7 +37,7 @@ "crypto-browserify": "^3.12.0", "css-loader": "^5.2.7", "empty": "^0.10.1", - "html-loader": "^3.1.2", + "html-loader": "^4.1.0", "html-webpack-plugin": "^5.5.0", "https-browserify": "^1.0.0", "markdown-loader": "^8.0.0", @@ -47,9 +47,6 @@ "path-browserify": "^1.0.1", "process": "^0.11.10", "stream-browserify": "^3.0.0", - "stream-http": "^3.2.0", - "webpack-dev-server": "^4.10.0", - "webpack-merge": "^5.8.0", - "webpack-subresource-integrity": "^5.1.0" + "stream-http": "^3.2.0" } } diff --git a/yarn.lock b/yarn.lock index 409bbe149e..56baa4955d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2216,7 +2216,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/gen-mapping@npm:^0.3.2": +"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2": version: 0.3.2 resolution: "@jridgewell/gen-mapping@npm:0.3.2" dependencies: @@ -2241,6 +2241,16 @@ __metadata: languageName: node linkType: hard +"@jridgewell/source-map@npm:^0.3.2": + version: 0.3.2 + resolution: "@jridgewell/source-map@npm:0.3.2" + dependencies: + "@jridgewell/gen-mapping": ^0.3.0 + "@jridgewell/trace-mapping": ^0.3.9 + checksum: 1b83f0eb944e77b70559a394d5d3b3f98a81fcc186946aceb3ef42d036762b52ef71493c6c0a3b7c1d2f08785f53ba2df1277fe629a06e6109588ff4cdcf7482 + languageName: node + linkType: hard + "@jridgewell/sourcemap-codec@npm:^1.4.10": version: 1.4.10 resolution: "@jridgewell/sourcemap-codec@npm:1.4.10" @@ -3154,7 +3164,7 @@ __metadata: dependencies: "@babel/core": ^7.18.10 "@babel/polyfill": ^7.12.1 - "@polkadot/dev": ^0.67.110 + "@polkadot/dev": ^0.67.111 "@polkadot/react-components": ^0.120.2-26-x "@types/react-dom": ^18.0.6 "@types/tmp": ^0.2.3 @@ -3187,7 +3197,7 @@ __metadata: "@babel/runtime": ^7.18.9 "@polkadot/apps-config": ^0.120.2-26-x "@polkadot/apps-routing": ^0.120.2-26-x - "@polkadot/dev": ^0.67.110 + "@polkadot/dev": ^0.67.111 "@polkadot/react-api": ^0.120.2-26-x "@polkadot/react-components": ^0.120.2-26-x "@polkadot/react-hooks": ^0.120.2-26-x @@ -3202,7 +3212,7 @@ __metadata: crypto-browserify: ^3.12.0 css-loader: ^5.2.7 empty: ^0.10.1 - html-loader: ^3.1.2 + html-loader: ^4.1.0 html-webpack-plugin: ^5.5.0 https-browserify: ^1.0.0 markdown-loader: ^8.0.0 @@ -3215,15 +3225,12 @@ __metadata: query-string: ^7.1.1 stream-browserify: ^3.0.0 stream-http: ^3.2.0 - webpack-dev-server: ^4.10.0 - webpack-merge: ^5.8.0 - webpack-subresource-integrity: ^5.1.0 languageName: unknown linkType: soft -"@polkadot/dev@npm:^0.67.110": - version: 0.67.110 - resolution: "@polkadot/dev@npm:0.67.110" +"@polkadot/dev@npm:^0.67.111": + version: 0.67.111 + resolution: "@polkadot/dev@npm:0.67.111" dependencies: "@babel/cli": ^7.18.10 "@babel/core": ^7.18.10 @@ -3286,11 +3293,14 @@ __metadata: mkdirp: ^1.0.4 prettier: ^2.7.1 rimraf: ^3.0.2 - rollup: ^2.78.0 + rollup: ^2.78.1 rollup-plugin-cleanup: ^3.2.1 typescript: ^4.7.4 webpack: ^5.74.0 webpack-cli: ^4.10.0 + webpack-dev-server: ^4.10.0 + webpack-merge: ^5.8.0 + webpack-subresource-integrity: ^5.1.0 yargs: ^17.5.1 bin: polkadot-ci-ghact-build: scripts/polkadot-ci-ghact-build.mjs @@ -3317,7 +3327,7 @@ __metadata: polkadot-exec-swc: scripts/polkadot-exec-swc.mjs polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs - checksum: 50b7dac2204b8cf44e0f3fb73625bf1863f97995a19f21d8e422a14194fbff3df7dfea0eee82449b31515c1733c9e9d1bfbdbaf7859240b267b8f606d74869ea + checksum: a2dff6348625b8da1a23fa2900ed405e9c2df6420d6dcc3ad407b31119d788dc52f23d8b729fbc3803d3bcdb656f5f802b308da683fafa6dd9f1475c924ae532 languageName: node linkType: hard @@ -7372,12 +7382,12 @@ __metadata: languageName: node linkType: hard -"clean-css@npm:^5.1.5": - version: 5.2.2 - resolution: "clean-css@npm:5.2.2" +"clean-css@npm:^5.2.2": + version: 5.3.1 + resolution: "clean-css@npm:5.3.1" dependencies: source-map: ~0.6.0 - checksum: 10855820829b8b6ea94e462313fdc177b297aca5c7870a969591549d6a766824f912b5e58773bd345b2a7effae863ab492258b5a77a40029fba6d11d861cbee3 + checksum: 860696c60503cbfec480b5f92f62729246304b55950571af7292f2687b57f86b277f2b9fefe6f64643d409008018b78383972b55c2cc859792dcc8658988fb16 languageName: node linkType: hard @@ -7661,7 +7671,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^8.1.0": +"commander@npm:^8.3.0": version: 8.3.0 resolution: "commander@npm:8.3.0" checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0 @@ -9281,6 +9291,13 @@ __metadata: languageName: node linkType: hard +"entities@npm:^4.3.0": + version: 4.3.1 + resolution: "entities@npm:4.3.1" + checksum: e8f6d2bac238494b2355e90551893882d2675142be7e7bdfcb15248ed0652a630678ba0e3a8dc750693e736cb6011f504c27dabeb4cd3330560092e88b105090 + languageName: node + linkType: hard + "env-paths@npm:^2.2.0": version: 2.2.0 resolution: "env-paths@npm:2.2.0" @@ -11700,32 +11717,32 @@ __metadata: languageName: node linkType: hard -"html-loader@npm:^3.1.2": - version: 3.1.2 - resolution: "html-loader@npm:3.1.2" +"html-loader@npm:^4.1.0": + version: 4.1.0 + resolution: "html-loader@npm:4.1.0" dependencies: - html-minifier-terser: ^6.0.2 - parse5: ^6.0.1 + html-minifier-terser: ^6.1.0 + parse5: ^7.0.0 peerDependencies: webpack: ^5.0.0 - checksum: 75d665f118315056f24e248a6f0b6f6a3dbaec34593b9216af507d36eb24ca54cb8d80667a87ffc6a02b6b51c62423d59b4f64d827a745ac2e199d0c2b7c5c19 + checksum: d544cecb0588a3efd096b24be8f8e008afdf60c22e2c3186d56c107966698e18f38016f794561d0291c010ebf358aea04f5091a6be09c576c269118e066c8317 languageName: node linkType: hard -"html-minifier-terser@npm:^6.0.2": - version: 6.0.2 - resolution: "html-minifier-terser@npm:6.0.2" +"html-minifier-terser@npm:^6.0.2, html-minifier-terser@npm:^6.1.0": + version: 6.1.0 + resolution: "html-minifier-terser@npm:6.1.0" dependencies: camel-case: ^4.1.2 - clean-css: ^5.1.5 - commander: ^8.1.0 + clean-css: ^5.2.2 + commander: ^8.3.0 he: ^1.2.0 param-case: ^3.0.4 relateurl: ^0.2.7 - terser: ^5.7.2 + terser: ^5.10.0 bin: html-minifier-terser: cli.js - checksum: 9c8775ea036f7b04fd5a16607cf4242efdddc64884e84fcc81e27ef56505a12b8a9e1f9ac865ca00a77a3e4c21ef4ffb194dcc6492cdf6cfdfc73bf8de6d7c2d + checksum: ac52c14006476f773204c198b64838477859dc2879490040efab8979c0207424da55d59df7348153f412efa45a0840a1ca3c757bf14767d23a15e3e389d37a93 languageName: node linkType: hard @@ -15897,13 +15914,22 @@ __metadata: languageName: node linkType: hard -"parse5@npm:6.0.1, parse5@npm:^6.0.0, parse5@npm:^6.0.1": +"parse5@npm:6.0.1, parse5@npm:^6.0.0": version: 6.0.1 resolution: "parse5@npm:6.0.1" checksum: 7d569a176c5460897f7c8f3377eff640d54132b9be51ae8a8fa4979af940830b2b0c296ce75e5bd8f4041520aadde13170dbdec44889975f906098ea0002f4bd languageName: node linkType: hard +"parse5@npm:^7.0.0": + version: 7.0.0 + resolution: "parse5@npm:7.0.0" + dependencies: + entities: ^4.3.0 + checksum: 7da5d61cc18eb36ffa71fc861e65cbfd1f23d96483a6631254e627be667dbc9c93ac0b0e6cb17a13a2e4033dab19bfb2f76f38e5936cfb57240ed49036a83fcc + languageName: node + linkType: hard + "parseurl@npm:~1.3.2, parseurl@npm:~1.3.3": version: 1.3.3 resolution: "parseurl@npm:1.3.3" @@ -16146,7 +16172,7 @@ __metadata: "@babel/runtime": ^7.18.9 "@crustio/crust-pin": ^1.0.0 "@pinata/sdk": ^1.1.26 - "@polkadot/dev": ^0.67.110 + "@polkadot/dev": ^0.67.111 "@types/chart.js": ^2.9.37 "@types/file-saver": ^2.0.5 "@types/jest": ^28.1.7 @@ -16169,8 +16195,6 @@ __metadata: react-is: ^18.2.0 source-map-explorer: ^2.5.2 styled-components: ^5.3.5 - webpack: ^5.74.0 - webpack-cli: ^4.10.0 languageName: unknown linkType: soft @@ -17666,7 +17690,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"rollup@npm:^2.78.0": +"rollup@npm:^2.78.1": version: 2.78.1 resolution: "rollup@npm:2.78.1" dependencies: @@ -18372,7 +18396,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"source-map@npm:^0.7.3, source-map@npm:~0.7.2": +"source-map@npm:^0.7.3": version: 0.7.3 resolution: "source-map@npm:0.7.3" checksum: cd24efb3b8fa69b64bf28e3c1b1a500de77e84260c5b7f2b873f88284df17974157cc88d386ee9b6d081f08fdd8242f3fc05c953685a6ad81aad94c7393dedea @@ -19140,16 +19164,17 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"terser@npm:^5.7.0, terser@npm:^5.7.2": - version: 5.9.0 - resolution: "terser@npm:5.9.0" +"terser@npm:^5.10.0, terser@npm:^5.7.0": + version: 5.14.2 + resolution: "terser@npm:5.14.2" dependencies: + "@jridgewell/source-map": ^0.3.2 + acorn: ^8.5.0 commander: ^2.20.0 - source-map: ~0.7.2 source-map-support: ~0.5.20 bin: terser: bin/terser - checksum: 11c1246b1991015a8881742878af779e3863fad42f626ffda957dbf28c94bf51e7994cffb9ffbec86ff3c23ab45ffa6d79d453c15e664306e35fc7b2c4eee5f4 + checksum: cabb50a640d6c2cfb351e4f43dc7bf7436f649755bb83eb78b2cacda426d5e0979bd44e6f92d713f3ca0f0866e322739b9ced888ebbce6508ad872d08de74fcc languageName: node linkType: hard