feat: added support for arrays in modulesFolder (#1293)

xaviergonz · nchanged · commit 73e2f7361ab1 · 2018-06-18T23:57:00.000+02:00
diff --git a/docs/development/configuration.md b/docs/development/configuration.md
@@ -142,6 +142,8 @@ FuseBox.init({
 })
 ```
 
+Optionally, modulesFolder can be an array of paths. In that case the module will be searched for in priority order, this is, from the first array item to last.
+
 
 You local `npm` will have the highest priority. In essence, you can override fusebox's [path](https://github.com/fuse-box/fuse-box/blob/master/modules/path/index.js) of [fs](https://github.com/fuse-box/fuse-box/blob/master/modules/fs/index.js) module if you like. Customize you packages in your own manner!
 
diff --git a/src/core/FuseBox.ts b/src/core/FuseBox.ts
@@ -22,7 +22,7 @@ const appRoot = require("app-root-path");
 
 export interface FuseBoxOptions {
     homeDir?: string;
-    modulesFolder?: string;
+    modulesFolder?: string | string[];
     tsConfig?: string;
     package?: string | { name: string, main: string };
     dynamicImportsEnabled?: boolean;
@@ -184,9 +184,16 @@ export class FuseBox {
 
         this.context.debugMode = opts.debug !== undefined ? opts.debug : contains(process.argv, "--debug");
 
-        if (opts.modulesFolder) {
-            this.context.customModulesFolder =
-                ensureUserPath(opts.modulesFolder);
+        let modulesFolders = opts.modulesFolder;
+        if (modulesFolders) {
+            if (!Array.isArray(modulesFolders)) {
+                modulesFolders = [modulesFolders];
+            }
+            modulesFolders = modulesFolders.map((folder) => ensureUserPath(folder));
+            this.context.customModulesFolder = modulesFolders;
+        }
+        else {
+            this.context.customModulesFolder = [];
         }
 
         if (opts.sourceMaps) {
diff --git a/src/core/PathMaster.ts b/src/core/PathMaster.ts
@@ -140,7 +140,7 @@ export class PathMaster {
                     // nodeModuleInfo.browserOverrides[name] = info.name + "/" + absPath.alias;
                     if (parent) {
                         parent.analysis.
-                            replaceAliases(new Set([{from : name,  to : info.name + "/" + absPath.alias  }]))
+                            replaceAliases(new Set([{ from: name, to: info.name + "/" + absPath.alias }]))
                     }
                     data.fuseBoxAlias = absPath.alias;
                 }
@@ -166,7 +166,7 @@ export class PathMaster {
                     data.fuseBoxAlias = absPath.alias;
                     if (parent) {
                         parent.analysis.
-                            replaceAliases(new Set([{from : name,  to : `~/` + absPath.alias  }]))
+                            replaceAliases(new Set([{ from: name, to: `~/` + absPath.alias }]))
                     }
                 }
                 data.absPath = absPath.resolved;
@@ -495,12 +495,13 @@ export class PathMaster {
             }
         }
 
-
-        if (this.context.customModulesFolder) {
-
-            let customFolder = path.join(this.context.customModulesFolder, name);
-            if (fs.existsSync(customFolder)) {
-                return readMainFile(customFolder, false);
+        const customModulesFolder = this.context.customModulesFolder;
+        if (customModulesFolder) {
+            for (const customModulesFolderItem of customModulesFolder) {
+                const customFolder = path.join(customModulesFolderItem, name);
+                if (fs.existsSync(customFolder)) {
+                    return readMainFile(customFolder, false);
+                }
             }
         }
 
diff --git a/src/core/WorkflowContext.ts b/src/core/WorkflowContext.ts
@@ -130,7 +130,7 @@ export class WorkFlowContext {
 
     public target: string = "universal";
 
-    public inlineCSSPath : string = "css-sourcemaps";
+    public inlineCSSPath: string = "css-sourcemaps";
     /**
      * Explicitly target bundle to server
      */
@@ -158,7 +158,7 @@ export class WorkFlowContext {
 
     public tsConfig: TypescriptConfig;
 
-    public customModulesFolder: string;
+    public customModulesFolder: string[];
 
     public tsMode = false;
 
@@ -335,7 +335,7 @@ export class WorkFlowContext {
             this.sourceMapsProject = params;
         } else {
             if (utils.isPlainObject(params)) {
-                if( params.inlineCSSPath){
+                if (params.inlineCSSPath) {
                     this.inlineCSSPath = params.inlineCSSPath;
                 }
                 this.sourceMapsProject = params.project !== undefined ? params.project : true;

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ export class PathMaster {`
`140`	`140`	`// nodeModuleInfo.browserOverrides[name] = info.name + "/" + absPath.alias;`
`141`	`141`	`if (parent) {`
`142`	`142`	`parent.analysis.`
`143`		`- replaceAliases(new Set([{from : name, to : info.name + "/" + absPath.alias }]))`
	`143`	`+ replaceAliases(new Set([{ from: name, to: info.name + "/" + absPath.alias }]))`
`144`	`144`	`}`
`145`	`145`	`data.fuseBoxAlias = absPath.alias;`
`146`	`146`	`}`
`@@ -166,7 +166,7 @@ export class PathMaster {`
`166`	`166`	`data.fuseBoxAlias = absPath.alias;`
`167`	`167`	`if (parent) {`
`168`	`168`	`parent.analysis.`
`169`		- replaceAliases(new Set([{from : name, to : `~/` + absPath.alias }]))
	`169`	+ replaceAliases(new Set([{ from: name, to: `~/` + absPath.alias }]))
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`	`data.absPath = absPath.resolved;`
`@@ -495,12 +495,13 @@ export class PathMaster {`
`495`	`495`	`}`
`496`	`496`	`}`
`497`	`497`
`498`		`-`
`499`		`- if (this.context.customModulesFolder) {`
`500`		`-`
`501`		`- let customFolder = path.join(this.context.customModulesFolder, name);`
`502`		`- if (fs.existsSync(customFolder)) {`
`503`		`- return readMainFile(customFolder, false);`
	`498`	`+ const customModulesFolder = this.context.customModulesFolder;`
	`499`	`+ if (customModulesFolder) {`
	`500`	`+ for (const customModulesFolderItem of customModulesFolder) {`
	`501`	`+ const customFolder = path.join(customModulesFolderItem, name);`
	`502`	`+ if (fs.existsSync(customFolder)) {`
	`503`	`+ return readMainFile(customFolder, false);`
	`504`	`+ }`
`504`	`505`	`}`
`505`	`506`	`}`
`506`	`507`