Expose a modulesOnly option for the bundle endpoint

Reviewed By: rubennorte Differential Revision: D15898570 fbshipit-source-id: c8b11eac6cd616b7fb3adedcce6205a647a38da2
facebook · Jun 24, 2019 · 79904d8 · 79904d8
1 parent beb3d1a
commit 79904d8
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 4 deletions.
diff --git a/packages/metro/src/DeltaBundler/Serializers/__tests__/baseJSBundle-test.js b/packages/metro/src/DeltaBundler/Serializers/__tests__/baseJSBundle-test.js
@@ -229,3 +229,46 @@ it('should add an inline source map to a very simple bundle', () => {
     version: 3,
   });
 });
+
+it('does not add polyfills when `modulesOnly` is used', () => {
+  expect(
+    baseJSBundle(
+      '/root/foo',
+      [polyfill],
+      {
+        dependencies: new Map([
+          ['/root/foo', fooModule],
+          ['/root/bar', barModule],
+        ]),
+        entryPoints: ['foo'],
+      },
+      {
+        processModuleFilter: () => true,
+        createModuleId: filePath => path.basename(filePath),
+        dev: true,
+        getRunModuleStatement,
+        modulesOnly: true,
+        projectRoot: '/root',
+        runBeforeMainModule: [],
+        runModule: true,
+        sourceMapUrl: 'http://localhost/bundle.map',
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+Object {
+  "modules": Array [
+    Array [
+      "foo",
+      "__d(function() {/* code for foo */},\\"foo\\",[\\"bar\\"],\\"foo\\");",
+    ],
+    Array [
+      "bar",
+      "__d(function() {/* code for bar */},\\"bar\\",[],\\"bar\\");",
+    ],
+  ],
+  "post": "require(\\"foo\\");
+//# sourceMappingURL=http://localhost/bundle.map",
+  "pre": "",
+}
+`);
+});
diff --git a/packages/metro/src/DeltaBundler/Serializers/baseJSBundle.js b/packages/metro/src/DeltaBundler/Serializers/baseJSBundle.js
@@ -38,6 +38,11 @@ function baseJSBundle(
     projectRoot: options.projectRoot,
   };
 
+  // Do not prepend polyfills or the require runtime when only modules are requested
+  if (options.modulesOnly) {
+    preModules = [];
+  }
+
   const preCode = processModules(preModules, processModulesOptions)
     .map(([_, code]) => code)
     .join('\n');

diff --git a/packages/metro/src/DeltaBundler/types.flow.js b/packages/metro/src/DeltaBundler/types.flow.js
@@ -85,13 +85,14 @@ export type DeltaResult<T = MixedOutput> = {|
 |};
 
 export type SerializerOptions = {|
-  +processModuleFilter: (module: Module<>) => boolean,
   +createModuleId: string => number,
   +dev: boolean,
   +getRunModuleStatement: (number | string) => string,
+  +inlineSourceMap: ?boolean,
+  +modulesOnly: boolean,
+  +processModuleFilter: (module: Module<>) => boolean,
   +projectRoot: string,
   +runBeforeMainModule: $ReadOnlyArray<string>,
   +runModule: boolean,
   +sourceMapUrl: ?string,
-  +inlineSourceMap: ?boolean,
 |};
diff --git a/packages/metro/src/Server.js b/packages/metro/src/Server.js
@@ -199,6 +199,7 @@ class Server {
       getRunModuleStatement: this._config.serializer.getRunModuleStatement,
       dev: transformOptions.dev,
       projectRoot: this._config.projectRoot,
+      modulesOnly: serializerOptions.modulesOnly,
       runBeforeMainModule: this._config.serializer.getModulesRunBeforeMainModule(
         path.relative(this._config.projectRoot, entryPoint),
       ),
@@ -241,6 +242,7 @@ class Server {
       getTransformOptions: this._config.transformer.getTransformOptions,
       platform: transformOptions.platform,
       projectRoot: this._config.projectRoot,
+      modulesOnly: serializerOptions.modulesOnly,
       runBeforeMainModule: this._config.serializer.getModulesRunBeforeMainModule(
         path.relative(this._config.projectRoot, entryPoint),
       ),
@@ -655,6 +657,7 @@ class Server {
           dev: transformOptions.dev,
           getRunModuleStatement: this._config.serializer.getRunModuleStatement,
           projectRoot: this._config.projectRoot,
+          modulesOnly: serializerOptions.modulesOnly,
           runBeforeMainModule: this._config.serializer.getModulesRunBeforeMainModule(
             path.relative(this._config.projectRoot, entryFile),
           ),
@@ -733,6 +736,7 @@ class Server {
         getRunModuleStatement: this._config.serializer.getRunModuleStatement,
         dev: transformOptions.dev,
         projectRoot: this._config.projectRoot,
+        modulesOnly: serializerOptions.modulesOnly,
         runBeforeMainModule: this._config.serializer.getModulesRunBeforeMainModule(
           path.relative(this._config.projectRoot, entryFile),
         ),
@@ -874,6 +878,7 @@ class Server {
         getRunModuleStatement: this._config.serializer.getRunModuleStatement,
         dev: transformOptions.dev,
         projectRoot: this._config.projectRoot,
+        modulesOnly: serializerOptions.modulesOnly,
         runBeforeMainModule: this._config.serializer.getModulesRunBeforeMainModule(
           path.relative(this._config.projectRoot, entryFile),
         ),
@@ -1057,6 +1062,7 @@ class Server {
     ...Server.DEFAULT_GRAPH_OPTIONS,
     excludeSource: false,
     inlineSourceMap: false,
+    modulesOnly: false,
     onProgress: null,
     runModule: true,
     sourceMapUrl: null,

diff --git a/packages/metro/src/lib/parseOptionsFromUrl.js b/packages/metro/src/lib/parseOptionsFromUrl.js
@@ -86,6 +86,7 @@ function parseOptionsFromUrl(
     false,
   );
   const runModule = getBoolOptionFromQuery(urlQuery, 'runModule', true);
+  const modulesOnly = getBoolOptionFromQuery(urlQuery, 'modulesOnly', false);
 
   const customTransformOptions = parseCustomTransformOptions(urlObj);
 
@@ -96,6 +97,7 @@ function parseOptionsFromUrl(
       dev,
       hot: true,
       minify,
+      modulesOnly,
       platform,
       onProgress: null,
       entryFile: entryFileRelativeToProjectRoot,

diff --git a/packages/metro/src/lib/splitBundleOptions.js b/packages/metro/src/lib/splitBundleOptions.js
@@ -27,10 +27,11 @@ function splitBundleOptions(options: BundleOptions): SplitBundleOptions {
       type: 'module',
     },
     serializerOptions: {
-      sourceMapUrl: options.sourceMapUrl,
-      runModule: options.runModule,
       excludeSource: options.excludeSource,
       inlineSourceMap: options.inlineSourceMap,
+      modulesOnly: options.modulesOnly,
+      runModule: options.runModule,
+      sourceMapUrl: options.sourceMapUrl,
     },
     onProgress: options.onProgress,
   };

diff --git a/packages/metro/src/shared/types.flow.js b/packages/metro/src/shared/types.flow.js
@@ -45,6 +45,7 @@ export type BundleOptions = {
   +hot: boolean,
   +inlineSourceMap: boolean,
   minify: boolean,
+  +modulesOnly: boolean,
   onProgress: ?(doneCont: number, totalCount: number) => mixed,
   +platform: ?string,
   +runModule: boolean,
@@ -57,6 +58,7 @@ export type SerializerOptions = {|
   +runModule: boolean,
   +excludeSource: boolean,
   +inlineSourceMap: boolean,
+  +modulesOnly: boolean,
 |};
 
 // Stricter representation of BundleOptions.