Commit 557362b0 authored by Christopher Guindon's avatar Christopher Guindon
Browse files

Merge branch 'zhoufang/master/updateWebpack' into 'master'

Updated webpack

See merge request eclipsefdn/it/websites/eclipse.org-research!65
parents eebdd13c 85ff5935
...@@ -11,7 +11,7 @@ The Eclipse Foundation welcomes the opportunity to work with new industry resear ...@@ -11,7 +11,7 @@ The Eclipse Foundation welcomes the opportunity to work with new industry resear
Install dependencies, build assets and start a webserver: Install dependencies, build assets and start a webserver:
```bash ```bash
npm install && hugo server yarn && hugo server
``` ```
You can find guidance on the page-level metadata [here](https://eclipsefdn.github.io/hugo-solstice-theme/), and examples of the assorted page types (components) [here](https://eclipsefdn.github.io/hugo-solstice-theme/components/). You can find guidance on the page-level metadata [here](https://eclipsefdn.github.io/hugo-solstice-theme/), and examples of the assorted page types (components) [here](https://eclipsefdn.github.io/hugo-solstice-theme/components/).
......
This diff is collapsed.
This diff is collapsed.
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
"fetch_project": "NODE_ENV=production node node_modules/eclipsefdn-hugo-solstice-theme/bin/projects/index.js -l data/" "fetch_project": "NODE_ENV=production node node_modules/eclipsefdn-hugo-solstice-theme/bin/projects/index.js -l data/"
}, },
"dependencies": { "dependencies": {
"eclipsefdn-hugo-solstice-theme": "0.0.129" "eclipsefdn-hugo-solstice-theme": "^0.0.132"
}, },
"browserslist": "last 5 version, > 0.2%, not dead, IE 11" "browserslist": "last 5 version, > 0.2%, not dead, IE 11"
} }
...@@ -11,25 +11,13 @@ ...@@ -11,25 +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