Commit e2da15e7 authored by Christopher Guindon's avatar Christopher Guindon 🌴
Browse files

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

Updated webpack

See merge request !243
parents e7efb473 59f7e00f
...@@ -11,7 +11,7 @@ The site provides date, time and place for the various events (conferences, demo ...@@ -11,7 +11,7 @@ The site provides date, time and place for the various events (conferences, demo
Install dependencies, build assets and start a webserver: Install dependencies, build assets and start a webserver:
```bash ```bash
npm install yarn
hugo server hugo server
``` ```
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -11,21 +11,13 @@ ...@@ -11,21 +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.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');
mix.js('js/App.js', './static/js/App.js').react(); mix.js('js/App.js', './static/js/App.js').react();
This source diff could not be displayed because it is too large. You can view the blob instead.
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