chore(routes): remove lazy route prefix (angular#1928)

Brocco · web-flow · commit 440d7674692c · 2016-08-31T23:17:12.000-04:00
diff --git a/addon/ng2/blueprints/component/index.js b/addon/ng2/blueprints/component/index.js
@@ -11,7 +11,6 @@ module.exports = {
 
   availableOptions: [
     { name: 'flat', type: Boolean, default: false },
-    { name: 'route', type: Boolean, default: false },
     { name: 'inline-template', type: Boolean, default: false, aliases: ['it'] },
     { name: 'inline-style', type: Boolean, default: false, aliases: ['is'] },
     { name: 'prefix', type: Boolean, default: true },
@@ -54,7 +53,6 @@ module.exports = {
       inlineTemplate: options.inlineTemplate,
       inlineStyle: options.inlineStyle,
       route: options.route,
-      isLazyRoute: !!options.isLazyRoute,
       isAppComponent: !!options.isAppComponent,
       selector: this.selector,
       styleExt: this.styleExt
@@ -84,18 +82,6 @@ module.exports = {
         var dir = this.dynamicPath.dir;
         if (!options.locals.flat) {
           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] = `${lazyRoutePrefix}${dirParts[dirParts.length - 1]}`;
-            dir = dirParts.join(path.sep);
-          }
         }
         var srcDir = this.project.ngConfig.apps[0].root;
         this.appDir = dir.substr(dir.indexOf(srcDir) + srcDir.length);
diff --git a/addon/ng2/blueprints/ng2/files/angular-cli.json b/addon/ng2/blueprints/ng2/files/angular-cli.json
@@ -39,7 +39,6 @@
   },
   "defaults": {
     "styleExt": "<%= styleExt %>",
-    "prefixInterfaces": false,
-    "lazyRoutePrefix": "+"
+    "prefixInterfaces": false
   }
 }
diff --git a/lib/config/schema.d.ts b/lib/config/schema.d.ts
@@ -59,6 +59,5 @@ export interface CliConfig {
     defaults?: {
         styleExt?: string;
         prefixInterfaces?: boolean;
-        lazyRoutePrefix?: string;
     };
 }
diff --git a/lib/config/schema.json b/lib/config/schema.json
@@ -135,9 +135,6 @@
         },
         "prefixInterfaces": {
           "type": "boolean"
-        },
-        "lazyRoutePrefix": {
-          "type": "string"
         }
       },
       "additionalProperties": false
diff --git a/tests/acceptance/generate-route.spec.js b/tests/acceptance/generate-route.spec.js
@@ -12,9 +12,8 @@ const root = process.cwd();
 
 const testPath = path.join(root, 'tmp', 'foo', 'src', 'app');
 
-function fileExpectations(lazy, expectation) {
-  const lazyPrefix = lazy ? '+' : '';
-  const dir = `${lazyPrefix}my-route`;
+function fileExpectations(expectation) {
+  const dir = 'my-route';
   expect(existsSync(path.join(testPath, dir, 'my-route.component.ts'))).to.equal(expectation);
 }
 
@@ -43,12 +42,6 @@ xdescribe('Acceptance: ng generate route', function () {
     });
   });
 
-  it('ng generate route my-route --lazy false', function () {
-    return ng(['generate', 'route', 'my-route', '--lazy', 'false']).then(() => {
-      fileExpectations(false, true);
-    });
-  });
-
   it('ng generate route +my-route', function () {
     return ng(['generate', 'route', '+my-route']).then(() => {
       fileExpectations(true, true);
@@ -102,14 +95,4 @@ xdescribe('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);
-      });
-  });
 });

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@`
`39`	`39`	`},`
`40`	`40`	`"defaults": {`
`41`	`41`	`"styleExt": "<%= styleExt %>",`
`42`		`- "prefixInterfaces": false,`
`43`		`- "lazyRoutePrefix": "+"`
	`42`	`+ "prefixInterfaces": false`
`44`	`43`	`}`
`45`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,5 @@ export interface CliConfig {`
`59`	`59`	`defaults?: {`
`60`	`60`	`styleExt?: string;`
`61`	`61`	`prefixInterfaces?: boolean;`
`62`		`- lazyRoutePrefix?: string;`
`63`	`62`	`};`
`64`	`63`	`}`