diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 4b001858f..63a022d7e 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -52,7 +52,7 @@ "dependencies": { "@angular-devkit/core": "~10.0.0", "clean-webpack-plugin": "~3.0.0", - "copy-webpack-plugin": "~6.0.2", + "copy-webpack-plugin": "4.6.0", "css": "~3.0.0", "css-loader": "~4.2.0", "escape-string-regexp": "~4.0.0", diff --git a/packages/webpack/templates/webpack.angular.js b/packages/webpack/templates/webpack.angular.js index 33088382a..1472428ae 100644 --- a/packages/webpack/templates/webpack.angular.js +++ b/packages/webpack/templates/webpack.angular.js @@ -116,9 +116,9 @@ module.exports = env => { const copyIgnore = { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] }; const copyTargets = [ - { from: 'assets/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: 'fonts/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - ...copyReplacements + { from: { glob: 'assets/**', dot: false } }, + { from: { glob: 'fonts/**', dot: false } }, + ...copyReplacements, ]; if (!production) { @@ -395,9 +395,11 @@ module.exports = env => { verbose: !!verbose }), // Copy assets - new CopyWebpackPlugin({ - patterns: copyTargets, - }), + new CopyWebpackPlugin([ + ...copyTargets, + { from: { glob: '**/*.jpg', dot: false } }, + { from: { glob: '**/*.png', dot: false } }, + ], copyIgnore), new nsWebpack.GenerateNativeScriptEntryPointsPlugin('bundle'), // For instructions on how to set up workers with webpack // check out https://github.com/nativescript/worker-loader diff --git a/packages/webpack/templates/webpack.javascript.js b/packages/webpack/templates/webpack.javascript.js index 589ef274e..69c197a69 100644 --- a/packages/webpack/templates/webpack.javascript.js +++ b/packages/webpack/templates/webpack.javascript.js @@ -244,14 +244,12 @@ module.exports = env => { verbose: !!verbose }), // Copy assets - new CopyWebpackPlugin({ - patterns: [ - { from: 'assets/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: 'fonts/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.jpg', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.png', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - ], - }), + new CopyWebpackPlugin([ + { from: { glob: 'assets/**', dot: false } }, + { from: { glob: 'fonts/**', dot: false } }, + { from: { glob: '**/*.jpg', dot: false } }, + { from: { glob: '**/*.png', dot: false } }, + ], copyIgnore), new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"), // For instructions on how to set up workers with webpack diff --git a/packages/webpack/templates/webpack.svelte.js b/packages/webpack/templates/webpack.svelte.js index 7013c4522..c552dbae5 100644 --- a/packages/webpack/templates/webpack.svelte.js +++ b/packages/webpack/templates/webpack.svelte.js @@ -297,14 +297,12 @@ module.exports = env => { verbose: !!verbose }), // Copy assets - new CopyWebpackPlugin({ - patterns: [ - { from: 'assets/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: 'fonts/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.jpg', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.png', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - ], - }), + new CopyWebpackPlugin([ + { from: { glob: 'assets/**', dot: false } }, + { from: { glob: 'fonts/**', dot: false } }, + { from: { glob: '**/*.jpg', dot: false } }, + { from: { glob: '**/*.png', dot: false } }, + ], copyIgnore), new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"), // For instructions on how to set up workers with webpack // check out https://github.com/nativescript/worker-loader diff --git a/packages/webpack/templates/webpack.typescript.js b/packages/webpack/templates/webpack.typescript.js index bde3a35b0..cb43e5966 100644 --- a/packages/webpack/templates/webpack.typescript.js +++ b/packages/webpack/templates/webpack.typescript.js @@ -273,14 +273,12 @@ module.exports = env => { verbose: !!verbose }), // Copy assets - new CopyWebpackPlugin({ - patterns: [ - { from: 'assets/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: 'fonts/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.jpg', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.png', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - ], - }), + new CopyWebpackPlugin([ + { from: { glob: 'assets/**', dot: false } }, + { from: { glob: 'fonts/**', dot: false } }, + { from: { glob: '**/*.jpg', dot: false } }, + { from: { glob: '**/*.png', dot: false } }, + ], copyIgnore), new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"), // For instructions on how to set up workers with webpack // check out https://github.com/nativescript/worker-loader diff --git a/packages/webpack/templates/webpack.vue.js b/packages/webpack/templates/webpack.vue.js index e61f20362..12987e9bc 100644 --- a/packages/webpack/templates/webpack.vue.js +++ b/packages/webpack/templates/webpack.vue.js @@ -301,13 +301,12 @@ module.exports = env => { verbose: !!verbose }), // Copy assets - new CopyWebpackPlugin({ - patterns: [ - { from: 'assets/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: 'fonts/**', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } }, - { from: '**/*.+(jpg|png)', noErrorOnMissing: true, globOptions: { dot: false, ...copyIgnore } } - ], - }), + new CopyWebpackPlugin([ + { from: { glob: 'assets/**', dot: false } }, + { from: { glob: 'fonts/**', dot: false } }, + { from: { glob: '**/*.jpg', dot: false } }, + { from: { glob: '**/*.png', dot: false } }, + ], copyIgnore), new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"), // For instructions on how to set up workers with webpack // check out https://github.com/nativescript/worker-loader