refactor: move base-href webpack plugin into its own package. (#1909)

hansl · web-flow · commit 8a5e769e2825 · 2016-08-30T18:20:33.000-07:00
diff --git a/addon/ng2/blueprints/ng2/files/package.json b/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"
   }
 }
diff --git a/addon/ng2/models/webpack-build-common.ts b/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,
diff --git a/addon/ng2/package.json b/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"
diff --git a/addon/ng2/tsconfig.json b/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" ]
     }
   },
diff --git a/package.json b/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",
diff --git a/packages/ast-tools/package.json b/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"
   }
 }
diff --git a/packages/base-href-webpack/package.json b/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": {
+  }
+}
diff --git a/packages/base-href-webpack/src/base-href-webpack-plugin.spec.ts b/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);
+  });
+});
diff --git a/packages/base-href-webpack/src/base-href-webpack-plugin.ts b/packages/base-href-webpack/src/base-href-webpack-plugin.ts
diff --git a/packages/base-href-webpack/src/index.ts b/packages/base-href-webpack/src/index.ts
@@ -0,0 +1,2 @@
+
+export * from './base-href-webpack-plugin';
diff --git a/packages/base-href-webpack/tsconfig.json b/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"
+    ]
+  }
+}
diff --git a/scripts/run-packages-spec.js b/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.
diff --git a/tests/acceptance/base-href-webpack-plugin.spec.js b/tests/acceptance/base-href-webpack-plugin.spec.js
diff --git a/tsconfig.json b/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" ]
     }
   },

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@`
`45`	`45`	`"protractor": "4.0.3",`
`46`	`46`	`"ts-node": "1.2.1",`
`47`	`47`	`"tslint": "3.13.0",`
`48`		`- "typescript": "^2.0.0"`
	`48`	`+ "typescript": "2.0.0"`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`"baseUrl": "",`
`21`	`21`	`"paths": {`
`22`	`22`	`"@angular-cli/ast-tools": [ "../../packages/ast-tools/src" ],`
	`23`	`+ "@angular-cli/base-href-webpack": [ "../../packages/base-href-webpack/src" ],`
`23`	`24`	`"@angular-cli/webpack": [ "../../packages/webpack/src" ]`
`24`	`25`	`}`
`25`	`26`	`},`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+`
	`2`	`+export * from './base-href-webpack-plugin';`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`],`
`23`	`23`	`"paths": {`
`24`	`24`	`"@angular-cli/ast-tools": [ "./packages/ast-tools/src" ],`
	`25`	`+ "@angular-cli/base-href-webpack": [ "./packages/base-href-webpack/src" ],`
`25`	`26`	`"@angular-cli/webpack": [ "./packages/webpack/src" ]`
`26`	`27`	`}`
`27`	`28`	`},`