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.

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

Fix all security issues #5965

Merged
merged 1 commit into from
Jun 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ script:
- make test
# Webpack build of ngeo/gmf examples and gmf apps
- if [ "${TRAVIS_PULL_REQUEST}" = false ]; then export NODE_ENV=production; fi
- make examples-hosted
- make examples-hosted > /dev/null
- buildtools/test_examples.py 1/1
#- npm run typecheck
# Generate API doc
Expand All @@ -70,7 +70,7 @@ script:
- '! (npm run typecheck|grep gmf)'
- '! (npm run typecheck|grep test)'
- '! (npm run typecheck|grep examples)'
- npm run doc
- npm run doc > /dev/null
- npm run build-api

deploy:
Expand Down
10 changes: 6 additions & 4 deletions buildtools/webpack.api.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,12 @@ module.exports = (env, argv) => {
]
},
plugins: [
new CopyWebpackPlugin([{
from: './api/src/api.css',
to: dest
}])
new CopyWebpackPlugin({
patterns: [{
from: './api/src/api.css',
to: dest
}]
})
]
};
};
6 changes: 3 additions & 3 deletions buildtools/webpack.ngeoexamples.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ for (const filename of ls('examples/*.html')) {
}

// move data folder
plugins.push(new CopyWebpackPlugin(
[
plugins.push(new CopyWebpackPlugin({
patterns: [
{
from: 'examples/data/*',
to: 'data',
flatten: true
},
]
));
}));

module.exports = {
entry: entry,
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"co": "4.6.0",
"commander": "2.20.0",
"console-control-strings": "1.1.0",
"copy-webpack-plugin": "5.0.3",
"copy-webpack-plugin": "6.0.2",
"corejs-typeahead": "1.2.1",
"css-loader": "2.1.1",
"d3": "5.9.2",
Expand All @@ -95,7 +95,7 @@
"jquery-ui": "1.12.1",
"jquery-ui-touch-punch": "0.2.3",
"jsts": "2.0.4",
"karma": "4.1.0",
"karma": "5.1.0",
"karma-chrome-launcher": "2.2.0",
"karma-jasmine": "2.0.1",
"karma-sourcemap-loader": "0.3.7",
Expand All @@ -120,12 +120,12 @@
"svgo": "1.2.2",
"svgo-loader": "2.2.0",
"terser": "3.17.0",
"terser-webpack-plugin": "1.2.3",
"terser-webpack-plugin": "3.0.6",
"ts-node": "8.1.0",
"tsconfig-paths": "3.8.0",
"typedoc": "0.17.7",
"typescript": "3.8.3",
"webpack": "4.30.0",
"webpack": "4.37.0",
"webpack-cli": "3.3.11",
"webpack-dev-server": "3.11.0",
"webpack-merge": "4.2.1"
Expand Down