Skip to content
Snippets Groups Projects
Commit 80a6a89f authored by Lars Bilke's avatar Lars Bilke
Browse files

[Web] Updated dependencies.

parent a79d07c2
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ image.inside(defaultDockerArgs) { ...@@ -26,7 +26,7 @@ image.inside(defaultDockerArgs) {
stage('Install prerequisites Web') { stage('Install prerequisites Web') {
sh(""" sh("""
cd ogs/web cd ogs/web
yarn --ignore-engines yarn --ignore-engines --non-interactive
node node_modules/node-sass/scripts/install.js node node_modules/node-sass/scripts/install.js
npm rebuild node-sass npm rebuild node-sass
sudo -H pip install -r requirements.txt sudo -H pip install -r requirements.txt
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"gulp": "gulp", "gulp": "gulp",
"hugo": "hugo server --disableRSS", "hugo": "hugo server --disableRSS",
"build": "webpack && gulp build && hugo", "build": "webpack && gulp build && hugo",
"build:release": "export NODE_ENV=production && webpack --env=production && gulp build && hugo", "build:release": "webpack --env=production && gulp build && hugo",
"import": "cd import && python import.py", "import": "cd import && python import.py",
"convert": "vtkDataConverter", "convert": "vtkDataConverter",
"webpack": "webpack", "webpack": "webpack",
...@@ -145,12 +145,13 @@ ...@@ -145,12 +145,13 @@
"siteIcon": "./public/img/site/favicon.*" "siteIcon": "./public/img/site/favicon.*"
}, },
"devDependencies": { "devDependencies": {
"del": "^2.2.2", "babel-loader": "^7.1.2",
"del": "^3.0.0",
"fancy-log": "^1.3.0", "fancy-log": "^1.3.0",
"flexboxgrid": "^6.3.1", "flexboxgrid": "^6.3.1",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-add-src": "^0.2.0", "gulp-add-src": "^0.2.0",
"gulp-autoprefixer": "^3.1.1", "gulp-autoprefixer": "^4.0.0",
"gulp-cached": "^1.1.1", "gulp-cached": "^1.1.1",
"gulp-clean-css": "^3.0.3", "gulp-clean-css": "^3.0.3",
"gulp-concat": "^2.6.1", "gulp-concat": "^2.6.1",
...@@ -159,13 +160,14 @@ ...@@ -159,13 +160,14 @@
"gulp-rename": "^1.2.2", "gulp-rename": "^1.2.2",
"gulp-sass": "^3.1.0", "gulp-sass": "^3.1.0",
"gulp-size": "^2.1.0", "gulp-size": "^2.1.0",
"kw-web-suite": "^2.2.1", "kw-web-suite": "^3.1.1",
"merge-stream": "^1.0.1", "merge-stream": "^1.0.1",
"normalize.css": "^5.0.0", "normalize.css": "^7.0.0",
"pygments-css": "^1.0.0", "pygments-css": "^1.0.0",
"string-replace-loader": "^1.3.0",
"tachyons-sass": "^4.7.1", "tachyons-sass": "^4.7.1",
"vtk.js": "^2.11.4", "vtk.js": "^4.0.0",
"webpack": "^2.2.1", "webpack": "^3.6.0",
"webpack-merge": "^3.0.0" "webpack-merge": "^4.1.0"
} }
} }
...@@ -20,7 +20,13 @@ const commonConfig = merge([ ...@@ -20,7 +20,13 @@ const commonConfig = merge([
loader: "expose-loader?MyWebApp" loader: "expose-loader?MyWebApp"
} }
].concat(module.exports = parts.loaders()), ].concat(module.exports = parts.loaders()),
}, },
resolve: {
extensions: ['.webpack-loader.js', '.web-loader.js', '.loader.js', '.js', '.jsx'],
modules: [
path.resolve(__dirname, 'node_modules')
],
},
// postcss: [ // postcss: [
// require('autoprefixer')({ browsers: ['last 2 versions'] }), // require('autoprefixer')({ browsers: ['last 2 versions'] }),
// ], // ],
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment