metro-transform-worker 0.60.0 → 0.64.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "metro-transform-worker",
-  "version": "0.60.0",
-  "description": "🚇 Transform worker for Metro",
+  "version": "0.64.0",
+  "description": "🚇 Transform worker for Metro.",
   "main": "src/index.js",
   "repository": {
     "type": "git",
@@ -18,17 +18,19 @@
     "@babel/parser": "^7.0.0",
     "@babel/types": "^7.0.0",
     "babel-preset-fbjs": "^3.3.0",
-    "metro-babel-transformer": "0.60.0",
-    "metro-cache": "0.60.0",
-    "metro-hermes-compiler": "0.60.0",
-    "metro-source-map": "0.60.0",
-    "metro-transform-plugins": "0.60.0",
-    "metro": "0.60.0"
+    "metro": "0.64.0",
+    "metro-babel-transformer": "0.64.0",
+    "metro-cache": "0.64.0",
+    "metro-cache-key": "0.64.0",
+    "metro-hermes-compiler": "0.64.0",
+    "metro-source-map": "0.64.0",
+    "metro-transform-plugins": "0.64.0",
+    "nullthrows": "^1.1.1"
   },
   "devDependencies": {
-    "metro-minify-uglify": "0.60.0",
-    "metro-memory-fs": "0.60.0",
-    "mkdirp": "^0.5.1",
-    "metro-react-native-babel-transformer": "0.60.0"
+    "metro-memory-fs": "0.64.0",
+    "metro-minify-uglify": "0.64.0",
+    "metro-react-native-babel-transformer": "0.64.0",
+    "mkdirp": "^0.5.1"
   }
 }

package/src/index.js

