Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump copy-webpack-plugin from 5.1.2 to 6.4.1 in /ui #638

Merged
merged 5 commits into from
Jan 16, 2022
Merged

Bump copy-webpack-plugin from 5.1.2 to 6.4.1 in /ui #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec8aa23
Bump copy-webpack-plugin from 5.1.2 to 6.4.1 in /ui
dependabot[bot] Jan 12, 2022
eb86526
Merge branch 'master' into dependabot/npm_and_yarn/ui/copy-webpack-pl…
Jan 12, 2022
d6d5b6b
Merge branch 'master' into dependabot/npm_and_yarn/ui/copy-webpack-pl…
Jan 16, 2022
ef5befb
yarn
markphelps Jan 16, 2022
979b5ff
fix build
markphelps Jan 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions ui/build/webpack.prod.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,26 @@ const webpackConfig = merge(baseWebpackConfig, {
new webpack.optimize.ModuleConcatenationPlugin(),

// copy custom static assets
new CopyWebpackPlugin([
{
from: path.resolve(__dirname, "../static"),
to: build.assetsSubDirectory,
ignore: ["favicon.ico", ".*"],
},
]),
new CopyWebpackPlugin({
patterns: [
{
from: path.resolve(__dirname, "../static"),
to: build.assetsSubDirectory,
globOptions: {
ignore: ["favicon.ico", ".*"],
},
},
],
}),

// copy favicon.ico to rooot
new CopyWebpackPlugin([
{
from: path.resolve(__dirname, "../static/favicon.ico"),
},
]),
new CopyWebpackPlugin({
patterns: [
{
from: path.resolve(__dirname, "../static/favicon.ico"),
},
],
}),
],
});

Expand Down
2 changes: 1 addition & 1 deletion ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"babel-loader": "^8.2.3",
"babel-plugin-transform-vue-jsx": "^4.0.1",
"chalk": "^5.0.0",
"copy-webpack-plugin": "^5.0.5",
"copy-webpack-plugin": "^6.4.1",
"css-loader": "^5.1.4",
"eslint": "^7.32.0",
"eslint-config-prettier": "^6.0.0",
Expand Down
Loading