diff --git a/.electron-vue/webpack.main.config.js b/.electron-vue/webpack.main.config.js index 0043237e..850132e5 100644 --- a/.electron-vue/webpack.main.config.js +++ b/.electron-vue/webpack.main.config.js @@ -60,13 +60,18 @@ let mainConfig = { }, plugins: [ new webpack.NoEmitOnErrorsPlugin(), - new CopyWebpackPlugin([ - { - from: path.join(__dirname, '../src/config/locales'), - to: path.join(__dirname, '../dist/electron/locales'), - ignore: ['.*', '*~'] - } - ]) + new CopyWebpackPlugin({ + patterns: [ + { + from: path.join(__dirname, '../src/config/locales'), + to: path.join(__dirname, '../dist/electron/locales'), + globOptions: { + gitignore: true, + ignore: ['.*', '*~'] + } + } + ] + }) ], resolve: { alias: { diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js index 399f9c6c..5a8dc28e 100644 --- a/.electron-vue/webpack.renderer.config.js +++ b/.electron-vue/webpack.renderer.config.js @@ -180,13 +180,18 @@ if (process.env.NODE_ENV === 'production') { rendererConfig.devtool = '' rendererConfig.mode = 'production' rendererConfig.plugins.push( - new CopyWebpackPlugin([ - { - from: path.join(__dirname, '../static'), - to: path.join(__dirname, '../dist/electron/static'), - ignore: ['.*', '*~'] - } - ]), + new CopyWebpackPlugin({ + patterns: [ + { + from: path.join(__dirname, '../static'), + to: path.join(__dirname, '../dist/electron/static'), + globOptions: { + gitignore: true, + ignore: ['.*', '*~'] + } + } + ] + }), new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"production"' }), diff --git a/.electron-vue/webpack.web.config.js b/.electron-vue/webpack.web.config.js index 4c760dd2..511b2876 100644 --- a/.electron-vue/webpack.web.config.js +++ b/.electron-vue/webpack.web.config.js @@ -130,13 +130,18 @@ if (process.env.NODE_ENV === 'production') { webConfig.devtool = '' webConfig.mode = 'production' webConfig.plugins.push( - new CopyWebpackPlugin([ - { - from: path.join(__dirname, '../static'), - to: path.join(__dirname, '../dist/web/static'), - ignore: ['.*'] - } - ]), + new CopyWebpackPlugin({ + patterns: [ + { + from: path.join(__dirname, '../static'), + to: path.join(__dirname, '../dist/web/static'), + globOptions: { + gitignore: true, + ignore: ['.*', '*~'] + } + } + ] + }), new webpack.DefinePlugin({ 'process.env.NODE_ENV': '"production"' }), diff --git a/package-lock.json b/package-lock.json index cb85d551..b3c56f13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15601,7 +15601,8 @@ }, "gonzales-pe": { "version": "4.2.3", - "resolved": "", + "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.3.tgz", + "integrity": "sha512-Kjhohco0esHQnOiqqdJeNz/5fyPkOMD/d6XVjwTAoPGUFh0mCollPUTUTa2OZy4dYNAqlPIQdTiNzJTWdd9Htw==", "dev": true, "requires": { "minimist": "1.1.x"