upgrade to babel 7

.travis.yml

@@ -3,7 +3,6 @@ node_js:
   - 12
   - 10
   - 8
-  - 6
 cache: yarn
 script:
   - yarn test

__tests__/tests.esm.js

@@ -0,0 +1,80 @@
+import assert from 'assert';
+import moduleInjector from 'self!./modules/es6.js';
+
+const MODULE_A_STUB = {
+  a() {
+    return 'a - stubbed';
+  },
+};
+
+const MODULE_B_STUB = () => 'b - stubbed';
+
+describe('inject-loader (ESM)', () => {
+  it('works when no injections were provided', () => {
+    const module = moduleInjector();
+
+    assert.equal(module.getA(), 'a - original');
+    assert.equal(module.getB(), 'b - original');
+    assert.equal(module.getC(), 'c - original');
+  });
+
+  it('works when one injection was provided', () => {
+    const module = moduleInjector({
+      './a.js': MODULE_A_STUB,
+    });
+
+    assert.equal(module.getA(), 'a - stubbed');
+    assert.equal(module.getB(), 'b - original');
+    assert.equal(module.getC(), 'c - original');
+  });
+
+  it('works when a falsey injection was provided', () => {
+    const module = moduleInjector({
+      './c.js': undefined,
+    });
+
+    assert.equal(module.getA(), 'a - original');
+    assert.equal(module.getB(), 'b - original');
+    assert.equal(module.getC(), undefined);
+  });
+
+  it('works when multiple injections were provided', () => {
+    const module = moduleInjector({
+      './a.js': MODULE_A_STUB,
+      './b.js': MODULE_B_STUB,
+    });
+
+    assert.equal(module.getA(), 'a - stubbed');
+    assert.equal(module.getB(), 'b - stubbed');
+    assert.equal(module.getC(), 'c - original');
+  });
+
+  it('throws an error when invalid dependencies are provided', () => {
+    const injectInvalidDependencies = () => {
+      moduleInjector({
+        './b.js': null,
+        './d.js': null,
+      });
+    };
+
+    assert.throws(injectInvalidDependencies, /Injection Error in/);
+    assert.throws(
+      injectInvalidDependencies,
+      /The following injections are invalid:\n - \.\/d\.js\n/
+    );
+    assert.throws(
+      injectInvalidDependencies,
+      /The following injections were passed in:\n - \.\/b\.js\n - \.\/d\.js\n/
+    );
+    assert.throws(
+      injectInvalidDependencies,
+      /Valid injection targets for this module are:\n - \.\/a\.js\n - \.\/b\.js\n - \.\/c\.js/
+    );
+  });
+
+  it('does not break someObject.require calls', () => {
+    const module = moduleInjector();
+
+    assert.equal(module.callRequireMethod(), 'require method in a.js');
+  });
+});

config/shared.js

@@ -4,7 +4,7 @@ const ROOT_PATH = path.resolve(__dirname, '..');
 const SOURCE_PATH = path.resolve(ROOT_PATH, 'src');
 const TESTS_PATH = path.resolve(ROOT_PATH, '__tests__');
 const TEMP_PATH = path.resolve(ROOT_PATH, 'tmp');
-const NODE_EXTERNAL_DEPS = ['babel-core'];
+const NODE_EXTERNAL_DEPS = ['@babel/core'];
 
 module.exports = {
   SOURCE_PATH,

config/webpack.config.js

@@ -22,8 +22,17 @@ module.exports = {
         include: [constants.SOURCE_PATH, constants.TESTS_PATH],
         query: {
           cacheDirectory: true,
-          presets: ['es2015'],
-          plugins: ['add-module-exports', 'transform-flow-strip-types'],
+          presets: [
+            [
+              '@babel/preset-env',
+              {
+                targets: {
+                  node: '6',
+                },
+              },
+            ],
+          ],
+          plugins: ['@babel/plugin-transform-flow-strip-types'],
         },
       },
     ],

config/webpack.test.config.js

@@ -22,8 +22,15 @@ module.exports = {
         include: [constants.SOURCE_PATH, constants.TESTS_PATH],
         query: {
           cacheDirectory: true,
-          presets: ['es2015'],
-          plugins: ['add-module-exports', 'transform-flow-strip-types'],
+          presets: [
+            [
+              '@babel/preset-env',
+              {
+                modules: 'cjs',
+              },
+            ],
+          ],
+          plugins: ['@babel/plugin-transform-flow-strip-types'],
         },
       },
     ],

config/webpack.test.esm.config.js

