Delete Meta-only __jsResource support

Summary: Changelog: Internal Removes the Meta-only `jsResource` feature from `collectDependencies`. This is one of the prerequisites for open sourcing a stable version of the `asyncRequire` API for dev-mode bundle splitting. Reviewed By: robhogan Differential Revision: D42801122 fbshipit-source-id: cf42be56d4b9024dd1a74eb7e00c11f246e05e07
facebook · Feb 27, 2023 · 69c8fc7 · 69c8fc7
1 parent f1d905b
commit 69c8fc7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 73 deletions.
diff --git a/packages/metro-transform-worker/src/index.js b/packages/metro-transform-worker/src/index.js
@@ -262,7 +262,6 @@ const compileToBytecode = (
 const disabledDependencyTransformer: DependencyTransformer = {
   transformSyncRequire: () => void 0,
   transformImportCall: () => void 0,
-  transformJSResource: () => void 0,
   transformPrefetch: () => void 0,
   transformIllegalDynamicRequire: () => void 0,
 };

diff --git a/packages/metro/src/ModuleGraph/worker/__tests__/collectDependencies-test.js b/packages/metro/src/ModuleGraph/worker/__tests__/collectDependencies-test.js
@@ -858,22 +858,6 @@ it('distinguishes sync and async dependencies on the same module; reverse order'
   );
 });
 
