Upgrade to webpack@4 and babel@7 (fusionjs#281)

build/babel-plugins/babel-plugin-asseturl/test/fixtures/expected-import-destructuring

@@ -1,7 +1,6 @@
 import { assetUrl } from 'fusion-core';
 import { assetUrl as assetUrlOther } from 'assetUrl';
-
 const path = './test';
-assetUrl(require('__SECRET_FILE_LOADER__?storeFile=true&storeFileTarget=node!./path'));
+assetUrl(require("__SECRET_FILE_LOADER__?storeFile=true&storeFileTarget=node!./path"));
 assetUrlOther(path);
-assetUrl(require('__SECRET_FILE_LOADER__?storeFile=true&storeFileTarget=node!./path'));
+assetUrl(require("__SECRET_FILE_LOADER__?storeFile=true&storeFileTarget=node!./path"));

build/babel-plugins/babel-plugin-asseturl/test/fixtures/expected-import-destructuring-as

@@ -1,5 +1,4 @@
 import { assetUrl as frameworkAssetUrl } from 'fusion-core';
 import assetUrl from 'assetURL';
-
 assetUrl('./path');
-frameworkAssetUrl(require('__SECRET_FILE_LOADER__?storeFile=true&storeFileTarget=node!./path'));
+frameworkAssetUrl(require("__SECRET_FILE_LOADER__?storeFile=true&storeFileTarget=node!./path"));

build/babel-plugins/babel-plugin-asseturl/test/index.js

@@ -2,7 +2,7 @@
 /* eslint-env node */
 const fs = require('fs');
 const test = require('tape');
-const {transformFileSync} = require('babel-core');
+const {transformFileSync} = require('@babel/core');
 const plugin = require('../');
 
 test('import assetURL', t => {

build/babel-plugins/babel-plugin-chunkid/test/fixtures/expected-import-destructuring

@@ -1,7 +1,6 @@
 import { chunkId } from 'fusion-core';
 import { chunkId as chunkIdOther } from 'chunkId';
-
 const path = './test';
-chunkId(require('__SECRET_CHUNK_ID_LOADER__!./path'));
+chunkId(require("__SECRET_CHUNK_ID_LOADER__!./path"));
 chunkIdOther(path);
-chunkId(require('__SECRET_CHUNK_ID_LOADER__!./path'));
+chunkId(require("__SECRET_CHUNK_ID_LOADER__!./path"));

build/babel-plugins/babel-plugin-chunkid/test/fixtures/expected-import-destructuring-as

@@ -1,5 +1,4 @@
 import { chunkId as frameworkChunkId } from 'fusion-core';
 import chunkId from 'chunkId';
-
 chunkId('./path');
-frameworkChunkId(require('__SECRET_CHUNK_ID_LOADER__!./path'));
+frameworkChunkId(require("__SECRET_CHUNK_ID_LOADER__!./path"));

build/babel-plugins/babel-plugin-chunkid/test/index.js

@@ -2,7 +2,7 @@
 /* eslint-env node */
 const fs = require('fs');
 const test = require('tape');
-const {transformFileSync} = require('babel-core');
+const {transformFileSync} = require('@babel/core');
 const plugin = require('../');
 
 test('import assetURL', t => {

build/babel-plugins/babel-plugin-experimentation/index.js

@@ -1,6 +1,6 @@
 // @flow
 /* eslint-env node */
-const template = require('babel-template');
+const template = require('@babel/template').default;
 const createModuleVisitor = require('../babel-plugin-utils/visit-named-module');
 
 const PACKAGE_NAME = [

build/babel-plugins/babel-plugin-experimentation/test/index.js

@@ -26,7 +26,10 @@ test('withExperiment hoc', t => {
       return <div>Hello World</div>;
     }
 
-    export default withExperiment({ experimentName: 'test-experiment', onError: () => {} })(Component);
+    export default withExperiment({
+      experimentName: 'test-experiment',
+      onError: () => {}
+    })(Component);
   `
   );
   t.equal(result, expected);
@@ -55,7 +58,11 @@ test('withExperiment hoc, manualInclusionLogging', t => {
       return <div>Hello World</div>;
     }
 
-    export default withExperiment({ experimentName: 'test-experiment', onError: () => {}, manualInclusionLogging: true })(Component);
+    export default withExperiment({
+      experimentName: 'test-experiment',
+      onError: () => {},
+      manualInclusionLogging: true
+    })(Component);
   `
   );
   t.equal(result, expected);

build/babel-plugins/babel-plugin-experimentation/test/transform.js

@@ -1,7 +1,7 @@
 /* eslint-env node */
-const {transform} = require('babel-core');
+const {transform} = require('@babel/core');
 const plugin = require('../');
-const babelPluginSyntaxJsx = require('babel-plugin-syntax-jsx');
+const babelPluginSyntaxJsx = require('@babel/plugin-syntax-jsx');
 
 module.exports = function doTransform(inputString) {
   return (

build/babel-plugins/babel-plugin-i18n/index.js

@@ -1,6 +1,7 @@
 // @flow
 /* eslint-env node */
-const template = require('babel-template');
+const template = require('@babel/template').default;
+
 const createModuleVisitor = require('../babel-plugin-utils/visit-named-module');
 
 const PACKAGE_NAME = ['fusion-plugin-i18n-react', 'fusion-plugin-i18n-preact'];

build/babel-plugins/babel-plugin-i18n/test/get-expected.js

@@ -4,5 +4,5 @@ const sharedExpectedContent = require('./shared-expected-content.js');
 
 module.exports = function getExpected(inputString, includeShared = true) {
   const sharedContent = includeShared ? '\n' + sharedExpectedContent() : '';
-  return (stripIndent(inputString).trim() + sharedContent).replace(/"/g, "'");
+  return (stripIndent(inputString) + sharedContent).replace(/"/g, "'");
 };

build/babel-plugins/babel-plugin-i18n/test/shared-expected-content.js

@@ -3,19 +3,18 @@ const stripIndent = require('strip-indent');
 
 module.exports = () =>
   stripIndent(
-    `
-    import { chunkId as _chunkId } from 'fusion-core';
+    `import { chunkId as _chunkId } from 'fusion-core';
 
-    const _CHUNKIDS_ID = _chunkId('fake-file.js');
+const _CHUNKIDS_ID = _chunkId('fake-file.js');
 
-    import _singleton from 'fusion-plugin-i18n-react/singleton';
+import _singleton from 'fusion-plugin-i18n-react/singleton';
 
-    _singleton.add('fake-file.js', _CHUNKIDS_ID, _translations);
+_singleton.add('fake-file.js', _CHUNKIDS_ID, _translations);
 
-    if (module.hot) {
-      module.hot.dispose(() => {
-        _singleton.dispose('fake-file.js', _CHUNKIDS_ID, _translations);
-      });
-    }
+if (module.hot) {
+  module.hot.dispose(() => {
+    _singleton.dispose('fake-file.js', _CHUNKIDS_ID, _translations);
+  });
+}
 `
   ).trim();

build/babel-plugins/babel-plugin-i18n/test/transform.js

@@ -1,7 +1,7 @@
 /* eslint-env node */
-const {transform} = require('babel-core');
+const {transform} = require('@babel/core');
 const plugin = require('../');
-const babelPluginSyntaxJsx = require('babel-plugin-syntax-jsx');
+const babelPluginSyntaxJsx = require('@babel/plugin-syntax-jsx');
 
 module.exports = function doTransform(inputString) {
   return (

build/babel-plugins/babel-plugin-i18n/test/translate.js

@@ -16,14 +16,12 @@ test('translation component', t => {
   `
   );
   const expected = getExpected(
-    `
-    var _translations = ['foo'];
-    import { Translate } from 'fusion-plugin-i18n-react';
+    `var _translations = ['foo'];
+import { Translate } from 'fusion-plugin-i18n-react';
 
-    function Component() {
-      return <Translate id='foo' />;
-    }
-  `
+function Component() {
+  return <Translate id='foo' />;
+}\n`
   );
   t.equal(result, expected);
   t.end();
@@ -41,13 +39,11 @@ test('no translations', t => {
   `
   );
   const expected = getExpected(
-    `
-    import { Translate } from 'fusion-plugin-i18n-react';
+    `import { Translate } from 'fusion-plugin-i18n-react';
 
-    function Component() {
-      return <div>foo</div>;
-    }
-  `,
+function Component() {
+  return <div>foo</div>;
+}`,
     false
   );
   t.equal(result, expected);

build/babel-plugins/babel-plugin-i18n/test/with-translations.js

@@ -18,16 +18,14 @@ test('withTranslations hoc', t => {
   `
   );
   const expected = getExpected(
-    `
-    var _translations = ['foo'];
-    import { withTranslations } from 'fusion-plugin-i18n-react';
+    `var _translations = ['foo'];
+import { withTranslations } from 'fusion-plugin-i18n-react';
 
-    function Component() {
-      return <div>Hello World</div>;
-    }
+function Component() {
+  return <div>Hello World</div>;
+}
 
-    export default withTranslations(['foo'])(Component);
-  `
+export default withTranslations(['foo'])(Component);`
   );
   t.equal(result, expected);
   t.end();
@@ -47,16 +45,14 @@ test('withTranslations hoc with multiple translations', t => {
   `
   );
   const expected = getExpected(
-    `
-    var _translations = ['foo', 'baz'];
-    import { withTranslations } from 'fusion-plugin-i18n-react';
+    `var _translations = ['foo', 'baz'];
+import { withTranslations } from 'fusion-plugin-i18n-react';
 
-    function Component() {
-      return <div>Hello World</div>;
-    }
+function Component() {
+  return <div>Hello World</div>;
+}
 
-    export default withTranslations(['foo', 'baz'])(Component);
-  `
+export default withTranslations(['foo', 'baz'])(Component);`
   );
   t.equal(result, expected);
   t.end();
@@ -91,13 +87,11 @@ test('withTranslations hoc with no translations', t => {
   `
   );
   const expected = getExpected(
-    `
-    import { withTranslations } from 'fusion-plugin-i18n-react';
+    `import { withTranslations } from 'fusion-plugin-i18n-react';
 
-    function Component() {
-      return <div>foo</div>;
-    }
-  `,
+function Component() {
+  return <div>foo</div>;
+}`,
     false
   );
   t.equal(result, expected);

build/babel-plugins/babel-plugin-sw/test/transform.js

@@ -1,4 +1,4 @@
-const {transform} = require('babel-core');
+const {transform} = require('@babel/core');
 const plugin = require('../');
 /* eslint-env node */
 module.exports = function doTransform(inputString) {

build/babel-plugins/babel-plugin-sync-chunk-ids/test/fixtures/expected-import-destructuring

@@ -1,5 +1,4 @@
 import { syncChunkIds } from 'fusion-core';
 import { syncChunkIds as otherSyncChunkIds } from 'syncChunkIds';
-
-syncChunkIds(require('__SECRET_SYNC_CHUNK_IDS_LOADER__!'));
-otherSyncChunkIds();
+syncChunkIds(require("__SECRET_SYNC_CHUNK_IDS_LOADER__!"));
+otherSyncChunkIds();

build/babel-plugins/babel-plugin-sync-chunk-ids/test/fixtures/expected-import-destructuring-as

@@ -1,5 +1,4 @@
 import { syncChunkIds as frameworkSyncChunkIds } from 'fusion-core';
 import syncChunkIds from 'syncChunkIds';
-
-frameworkSyncChunkIds(require('__SECRET_SYNC_CHUNK_IDS_LOADER__!'));
-syncChunkIds();
+frameworkSyncChunkIds(require("__SECRET_SYNC_CHUNK_IDS_LOADER__!"));
+syncChunkIds();

build/babel-plugins/babel-plugin-sync-chunk-ids/test/index.js

@@ -2,7 +2,7 @@
 /* eslint-env node */
 const fs = require('fs');
 const test = require('tape');
-const {transformFileSync} = require('babel-core');
+const {transformFileSync} = require('@babel/core');
 const plugin = require('../');
 
 test('import syncChunkIds', t => {

build/babel-plugins/babel-plugin-sync-chunk-paths/test/fixtures/expected-import-destructuring

@@ -1,5 +1,4 @@
 import { syncChunkPaths } from 'fusion-core';
 import { syncChunkPaths as otherSyncChunkPaths } from 'syncChunkPaths';
-
-syncChunkPaths(require('__SECRET_SYNC_CHUNK_PATHS_LOADER__!'));
-otherSyncChunkPaths();
+syncChunkPaths(require("__SECRET_SYNC_CHUNK_PATHS_LOADER__!"));
+otherSyncChunkPaths();

build/babel-plugins/babel-plugin-sync-chunk-paths/test/fixtures/expected-import-destructuring-as

@@ -1,5 +1,4 @@
 import { syncChunkPaths as frameworkSyncChunkPaths } from 'fusion-core';
 import syncChunkPaths from 'syncChunkPaths';
-
-frameworkSyncChunkPaths(require('__SECRET_SYNC_CHUNK_PATHS_LOADER__!'));
-syncChunkPaths();
+frameworkSyncChunkPaths(require("__SECRET_SYNC_CHUNK_PATHS_LOADER__!"));
+syncChunkPaths();

build/babel-plugins/babel-plugin-utils/test/index.js

@@ -1,7 +1,7 @@
 // @flow
 /* eslint-env node */
 const test = require('tape');
-const {transform} = require('babel-core');
+const {transform} = require('@babel/core');
 const createNamedModuleVisitor = require('../visit-named-module');
 const replaceImportDeclaration = require('../replace-import-declaration');
 
@@ -17,6 +17,24 @@ function createTestPlugin(handler) {
   };
 }
 
+test('with flow types', t => {
+  t.plan(2);
+
+  const plugin = createTestPlugin((types, context, refs) => {
+    t.equal(refs.length, 1);
+    t.ok(types.isCallExpression(refs[0].parent));
+  });
+
+  transform(
+    `
+    import {foo} from 'bar';
+    import type {footype} from 'bar';
+    let baz: string = foo();
+  `,
+    {plugins: [plugin, require('@babel/plugin-transform-flow-strip-types')]}
+  );
+});
+
 test('import case', t => {
   t.plan(2);
 

build/babel-plugins/babel-plugin-utils/visit-named-module.js

@@ -36,6 +36,9 @@ function createNamedModuleVisitor(
       path.get('specifiers').forEach(specifier => {
         const localPath = specifier.get('local');
         const localName = localPath.node.name;
+        if (!localPath.scope.bindings[localName]) {
+          return;
+        }
         const refPaths = localPath.scope.bindings[localName].referencePaths;
         if (t.isImportSpecifier(specifier)) {
           // import {moduleName} from 'packageName';

build/babel-preset.js

@@ -19,20 +19,22 @@ module.exports = function buildPreset(
   return {
     presets: [
       [
-        require('babel-preset-env'),
+        require('@babel/preset-env'),
         {
           targets: targets,
           modules: modules,
           exclude: ['transform-regenerator', 'transform-async-to-generator'],
         },
       ],
-      require('babel-preset-react'),
+      require('@babel/preset-react'),
+      require('@babel/preset-flow'),
     ],
     plugins: [
-      require('babel-plugin-transform-async-generator-functions'),
-      require('babel-plugin-transform-class-properties'),
+      require('@babel/plugin-transform-flow-strip-types'),
+      require('@babel/plugin-proposal-async-generator-functions'),
+      require('@babel/plugin-proposal-class-properties'),
       [
-        require('babel-plugin-transform-object-rest-spread'),
+        require('@babel/plugin-proposal-object-rest-spread'),
         {
           useBuiltIns: true,
         },