@@ -189,9 +189,11 @@ const collectDependencies = require("metro/src/ModuleGraph/worker/collectDepende
 
 const generateImportNames = require("metro/src/ModuleGraph/worker/generateImportNames");
 
+const nullthrows = require("nullthrows");
+
 const generate = require("@babel/generator").default;
 
-const getKeyFromFiles = require("metro/src/lib/getKeyFromFiles");
+const getCacheKey = require("metro-cache-key");
 
 const getMinifier = require("./utils/getMinifier");
 
@@ -332,7 +334,7 @@ module.exports = {
       }
 
       if (filename.endsWith(".json")) {
-        let code = JsFileWrapping.wrapJson(sourceCode);
+        let code = JsFileWrapping.wrapJson(sourceCode, config.globalPrefix);
         let map = [];
 
         if (options.minify) {
@@ -395,6 +397,7 @@ module.exports = {
           {
             enableBabelRCLookup: config.enableBabelRCLookup,
             enableBabelRuntime: config.enableBabelRuntime,
+            globalPrefix: config.globalPrefix,
             // Inline requires are now performed at a secondary step. We cannot
             // unfortunately remove it from the internal transformer, since this one
             // is used by other tooling, and this would affect it.
@@ -481,20 +484,19 @@ module.exports = {
       }
 
       plugins.push([inlinePlugin, opts]);
-
-      var _transformFromAstSync = transformFromAstSync(ast, "", {
-        ast: true,
-        babelrc: false,
-        code: false,
-        configFile: false,
-        comments: false,
-        compact: false,
-        filename,
-        plugins,
-        sourceMaps: false
-      });
-
-      ast = _transformFromAstSync.ast;
+      ast = nullthrows(
+        transformFromAstSync(ast, "", {
+          ast: true,
+          babelrc: false,
+          code: false,
+          configFile: false,
+          comments: false,
+          compact: false,
+          filename,
+          plugins,
+          sourceMaps: false
+        }).ast
+      );
       let dependencyMapName = "";
       let dependencies;
       let wrappedAst; // If the module to transform is a script (meaning that is not part of the
@@ -535,7 +537,8 @@ module.exports = {
           ast,
           importDefault,
           importAll,
-          dependencyMapName
+          dependencyMapName,
+          config.globalPrefix
         );
 
         wrappedAst = _JsFileWrapping$wrapM.ast;
@@ -625,7 +628,7 @@ module.exports = {
         "minifierPath"
       ]);
 
-    const filesKey = getKeyFromFiles(
+    const filesKey = getCacheKey(
       [
         require.resolve(babelTransformerPath),
         require.resolve(minifierPath),

package/src/index.js.flow

@@ -17,8 +17,9 @@ const assetTransformer = require('./utils/assetTransformer');
 const babylon = require('@babel/parser');
 const collectDependencies = require('metro/src/ModuleGraph/worker/collectDependencies');
 const generateImportNames = require('metro/src/ModuleGraph/worker/generateImportNames');
+const nullthrows = require('nullthrows');
 const generate = require('@babel/generator').default;
-const getKeyFromFiles = require('metro/src/lib/getKeyFromFiles');
+const getCacheKey = require('metro-cache-key');
 const getMinifier = require('./utils/getMinifier');
 const {
   constantFoldingPlugin,
@@ -85,6 +86,7 @@ export type JsTransformerConfig = $ReadOnly<{|
   enableBabelRCLookup: boolean,
   enableBabelRuntime: boolean,
   experimentalImportBundleSupport: boolean,
+  globalPrefix: string,
   minifierConfig: MinifierConfig,
   minifierPath: string,
   optimizationSizeLimit: number,
@@ -244,7 +246,7 @@ module.exports = {
     }
 
     if (filename.endsWith('.json')) {
-      let code = JsFileWrapping.wrapJson(sourceCode);
+      let code = JsFileWrapping.wrapJson(sourceCode, config.globalPrefix);
       let map = [];
 
       if (options.minify) {
@@ -297,6 +299,7 @@ module.exports = {
         ...options,
         enableBabelRCLookup: config.enableBabelRCLookup,
         enableBabelRuntime: config.enableBabelRuntime,
+        globalPrefix: config.globalPrefix,
         // Inline requires are now performed at a secondary step. We cannot
         // unfortunately remove it from the internal transformer, since this one
         // is used by other tooling, and this would affect it.
@@ -370,17 +373,19 @@ module.exports = {
 
     plugins.push([inlinePlugin, opts]);
 
-    ({ast} = transformFromAstSync(ast, '', {
-      ast: true,
-      babelrc: false,
-      code: false,
-      configFile: false,
-      comments: false,
-      compact: false,
-      filename,
-      plugins,
-      sourceMaps: false,
-    }));
+    ast = nullthrows(
+      transformFromAstSync(ast, '', {
+        ast: true,
+        babelrc: false,
+        code: false,
+        configFile: false,
+        comments: false,
+        compact: false,
+        filename,
+        plugins,
+        sourceMaps: false,
+      }).ast,
+    );
 
     let dependencyMapName = '';
     let dependencies;
@@ -421,6 +426,7 @@ module.exports = {
         importDefault,
         importAll,
         dependencyMapName,
+        config.globalPrefix,
       ));
     }
 
@@ -490,7 +496,7 @@ module.exports = {
   getCacheKey: (config: JsTransformerConfig): string => {
     const {babelTransformerPath, minifierPath, ...remainingConfig} = config;
 
-    const filesKey = getKeyFromFiles([
+    const filesKey = getCacheKey([
       require.resolve(babelTransformerPath),
       require.resolve(minifierPath),
       require.resolve('./utils/getMinifier'),

package/src/utils/assetTransformer.js.flow

@@ -15,14 +15,14 @@ const path = require('path');
 const {getAssetData} = require('metro/src/Assets');
 const {generateAssetCodeFileAst} = require('metro/src/Bundler/util');
 
-import type {Ast} from '@babel/core';
+import type {File} from '@babel/types';
 import type {BabelTransformerArgs} from 'metro-babel-transformer';
 
 async function transform(
   {filename, options, src}: BabelTransformerArgs,
   assetRegistryPath: string,
   assetDataPlugins: $ReadOnlyArray<string>,
-): Promise<{ast: Ast, ...}> {
+): Promise<{ast: File, ...}> {
   options = options || {
     platform: '',
     projectRoot: '',

package/src.real/index.js

@@ -171,9 +171,11 @@ const collectDependencies = require("metro/src/ModuleGraph/worker/collectDepende
 
 const generateImportNames = require("metro/src/ModuleGraph/worker/generateImportNames");
 
+const nullthrows = require("nullthrows");
+
 const generate = require("@babel/generator").default;
 
-const getKeyFromFiles = require("metro/src/lib/getKeyFromFiles");
+const getCacheKey = require("metro-cache-key");
 
 const getMinifier = require("./utils/getMinifier");
 
@@ -314,7 +316,7 @@ module.exports = {
       }
 
       if (filename.endsWith(".json")) {
-        let code = JsFileWrapping.wrapJson(sourceCode);
+        let code = JsFileWrapping.wrapJson(sourceCode, config.globalPrefix);
         let map = [];
 
         if (options.minify) {
@@ -377,6 +379,7 @@ module.exports = {
           {
             enableBabelRCLookup: config.enableBabelRCLookup,
             enableBabelRuntime: config.enableBabelRuntime,
+            globalPrefix: config.globalPrefix,
             // Inline requires are now performed at a secondary step. We cannot
             // unfortunately remove it from the internal transformer, since this one
             // is used by other tooling, and this would affect it.
@@ -463,20 +466,19 @@ module.exports = {
       }
 
       plugins.push([inlinePlugin, opts]);
-
-      var _transformFromAstSync = transformFromAstSync(ast, "", {
-        ast: true,
-        babelrc: false,
-        code: false,
-        configFile: false,
-        comments: false,
-        compact: false,
-        filename,
-        plugins,
-        sourceMaps: false
-      });
-
-      ast = _transformFromAstSync.ast;
+      ast = nullthrows(
+        transformFromAstSync(ast, "", {
+          ast: true,
+          babelrc: false,
+          code: false,
+          configFile: false,
+          comments: false,
+          compact: false,
+          filename,
+          plugins,
+          sourceMaps: false
+        }).ast
+      );
       let dependencyMapName = "";
       let dependencies;
       let wrappedAst; // If the module to transform is a script (meaning that is not part of the
@@ -517,7 +519,8 @@ module.exports = {
           ast,
           importDefault,
           importAll,
-          dependencyMapName
+          dependencyMapName,
+          config.globalPrefix
         );
 
         wrappedAst = _JsFileWrapping$wrapM.ast;
@@ -607,7 +610,7 @@ module.exports = {
         "minifierPath"
       ]);
 
-    const filesKey = getKeyFromFiles(
+    const filesKey = getCacheKey(
       [
         require.resolve(babelTransformerPath),
         require.resolve(minifierPath),

package/src.real/index.js.flow

@@ -17,8 +17,9 @@ const assetTransformer = require('./utils/assetTransformer');
 const babylon = require('@babel/parser');
 const collectDependencies = require('metro/src/ModuleGraph/worker/collectDependencies');
 const generateImportNames = require('metro/src/ModuleGraph/worker/generateImportNames');
+const nullthrows = require('nullthrows');
 const generate = require('@babel/generator').default;
-const getKeyFromFiles = require('metro/src/lib/getKeyFromFiles');
+const getCacheKey = require('metro-cache-key');
 const getMinifier = require('./utils/getMinifier');
 const {
   constantFoldingPlugin,
@@ -85,6 +86,7 @@ export type JsTransformerConfig = $ReadOnly<{|
   enableBabelRCLookup: boolean,
   enableBabelRuntime: boolean,
   experimentalImportBundleSupport: boolean,
+  globalPrefix: string,
   minifierConfig: MinifierConfig,
   minifierPath: string,
   optimizationSizeLimit: number,
@@ -244,7 +246,7 @@ module.exports = {
     }
 
     if (filename.endsWith('.json')) {
-      let code = JsFileWrapping.wrapJson(sourceCode);
+      let code = JsFileWrapping.wrapJson(sourceCode, config.globalPrefix);
       let map = [];
 
       if (options.minify) {
@@ -297,6 +299,7 @@ module.exports = {
         ...options,
         enableBabelRCLookup: config.enableBabelRCLookup,
         enableBabelRuntime: config.enableBabelRuntime,
+        globalPrefix: config.globalPrefix,
         // Inline requires are now performed at a secondary step. We cannot
         // unfortunately remove it from the internal transformer, since this one
         // is used by other tooling, and this would affect it.
@@ -370,17 +373,19 @@ module.exports = {
 
     plugins.push([inlinePlugin, opts]);
 
-    ({ast} = transformFromAstSync(ast, '', {
-      ast: true,
-      babelrc: false,
-      code: false,
-      configFile: false,
-      comments: false,
-      compact: false,
-      filename,
-      plugins,
-      sourceMaps: false,
-    }));
+    ast = nullthrows(
+      transformFromAstSync(ast, '', {
+        ast: true,
+        babelrc: false,
+        code: false,
+        configFile: false,
+        comments: false,
+        compact: false,
+        filename,
+        plugins,
+        sourceMaps: false,
+      }).ast,
+    );
 
     let dependencyMapName = '';
     let dependencies;
@@ -421,6 +426,7 @@ module.exports = {
         importDefault,
         importAll,
         dependencyMapName,
+        config.globalPrefix,
       ));
     }
 
@@ -490,7 +496,7 @@ module.exports = {
   getCacheKey: (config: JsTransformerConfig): string => {
     const {babelTransformerPath, minifierPath, ...remainingConfig} = config;
 
-    const filesKey = getKeyFromFiles([
+    const filesKey = getCacheKey([
       require.resolve(babelTransformerPath),
       require.resolve(minifierPath),
       require.resolve('./utils/getMinifier'),

package/src.real/utils/assetTransformer.js.flow

@@ -15,14 +15,14 @@ const path = require('path');
 const {getAssetData} = require('metro/src/Assets');
 const {generateAssetCodeFileAst} = require('metro/src/Bundler/util');
 
-import type {Ast} from '@babel/core';
+import type {File} from '@babel/types';
 import type {BabelTransformerArgs} from 'metro-babel-transformer';
 
 async function transform(
   {filename, options, src}: BabelTransformerArgs,
   assetRegistryPath: string,
   assetDataPlugins: $ReadOnlyArray<string>,
-): Promise<{ast: Ast, ...}> {
+): Promise<{ast: File, ...}> {
   options = options || {
     platform: '',
     projectRoot: '',