Merge branch 'master' into Issue-1889-fix-completion-command-invalid

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);

addon/ng2/blueprints/ng2/files/__path__/main.ts

@@ -1,4 +1,4 @@
-import "./polyfills.ts";
+import './polyfills.ts';
 
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { enableProdMode } from '@angular/core';

addon/ng2/blueprints/ng2/files/angular-cli.json

@@ -39,7 +39,6 @@
   },
   "defaults": {
     "styleExt": "<%= styleExt %>",
-    "prefixInterfaces": false,
-    "lazyRoutePrefix": "+"
+    "prefixInterfaces": false
   }
 }

addon/ng2/blueprints/ng2/files/package.json

@@ -45,6 +45,6 @@
     "protractor": "4.0.3",
     "ts-node": "1.2.1",
     "tslint": "3.13.0",
-    "typescript": "^2.0.0"
+    "typescript": "2.0.0"
   }
 }

addon/ng2/commands/init.ts

@@ -55,15 +55,15 @@ const InitCommand: any = Command.extend({
 
     // needs an explicit check in case it's just 'undefined'
     // due to passing of options from 'new' and 'addon'
-    let gitInit;
+    let gitInit: any;
     if (commandOptions.skipGit === false) {
       gitInit = new GitInit({
         ui: this.ui,
         project: this.project
       });
     }
 
-    let linkCli;
+    let linkCli: any;
     if (commandOptions.linkCli) {
       linkCli = new LinkCli({
         ui: this.ui,
@@ -72,7 +72,7 @@ const InitCommand: any = Command.extend({
       });
     }
 
-    let npmInstall;
+    let npmInstall: any;
     if (!commandOptions.skipNpm) {
       npmInstall = new NpmInstall({
         ui: this.ui,
@@ -81,7 +81,7 @@ const InitCommand: any = Command.extend({
       });
     }
 
-    let bowerInstall;
+    let bowerInstall: any;
     if (!commandOptions.skipBower) {
       bowerInstall = new this.tasks.BowerInstall({
         ui: this.ui,

addon/ng2/models/webpack-build-common.ts

@@ -4,12 +4,10 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 import * as webpack from 'webpack';
 const atl = require('awesome-typescript-loader');
 
+import { BaseHrefWebpackPlugin } from '@angular-cli/base-href-webpack';
 import { findLazyModules } from './find-lazy-modules';
 
 
-import { BaseHrefWebpackPlugin } from '../utilities/base-href-webpack-plugin';
-
-
 export function getWebpackCommonConfig(
   projectRoot: string,
   environment: string,

addon/ng2/package.json

@@ -2,7 +2,6 @@
   "name": "ng2",
   "version": "0.0.0",
   "description": "An addon to generate an ng2 project",
-  "author": "rodyhaddad",
   "license": "MIT",
   "keywords": [
     "ember-addon"

addon/ng2/tsconfig.json

@@ -20,6 +20,7 @@
     "baseUrl": "",
     "paths": {
       "@angular-cli/ast-tools": [ "../../packages/ast-tools/src" ],
+      "@angular-cli/base-href-webpack": [ "../../packages/base-href-webpack/src" ],
       "@angular-cli/webpack": [ "../../packages/webpack/src" ]
     }
   },

lib/config/schema.d.ts

@@ -59,6 +59,5 @@ export interface CliConfig {
     defaults?: {
         styleExt?: string;
         prefixInterfaces?: boolean;
-        lazyRoutePrefix?: string;
     };
 }

lib/config/schema.json

@@ -135,9 +135,6 @@
         },
         "prefixInterfaces": {
           "type": "boolean"
-        },
-        "lazyRoutePrefix": {
-          "type": "string"
         }
       },
       "additionalProperties": false

package.json

@@ -102,7 +102,7 @@
     "ts-loader": "^0.8.2",
     "tslint-loader": "^2.1.4",
     "typedoc": "^0.4.2",
-    "typescript": "^2.0.0",
+    "typescript": "2.0.0",
     "url-loader": "^0.5.7",
     "webpack": "2.1.0-beta.21",
     "webpack-dev-server": "2.1.0-beta.0",

packages/ast-tools/package.json

@@ -2,7 +2,7 @@
   "name": "@angular-cli/ast-tools",
   "version": "1.0.0-beta.11-webpack.5",
   "description": "CLI tool for Angular",
-  "main": "./index.js",
+  "main": "./src/index.js",
   "keywords": [
     "angular",
     "cli",
@@ -22,6 +22,6 @@
   "dependencies": {
     "rxjs": "^5.0.0-beta.11",
     "denodeify": "^1.2.1",
-    "typescript": "^2.0.0"
+    "typescript": "2.0.0"
   }
 }

packages/base-href-webpack/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "@angular-cli/base-href-webpack",
+  "version": "1.0.0",
+  "description": "Base HREF Webpack plugin",
+  "main": "./src/index.js",
+  "keywords": [
+    "angular",
+    "cli",
+    "webpack",
+    "plugin",
+    "tool"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/angular/angular-cli.git"
+  },
+  "author": "angular",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/angular/angular-cli/issues"
+  },
+  "homepage": "https://github.com/angular/angular-cli",
+  "dependencies": {
+  }
+}

packages/base-href-webpack/src/base-href-webpack-plugin.spec.ts

@@ -0,0 +1,66 @@
+import {oneLineTrim} from 'common-tags';
+import {BaseHrefWebpackPlugin} from './base-href-webpack-plugin';
+
+
+function mockCompiler(indexHtml, callback) {
+  return {
+    plugin: function (event, compilerCallback) {
+      const compilation = {
+        plugin: function (hook, compilationCallback) {
+          const htmlPluginData = {
+            html: indexHtml
+          };
+          compilationCallback(htmlPluginData, callback);
+        }
+      };
+      compilerCallback(compilation);
+    }
+  };
+}
+
+describe('base href webpack plugin', () => {
+  const html = oneLineTrim`
+    <html>
+      <head></head>
+      <body></body>
+    </html>
+  `;
+
+  it('should do nothing when baseHref is null', () => {
+    const plugin = new BaseHrefWebpackPlugin({ baseHref: null });
+
+    const compiler = mockCompiler(html, (x, htmlPluginData) => {
+      expect(htmlPluginData.html).toEqual('<body><head></head></body>');
+    });
+    plugin.apply(compiler);
+  });
+
+  it('should insert base tag when not exist', function () {
+    const plugin = new BaseHrefWebpackPlugin({ baseHref: '/' });
+    const compiler = mockCompiler(html, (x, htmlPluginData) => {
+        expect(htmlPluginData.html).toEqual(oneLineTrim`
+          <html>
+            <head><base href="/"></head>
+            <body></body>
+          </html>
+        `);
+      });
+
+    plugin.apply(compiler);
+  });
+
+  it('should replace href attribute when base tag already exists', function () {
+    const plugin = new BaseHrefWebpackPlugin({ baseHref: '/myUrl/' });
+
+    const compiler = mockCompiler(oneLineTrim`
+          <head><base href="/" target="_blank"></head>
+          <body></body>
+        `, (x, htmlPluginData) => {
+      expect(htmlPluginData.html).toEqual(oneLineTrim`
+          <head><base href="/myUrl/" target="_blank"></head>
+          <body></body>
+        `);
+    });
+    plugin.apply(compiler);
+  });
+});

packages/base-href-webpack/src/index.ts

@@ -0,0 +1,2 @@
+
+export * from './base-href-webpack-plugin';

packages/base-href-webpack/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "declaration": true,
+    "experimentalDecorators": true,
+    "mapRoot": "",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noEmitOnError": true,
+    "noImplicitAny": true,
+    "outDir": "../../dist/base-href-webpack",
+    "rootDir": ".",
+    "sourceMap": true,
+    "sourceRoot": "/",
+    "target": "es5",
+    "lib": ["es6"],
+    "typeRoots": [
+      "../../node_modules/@types"
+    ],
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  }
+}

scripts/run-packages-spec.js

@@ -11,9 +11,7 @@ const projectBaseDir = path.join(__dirname, '../packages');
 
 // Create a Jasmine runner and configure it.
 const jasmine = new Jasmine({ projectBaseDir: projectBaseDir });
-jasmine.loadConfig({
-  spec_dir: projectBaseDir
-});
+jasmine.loadConfig({});
 jasmine.addReporter(new JasmineSpecReporter());
 
 // Run the tests.

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);
-      });
-  });
 });

tsconfig.json

@@ -22,6 +22,7 @@
     ],
     "paths": {
       "@angular-cli/ast-tools": [ "./packages/ast-tools/src" ],
+      "@angular-cli/base-href-webpack": [ "./packages/base-href-webpack/src" ],
       "@angular-cli/webpack": [ "./packages/webpack/src" ]
     }
   },