feat: allow lazy route prefix to be configurable

Fixes #842
angular · May 24, 2016 · c3fd9c7 · c3fd9c7
1 parent c92f330
commit c3fd9c7
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/addon/ng2/blueprints/component/index.js b/addon/ng2/blueprints/component/index.js
@@ -86,8 +86,14 @@ module.exports = {
           dir += path.sep + options.dasherizedModuleName;
 
           if (options.locals.isLazyRoute) {
+            var lazyRoutePrefix = '+';
+            if (this.project.ngConfig &&
+                this.project.ngConfig.defaults &&
+                this.project.ngConfig.defaults.lazyRoutePrefix !== undefined) {
+              lazyRoutePrefix = this.project.ngConfig.defaults.lazyRoutePrefix;
+            }
             var dirParts = dir.split(path.sep);
-            dirParts[dirParts.length - 1] = `+${dirParts[dirParts.length - 1]}`;
+            dirParts[dirParts.length - 1] = `${lazyRoutePrefix}${dirParts[dirParts.length - 1]}`;
             dir = dirParts.join(path.sep);
           }
         }

diff --git a/addon/ng2/blueprints/ng2/files/angular-cli.json b/addon/ng2/blueprints/ng2/files/angular-cli.json
@@ -26,6 +26,7 @@
     "prefix": "<%= prefix %>",
     "sourceDir": "<%= sourceDir %>",
     "styleExt": "<%= styleExt %>",
-    "prefixInterfaces": false
+    "prefixInterfaces": false,
+    "lazyRoutePrefix": "+"
   }
 }
diff --git a/addon/ng2/blueprints/route/index.js b/addon/ng2/blueprints/route/index.js
@@ -229,8 +229,14 @@ module.exports = {
 
     // Insert the import statement.
     let content = fs.readFileSync(parentFile, 'utf-8');
+    let lazyRoutePrefix = '+';
+    if (this.project.ngConfig &&
+        this.project.ngConfig.defaults &&
+        this.project.ngConfig.defaults.lazyRoutePrefix !== undefined) {
+      lazyRoutePrefix = this.project.ngConfig.defaults.lazyRoutePrefix;
+    }
     content = _insertImport(content, `${jsComponentName}Component`,
-                            `./${options.isLazyRoute ? '+' : ''}${stringUtils.dasherize(base)}`);
+                            `./${options.isLazyRoute ? lazyRoutePrefix : ''}${stringUtils.dasherize(base)}`);
 
     let defaultReg = options.default ? ', useAsDefault: true' : '';
     let routePath = options.path || `/${base}`;

diff --git a/lib/config/schema.json b/lib/config/schema.json
@@ -92,6 +92,9 @@
         },
         "prefixInterfaces": {
           "type": "boolean"
+        },
+        "lazyRoutePrefix": {
+          "type": "string"
         }
       },
       "additionalProperties": false

diff --git a/tests/acceptance/generate-route.spec.js b/tests/acceptance/generate-route.spec.js
@@ -102,4 +102,14 @@ describe('Acceptance: ng generate route', function () {
       expect(afterGenerateParentHtml).to.equal(unmodifiedParentComponentHtml);
     });
   });
+
+  it('lazy route prefix', () => {
+    return ng(['set', 'defaults.lazyRoutePrefix', 'myprefix'])
+      .then(() => ng(['generate', 'route', 'prefix-test']))
+      .then(() => {
+        var folderPath = path.join(testPath, 'myprefixprefix-test', 'prefix-test.component.ts');
+        expect(existsSync(folderPath))
+          .to.equal(true);
+      });
+  });
 });