@@ -0,0 +1,38 @@
+const path = require('path');
+const constants = require('./shared');
+
+module.exports = {
+  entry: path.resolve(constants.TESTS_PATH, 'tests.esm.js'),
+  target: 'node',
+  mode: 'production',
+  output: {
+    path: constants.TEMP_PATH,
+    filename: 'testBundleESM.js',
+  },
+  resolveLoader: {
+    alias: {
+      self: constants.TEMP_PATH,
+    },
+  },
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        include: [constants.SOURCE_PATH, constants.TESTS_PATH],
+        query: {
+          cacheDirectory: true,
+          presets: [
+            [
+              '@babel/preset-env',
+              {
+                modules: false,
+              },
+            ],
+          ],
+          plugins: ['@babel/plugin-transform-flow-strip-types'],
+        },
+      },
+    ],
+  },
+};

example/webpack2-babel/.babelrc

@@ -1,3 +1,3 @@
 {
-  "presets": "es2015"
+  "presets": ["@babel/preset-env"]
 }

example/webpack2-babel/package.json

@@ -5,9 +5,9 @@
     "build": "webpack --config webpack.conf.js"
   },
   "devDependencies": {
-    "babel-core": "^6.18.2",
-    "babel-loader": "^7.1.4",
-    "babel-preset-es2015": "^6.18.0",
+    "@babel/core": "^7.9.6",
+    "@babel/preset-env": "^7.9.6",
+    "babel-loader": "^8.1.0",
     "jasmine-core": "^3.1.0",
     "jsdom": "^11.7.0",
     "karma-jasmine": "^1.1.1",

example/webpack2-babel/webpack.conf.js

@@ -18,7 +18,11 @@ module.exports = {
     main: './test/main_test',
   },
 
-  plugins: [new webpack.DefinePlugin({__VALUEA__: 10})],
+  plugins: [
+    new webpack.DefinePlugin({
+      __VALUEA__: 10,
+    }),
+  ],
 
   output: {
     path: path.resolve(__dirname, './dest'),
@@ -36,6 +40,8 @@ module.exports = {
   },
 
   resolveLoader: {
-    modules: ['node_modules', '../../'],
+    alias: {
+      'inject-loader': path.resolve(__dirname, '../../tmp'),
+    },
   },
 };

example/webpack2-esm/.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": [["@babel/preset-env", {"modules": false}]]
+}

example/webpack1-babel/karma.conf.js → example/webpack2-esm/karma.conf.js

@@ -18,7 +18,7 @@ module.exports = function karmaConfig(config) {
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['PhantomJS'],
+    browsers: ['jsdom'],
     singleRun: true,
     concurrency: Infinity,
     webpack: webpackConfig,

example/webpack2-esm/package.json

@@ -0,0 +1,19 @@
+{
+  "private": true,
+  "scripts": {
+    "test": "karma start",
+    "build": "webpack --config webpack.conf.js"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.9.6",
+    "@babel/preset-env": "^7.9.6",
+    "babel-loader": "^8.1.0",
+    "jasmine-core": "^3.1.0",
+    "jsdom": "^11.7.0",
+    "karma": "^2.0.0",
+    "karma-jasmine": "^1.1.1",
+    "karma-jsdom-launcher": "^6.1.3",
+    "karma-webpack": "^3.0.0",
+    "webpack": "~2"
+  }
+}

example/webpack2-esm/src/bar.js

@@ -0,0 +1 @@
+export const BAR = 2;

example/webpack1-babel/src/getFoo.js → example/webpack2-esm/src/getFoo.js

@@ -1,5 +1,3 @@
-/* global __VALUEA__ */
-
 export default function getFoo() {
   return __VALUEA__;
 }

example/webpack1-babel/src/main.js → example/webpack2-esm/src/main.js

@@ -1,7 +1,5 @@
-/* eslint-disable import/prefer-default-export */
-
 import getFoo from 'getFoo';
-import { BAR } from 'bar';
+import {BAR} from 'bar';
 
 export function getValue() {
   return getFoo() * BAR;

example/webpack2-esm/test/main_test.js

@@ -0,0 +1,30 @@
+import {getValue as mainGetValue} from 'main';
+import mainModuleInjector from 'inject-loader!main';
+
+describe('Main', () => {
+  it('works without injecting', () => {
+    expect(mainGetValue()).toEqual(20);
+  });
+
+  describe('injecting code into module dependencies', () => {
+    it('allows for injecting code into a subset of dependencies', () => {
+      let mainModuleInjected = mainModuleInjector({
+        bar: {BAR: 5},
+      });
+      expect(mainModuleInjected.getValue()).toEqual(50);
+
+      mainModuleInjected = mainModuleInjector({
+        getFoo: () => 10,
+      });
+      expect(mainModuleInjected.getValue()).toEqual(20);
+    });
+
+    it('allows for injecting code mulitple dependencies', () => {
+      let mainModuleInjected = mainModuleInjector({
+        getFoo: () => 5,
+        bar: {BAR: 5},
+      });
+      expect(mainModuleInjected.getValue()).toEqual(25);
+    });
+  });
+});