Commit c3ec09d4 authored by Christopher Guindon's avatar Christopher Guindon
Browse files

Merge branch 'zhoufang/main/updateWebpack' into 'main'

Updated webpack

See merge request !14
parents 73dcba22 3a2d3c83
...@@ -9,7 +9,7 @@ The Eclipse Foundation provides our global community of individuals and organiza ...@@ -9,7 +9,7 @@ The Eclipse Foundation provides our global community of individuals and organiza
Install dependencies, build assets and start a web server: Install dependencies, build assets and start a web server:
```bash ```bash
npm install yarn
hugo server hugo server
``` ```
......
This diff is collapsed.
...@@ -25,8 +25,9 @@ ...@@ -25,8 +25,9 @@
"build_netlify": "NODE_ENV=production npm run disallow_robots_txt && npm run production" "build_netlify": "NODE_ENV=production npm run disallow_robots_txt && npm run production"
}, },
"dependencies": { "dependencies": {
"eclipsefdn-hugo-solstice-theme": "0.0.129", "eclipsefdn-hugo-solstice-theme": "0.0.132",
"js-yaml": "^3.13.1", "js-yaml": "^3.13.1",
"json-minify": "^1.0.0" "json-minify": "^1.0.0"
} },
"browserslist": "last 5 version, > 0.2%, not dead, IE 11"
} }
...@@ -11,24 +11,13 @@ ...@@ -11,24 +11,13 @@
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*/ */
mix = require('laravel-mix'); require('./node_modules/eclipsefdn-solstice-assets/webpack-solstice-assets.mix.js');
require('laravel-mix-transpile-node-modules'); let mix = require('laravel-mix');
mix.transpileNodeModules(['eclipsefdn-solstice-assets']); mix.EclipseFdnSolsticeAssets();
mix.options({
uglify: { uglifyOptions: { compress: false, output: { comments: true } } },
});
mix.setPublicPath('static'); mix.setPublicPath('static');
mix.setResourceRoot('../'); mix.setResourceRoot('../');
mix.less('./less/styles.less', 'static/css/styles.css'); mix.less('./less/styles.less', 'static/css/styles.css');
mix.webpackConfig({
resolve: {
alias: {
jquery: 'jquery/src/jquery',
},
},
});
mix.js('js/main.js', './static/js/solstice.js'); mix.js('js/main.js', './static/js/solstice.js');
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment