Adjust CopyWebpackPlugin to latest (#2888)

* Adjust CopyWebpackPlugin to latest

* Adjust electron Webpack config
This commit is contained in:
Jaco Greeff 2020-06-06 10:28:16 +02:00 committed by GitHub
parent a8fef0c223
commit 87aff976c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 13 deletions

View File

@ -12,6 +12,6 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.2",
"edgeware-node-types": "^2.1.0"
"edgeware-node-types": "^2.2.0"
}
}

View File

@ -13,7 +13,7 @@
"@types/react": "^16.9.35",
"@types/react-dom": "^16.9.8",
"babel-loader": "^8.1.0",
"copy-webpack-plugin": "^5.1.1",
"copy-webpack-plugin": "^6.0.2",
"html-webpack-plugin": "^4.3.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",

View File

@ -20,7 +20,7 @@ module.exports = merge(
devtool: isProd ? 'none' : 'source-map',
plugins: [
// It must be placed before HtmlWebpackPlugin
new CopyWebpackPlugin([{ from: '../apps/public' }]),
new CopyWebpackPlugin({ patterns: [{ from: '../apps/public' }] }),
new HtmlWebpackPlugin({
PAGE_TITLE: 'Polkadot/Substrate Portal',
inject: true,

View File

@ -22,7 +22,7 @@
},
"devDependencies": {
"babel-loader": "^8.1.0",
"copy-webpack-plugin": "^5.1.1",
"copy-webpack-plugin": "^6.0.2",
"css-loader": "^3.5.3",
"empty": "^0.10.1",
"file-loader": "^6.0.0",

View File

@ -17,7 +17,7 @@ function createWebpack (ENV, context) {
const isProd = ENV === 'production';
const hasPublic = fs.existsSync(path.join(context, 'public'));
const plugins = hasPublic
? [new CopyWebpackPlugin([{ from: 'public' }])]
? [new CopyWebpackPlugin({ patterns: [{ from: 'public' }] })]
: [];
!isProd && plugins.push(

View File

@ -3214,7 +3214,7 @@ __metadata:
resolution: "@polkadot/apps-config@workspace:packages/apps-config"
dependencies:
"@babel/runtime": ^7.10.2
edgeware-node-types: ^2.1.0
edgeware-node-types: ^2.2.0
languageName: unknown
linkType: soft
@ -3228,7 +3228,7 @@ __metadata:
"@types/react": ^16.9.35
"@types/react-dom": ^16.9.8
babel-loader: ^8.1.0
copy-webpack-plugin: ^5.1.1
copy-webpack-plugin: ^6.0.2
electron-updater: ^4.3.3
html-webpack-plugin: ^4.3.0
react: ^16.13.1
@ -3256,7 +3256,7 @@ __metadata:
"@polkadot/react-components": 0.44.0-beta.49
"@polkadot/react-signer": 0.44.0-beta.49
babel-loader: ^8.1.0
copy-webpack-plugin: ^5.1.1
copy-webpack-plugin: ^6.0.2
css-loader: ^3.5.3
empty: ^0.10.1
file-loader: ^6.0.0
@ -7910,7 +7910,7 @@ __metadata:
languageName: node
linkType: hard
"copy-webpack-plugin@npm:^5.0.2, copy-webpack-plugin@npm:^5.1.1":
"copy-webpack-plugin@npm:^5.0.2":
version: 5.1.1
resolution: "copy-webpack-plugin@npm:5.1.1"
dependencies:
@ -7932,6 +7932,27 @@ __metadata:
languageName: node
linkType: hard
"copy-webpack-plugin@npm:^6.0.2":
version: 6.0.2
resolution: "copy-webpack-plugin@npm:6.0.2"
dependencies:
cacache: ^15.0.4
fast-glob: ^3.2.2
find-cache-dir: ^3.3.1
glob-parent: ^5.1.1
globby: ^11.0.1
loader-utils: ^2.0.0
normalize-path: ^3.0.0
p-limit: ^2.3.0
schema-utils: ^2.7.0
serialize-javascript: ^3.1.0
webpack-sources: ^1.4.3
peerDependencies:
webpack: ^4.37.0 || ^5.0.0
checksum: 3/abbe23c1b70bfc93826c3247682eccb5e50c1d22ee735c26d4270d75d99efa039675f496b2b96bc945df1e90064fca177b9036232cd9f65ddcb67d13b9e7185e
languageName: node
linkType: hard
"core-js-compat@npm:^3.6.2, core-js-compat@npm:^3.6.5":
version: 3.6.5
resolution: "core-js-compat@npm:3.6.5"
@ -9382,7 +9403,7 @@ __metadata:
languageName: node
linkType: hard
"edgeware-node-types@npm:^2.1.0":
"edgeware-node-types@npm:^2.2.0":
version: 2.2.0
resolution: "edgeware-node-types@npm:2.2.0"
checksum: 3/6635bf494e04f924e301a0a1bff2c7df7fbbd198ae7293e75d849c3142f9720b6757e9ba92dc7d7ef6edd7a269e9358e5ce8739cad39241e72d8f7f9bacf0c6b
@ -10566,7 +10587,7 @@ __metadata:
languageName: node
linkType: hard
"fast-glob@npm:^3.1.1":
"fast-glob@npm:^3.1.1, fast-glob@npm:^3.2.2":
version: 3.2.2
resolution: "fast-glob@npm:3.2.2"
dependencies:
@ -11531,7 +11552,7 @@ __metadata:
languageName: node
linkType: hard
"glob-parent@npm:^5.0.0, glob-parent@npm:^5.1.0, glob-parent@npm:~5.1.0":
"glob-parent@npm:^5.0.0, glob-parent@npm:^5.1.0, glob-parent@npm:^5.1.1, glob-parent@npm:~5.1.0":
version: 5.1.1
resolution: "glob-parent@npm:5.1.1"
dependencies:
@ -20476,7 +20497,7 @@ __metadata:
languageName: node
linkType: hard
"schema-utils@npm:^2.6.5, schema-utils@npm:^2.6.6":
"schema-utils@npm:^2.6.5, schema-utils@npm:^2.6.6, schema-utils@npm:^2.7.0":
version: 2.7.0
resolution: "schema-utils@npm:2.7.0"
dependencies: