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

Updated webpack

See merge request eclipsefdn/it/websites/eclipse.org-research!65

README.md

@@ -11,7 +11,7 @@ The Eclipse Foundation welcomes the opportunity to work with new industry resear
 Install dependencies, build assets and start a webserver:
 
 ```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/).

package.json

@@ -23,7 +23,7 @@
     "fetch_project": "NODE_ENV=production node node_modules/eclipsefdn-hugo-solstice-theme/bin/projects/index.js -l data/"
   },
   "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"
 }

webpack.mix.js

@@ -11,25 +11,13 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-mix = require('laravel-mix');
-require('laravel-mix-transpile-node-modules')
-mix.transpileNodeModules(['eclipsefdn-solstice-assets']);
-
-mix.options({
-  uglify: { uglifyOptions: { compress: false, output: { comments: true } } },
-});
+require('./node_modules/eclipsefdn-solstice-assets/webpack-solstice-assets.mix.js');
+let mix = require('laravel-mix');
+mix.EclipseFdnSolsticeAssets();
 
 mix.setPublicPath('static');
 mix.setResourceRoot('../');
 
 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');