Merge branch 'master' of github.com:mozilla-neutrino/neutrino-dev

packages/neutrino-preset-web/index.js

@@ -12,7 +12,7 @@ const clean = require('neutrino-middleware-clean');
 const minify = require('neutrino-middleware-minify');
 const loaderMerge = require('neutrino-middleware-loader-merge');
 const namedModules = require('neutrino-middleware-named-modules');
-const { join } = require('path');
+const { join, dirname } = require('path');
 const { path, pathOr } = require('ramda');
 
 const MODULES = join(__dirname, 'node_modules');
@@ -25,6 +25,7 @@ function devServer({ config }, options) {
     .contentBase(options.contentBase)
     .historyApiFallback(true)
     .hot(true)
+    .publicPath('/')
     .stats({
       assets: false,
       children: false,
@@ -99,6 +100,10 @@ module.exports = (neutrino) => {
       .chunkFilename('[id].[chunkhash].js')
       .end()
     .resolve
+      .alias
+        // Make sure 2 versions of "core-js" always match in package.json and babel-polyfill/package.json
+        .set('core-js', dirname(require.resolve('core-js')))
+        .end()
       .modules
         .add('node_modules')
         .add(neutrino.options.node_modules)

packages/neutrino-preset-web/package.json

@@ -16,7 +16,8 @@
   "bugs": "https://github.com/mozilla-neutrino/neutrino-dev/issues",
   "dependencies": {
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-polyfill": "^6.23.0",
+    "babel-polyfill": "6.23.0",
+    "core-js": "^2.4.0",
     "babel-preset-env": "^1.2.2",
     "exports-loader": "^0.6.4",
     "imports-loader": "^0.7.1",

packages/neutrino-preset-web/test/web_test.js

@@ -33,13 +33,3 @@ test('valid preset development', t => {
 
   t.is(errors.length, 0);
 });
-
-test.skip('devServer publicPath', t => {
-  const api = Neutrino();
-
-  api.use(require('..'));
-
-  const config = api.config.toConfig();
-
-  t.is(config.output.publicPath, config.devServer.publicPath);
-});