Merge pull request #17 from facebook/next

Allow ModuleScopePlugin accecpts an array as its appSrc (facebook#4138)
tvalentius · Mar 23, 2018 · 5e3d8a9 · 5e3d8a9
2 parents aea4d14 + 1922f4d
commit 5e3d8a9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/packages/react-dev-utils/ModuleScopePlugin.js b/packages/react-dev-utils/ModuleScopePlugin.js
@@ -12,12 +12,12 @@ const path = require('path');
 
 class ModuleScopePlugin {
   constructor(appSrc, allowedFiles = []) {
-    this.appSrc = appSrc;
+    this.appSrcs = Array.isArray(appSrc) ? appSrc : [appSrc];
     this.allowedFiles = new Set(allowedFiles);
   }
 
   apply(resolver) {
-    const { appSrc } = this;
+    const { appSrcs } = this;
     resolver.plugin('file', (request, callback) => {
       // Unknown issuer, probably webpack internals
       if (!request.context.issuer) {
@@ -34,9 +34,13 @@ class ModuleScopePlugin {
       }
       // Resolve the issuer from our appSrc and make sure it's one of our files
       // Maybe an indexOf === 0 would be better?
-      const relative = path.relative(appSrc, request.context.issuer);
-      // If it's not in src/ or a subdirectory, not our request!
-      if (relative.startsWith('../') || relative.startsWith('..\\')) {
+      if (
+        appSrcs.every(appSrc => {
+          const relative = path.relative(appSrc, request.context.issuer);
+          // If it's not in one of our app src or a subdirectory, not our request!
+          return relative.startsWith('../') || relative.startsWith('..\\');
+        })
+      ) {
         return callback();
       }
       const requestFullPath = path.resolve(
@@ -47,11 +51,15 @@ class ModuleScopePlugin {
         return callback();
       }
       // Find path from src to the requested file
-      // Error if in a parent directory of src/
-      const requestRelative = path.relative(appSrc, requestFullPath);
+      // Error if in a parent directory of all given appSrcs
       if (
-        requestRelative.startsWith('../') ||
-        requestRelative.startsWith('..\\')
+        appSrcs.every(appSrc => {
+          const requestRelative = path.relative(appSrc, requestFullPath);
+          return (
+            requestRelative.startsWith('../') ||
+            requestRelative.startsWith('..\\')
+          );
+        })
       ) {
         callback(
           new Error(

diff --git a/packages/react-dev-utils/README.md b/packages/react-dev-utils/README.md
@@ -57,9 +57,9 @@ module.exports = {
 ```
 
 
-#### `new ModuleScopePlugin(appSrc: string, allowedFiles?: string[])`
+#### `new ModuleScopePlugin(appSrc: string | string[], allowedFiles?: string[])`
 
-This Webpack plugin ensures that relative imports from app's source directory don't reach outside of it.
+This Webpack plugin ensures that relative imports from app's source directories don't reach outside of it.
 
 ```js
 var path = require('path');