-it('collects __jsResource calls', () => {
-  const ast = astFromCode(`
-    __jsResource("some/async/module");
-  `);
-  const {dependencies, dependencyMapName} = collectDependencies(ast, opts);
-  expect(dependencies).toEqual([
-    {name: 'some/async/module', data: objectContaining({asyncType: 'async'})},
-    {name: 'asyncRequire', data: objectContaining({asyncType: null})},
-  ]);
-  expect(codeFromAst(ast)).toEqual(
-    comparableCode(`
-      require(${dependencyMapName}[1], "asyncRequire").resource(${dependencyMapName}[0], "some/async/module", _dependencyMap.paths);
-    `),
-  );
-});
-
 describe('import() prefetching', () => {
   it('collects prefetch calls', () => {
     const ast = astFromCode(`
@@ -1116,7 +1100,7 @@ it('records locations of dependencies', () => {
     import * as d from 'do';
     import type {s} from 'setup/something';
     import('some/async/module').then(foo => {});
-    __jsResource('some/async/module');
+
 
 
     require('foo'); __prefetchImport('baz');
@@ -1146,12 +1130,8 @@ it('records locations of dependencies', () => {
         | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dep #2 (setup/something)
     > 4 | import('some/async/module').then(foo => {});
         | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ dep #3 (some/async/module)
-    > 5 | __jsResource('some/async/module');
-        | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dep #3 (some/async/module)
     > 4 | import('some/async/module').then(foo => {});
         | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dep #4 (asyncRequire)
-    > 5 | __jsResource('some/async/module');
-        | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dep #4 (asyncRequire)
     > 8 | require('foo'); __prefetchImport('baz');
         |                 ^^^^^^^^^^^^^^^^^^^^^^^^ dep #4 (asyncRequire)
     > 8 | require('foo'); __prefetchImport('baz');
@@ -1347,7 +1327,6 @@ it('uses the dependency transformer specified in the options to transform the de
     export {Banana} from 'Banana';
 
     import("some/async/module").then(foo => {});
-    __jsResource("some/async/module");
     __prefetchImport("some/async/module");
   `);
 
@@ -1364,7 +1343,6 @@ it('uses the dependency transformer specified in the options to transform the de
       import b from 'b/lib/b';
       export { Banana } from 'Banana';
       require("asyncRequire").async(_dependencyMap[3], "some/async/module").then(foo => {});
-      require("asyncRequire").jsresource(_dependencyMap[3], "some/async/module");
       require("asyncRequire").prefetch(_dependencyMap[4], "some/async/module");
       `),
   );
@@ -1377,7 +1355,6 @@ it('uses the dependency registry specified in the options to register dependenci
       export {Banana} from 'Banana';
 
       import("some/async/module").then(foo => {});
-      __jsResource("a/jsresouce");
       __prefetchImport("a/prefetch/module");
     `);
 
@@ -1392,7 +1369,6 @@ it('uses the dependency registry specified in the options to register dependenci
     {name: 'b/lib/b', data: objectContaining({asyncType: null})},
     {name: 'Banana', data: objectContaining({asyncType: null})},
     {name: 'some/async/module', data: objectContaining({asyncType: 'async'})},
-    {name: 'a/jsresouce', data: objectContaining({asyncType: 'async'})},
     {
       name: 'a/prefetch/module',
       data: objectContaining({asyncType: 'prefetch'}),
@@ -1495,7 +1471,6 @@ class MockModuleDependencyRegistry implements ModuleDependencyRegistry {
 // Mock transformer for dependencies. Uses a "readable" format
 // require() -> require(id, module name)
 // import() -> require(async moudle name).async(id, module name)
-// jsresource -> require(async moudle name).jsresource(id, module name)
 // prefetch -> require(async moudle name).prefetch(id, module name)
 const MockDependencyTransformer: DependencyTransformer = {
   transformSyncRequire(
@@ -1519,14 +1494,6 @@ const MockDependencyTransformer: DependencyTransformer = {
     transformAsyncRequire(path, dependency, state, 'async');
   },
 
-  transformJSResource(
-    path: NodePath<>,
-    dependency: InternalDependency,
-    state: State,
-  ): void {
-    transformAsyncRequire(path, dependency, state, 'jsresource');
-  },
-
   transformPrefetch(
     path: NodePath<>,
     dependency: InternalDependency,

diff --git a/packages/metro/src/ModuleGraph/worker/collectDependencies.js b/packages/metro/src/ModuleGraph/worker/collectDependencies.js
@@ -28,7 +28,6 @@ const {isImport} = types;
 
 type ImportDependencyOptions = $ReadOnly<{
   asyncType: AsyncDependencyType,
-  jsResource?: boolean,
 }>;
 
 export type Dependency = $ReadOnly<{
@@ -122,11 +121,6 @@ export interface DependencyTransformer {
     dependency: InternalDependency,
     state: State,
   ): void;
-  transformJSResource(
-    path: NodePath<>,
-    dependency: InternalDependency,
-    state: State,
-  ): void;
   transformPrefetch(
     path: NodePath<>,
     dependency: InternalDependency,
@@ -192,14 +186,6 @@ function collectDependencies(
         return;
       }
 
-      if (name === '__jsResource' && !path.scope.getBinding(name)) {
-        processImportCall(path, state, {
-          asyncType: 'async',
-          jsResource: true,
-        });
-        return;
-      }
-
       // Match `require.context`
       if (
         // Feature gate, defaults to `false`.
@@ -480,9 +466,7 @@ function processImportCall(
 
   const transformer = state.dependencyTransformer;
 
-  if (options.jsResource) {
-    transformer.transformJSResource(path, dep, state);
-  } else if (options.asyncType === 'async') {
+  if (options.asyncType === 'async') {
     transformer.transformImportCall(path, dep, state);
   } else {
     transformer.transformPrefetch(path, dep, state);
@@ -649,10 +633,6 @@ const makeAsyncPrefetchTemplate = template.expression(`
   require(ASYNC_REQUIRE_MODULE_PATH).prefetch(MODULE_ID, MODULE_NAME, DEPENDENCY_MAP.paths)
 `);
 
-const makeJSResourceTemplate = template.expression(`
-  require(ASYNC_REQUIRE_MODULE_PATH).resource(MODULE_ID, MODULE_NAME, DEPENDENCY_MAP.paths)
-`);
-
 const makeResolveWeakTemplate = template.expression(`
   MODULE_ID
 `);
@@ -693,23 +673,6 @@ const DefaultDependencyTransformer: DependencyTransformer = {
     );
   },
 
-  transformJSResource(
-    path: NodePath<>,
-    dependency: InternalDependency,
-    state: State,
-  ): void {
-    path.replaceWith(
-      makeJSResourceTemplate({
-        ASYNC_REQUIRE_MODULE_PATH: nullthrows(
-          state.asyncRequireModulePathStringLiteral,
-        ),
-        MODULE_ID: createModuleIDExpression(dependency, state),
-        MODULE_NAME: createModuleNameLiteral(dependency),
-        DEPENDENCY_MAP: nullthrows(state.dependencyMapIdentifier),
-      }),
-    );
-  },
-
   transformPrefetch(
     path: NodePath<>,
     dependency: InternalDependency,