refactor(@angular-devkit/build-webpack): remove common-tags dependency

clydin · hansl · commit d66602e5af71 · 2018-06-05T17:55:17.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,7 +66,6 @@
     "@angular/router": "^5.2.6",
     "@angular/service-worker": "^5.2.7",
     "@ngtools/json-schema": "^1.0.9",
-    "@types/common-tags": "^1.4.0",
     "@types/copy-webpack-plugin": "^4.0.1",
     "@types/express": "^4.11.1",
     "@types/glob": "^5.0.29",
@@ -89,7 +88,6 @@
     "circular-dependency-plugin": "^5.0.0",
     "clean-css": "^4.1.11",
     "codelyzer": "^4.0.2",
-    "common-tags": "^1.5.1",
     "conventional-changelog": "^1.1.0",
     "copy-webpack-plugin": "^4.5.0",
     "express": "^4.16.2",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
@@ -18,7 +18,6 @@
     "chalk": "~2.2.2",
     "circular-dependency-plugin": "^5.0.0",
     "clean-css": "^4.1.11",
-    "common-tags": "^1.5.1",
     "copy-webpack-plugin": "^4.5.0",
     "file-loader": "^1.1.11",
     "glob": "^7.0.3",
diff --git a/packages/angular_devkit/build_webpack/src/angular-cli-files/lib/base-href-webpack/base-href-webpack-plugin_spec.ts b/packages/angular_devkit/build_webpack/src/angular-cli-files/lib/base-href-webpack/base-href-webpack-plugin_spec.ts
@@ -1,7 +1,7 @@
 // tslint:disable
 // TODO: cleanup this file, it's copied as is from Angular CLI.
 
-import {oneLineTrim} from 'common-tags';
+import { tags } from '@angular-devkit/core';
 import {BaseHrefWebpackPlugin} from './base-href-webpack-plugin';
 
 
@@ -22,7 +22,7 @@ function mockCompiler(indexHtml: string, callback: Function) {
 }
 
 describe('base href webpack plugin', () => {
-  const html = oneLineTrim`
+  const html = tags.oneLine`
     <html>
       <head></head>
       <body></body>
@@ -41,7 +41,7 @@ describe('base href webpack plugin', () => {
   it('should insert base tag when not exist', function () {
     const plugin = new BaseHrefWebpackPlugin({ baseHref: '/' });
     const compiler = mockCompiler(html, (_x: any, htmlPluginData: any) => {
-        expect(htmlPluginData.html).toEqual(oneLineTrim`
+        expect(htmlPluginData.html).toEqual(tags.oneLine`
           <html>
             <head><base href="/"></head>
             <body></body>
@@ -55,11 +55,11 @@ describe('base href webpack plugin', () => {
   it('should replace href attribute when base tag already exists', function () {
     const plugin = new BaseHrefWebpackPlugin({ baseHref: '/myUrl/' });
 
-    const compiler = mockCompiler(oneLineTrim`
+    const compiler = mockCompiler(tags.oneLine`
           <head><base href="/" target="_blank"></head>
           <body></body>
         `, (_x: any, htmlPluginData: any) => {
-      expect(htmlPluginData.html).toEqual(oneLineTrim`
+      expect(htmlPluginData.html).toEqual(tags.oneLine`
           <head><base href="/myUrl/" target="_blank"></head>
           <body></body>
         `);
@@ -70,11 +70,11 @@ describe('base href webpack plugin', () => {
   it('should replace href attribute when baseHref is empty', function () {
     const plugin = new BaseHrefWebpackPlugin({ baseHref: '' });
 
-    const compiler = mockCompiler(oneLineTrim`
+    const compiler = mockCompiler(tags.oneLine`
           <head><base href="/" target="_blank"></head>
           <body></body>
         `, (_x: any, htmlPluginData: any) => {
-      expect(htmlPluginData.html).toEqual(oneLineTrim`
+      expect(htmlPluginData.html).toEqual(tags.oneLine`
           <head><base href="" target="_blank"></head>
           <body></body>
         `);
diff --git a/packages/angular_devkit/build_webpack/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_webpack/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -1,9 +1,8 @@
 // tslint:disable
 // TODO: cleanup this file, it's copied as is from Angular CLI.
-import { virtualFs } from '@angular-devkit/core';
+import { tags, virtualFs } from '@angular-devkit/core';
 import { Stats } from 'fs';
 import * as path from 'path';
-import { stripIndent } from 'common-tags';
 import {
   AngularCompilerPlugin,
   AngularCompilerPluginOptions,
@@ -40,7 +39,7 @@ function _createAotPlugin(
     if (!appConfig.environmentSource) {
       let migrationMessage = '';
       if ('source' in appConfig.environments) {
-        migrationMessage = '\n\n' + stripIndent`
+        migrationMessage = '\n\n' + tags.stripIndent`
           A new environmentSource entry replaces the previous source entry inside environments.
 
           To migrate angular-cli.json follow the example below:
diff --git a/packages/angular_devkit/build_webpack/src/angular-cli-files/utilities/service-worker/index.ts b/packages/angular_devkit/build_webpack/src/angular-cli-files/utilities/service-worker/index.ts
@@ -1,8 +1,7 @@
 // tslint:disable
 // TODO: cleanup this file, it's copied as is from Angular CLI.
-import { Path, join, normalize, virtualFs, dirname, getSystemPath } from '@angular-devkit/core';
+import { Path, join, normalize, virtualFs, dirname, getSystemPath, tags } from '@angular-devkit/core';
 import { Filesystem } from '@angular/service-worker/config';
-import { oneLine, stripIndent } from 'common-tags';
 import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as semver from 'semver';
@@ -55,7 +54,7 @@ export function usesServiceWorker(projectRoot: string): boolean {
     swPackageJsonPath = resolveProjectModule(projectRoot, '@angular/service-worker/package.json');
   } catch (_) {
     // @angular/service-worker is not installed
-    throw new Error(stripIndent`
+    throw new Error(tags.stripIndent`
     Your project is configured with serviceWorker = true, but @angular/service-worker
     is not installed. Run \`npm install --save-dev @angular/service-worker\`
     and try again, or run \`ng set apps.0.serviceWorker=false\` in your .angular-cli.json.
@@ -66,7 +65,7 @@ export function usesServiceWorker(projectRoot: string): boolean {
   const swVersion = JSON.parse(swPackageJson)['version'];
 
   if (!semver.gte(swVersion, NEW_SW_VERSION)) {
-    throw new Error(stripIndent`
+    throw new Error(tags.stripIndent`
     The installed version of @angular/service-worker is ${swVersion}. This version of the CLI
     requires the @angular/service-worker version to satisfy ${NEW_SW_VERSION}. Please upgrade
     your service worker version.
@@ -98,7 +97,7 @@ export function augmentAppWithServiceWorker(
   return host.exists(configPath).pipe(
     switchMap(exists => {
       if (!exists) {
-        throw new Error(oneLine`
+        throw new Error(tags.oneLine`
           Error: Expected to find an ngsw-config.json configuration
           file in the ${appRoot} folder. Either provide one or disable Service Worker
           in your angular.json configuration file.`,
diff --git a/packages/angular_devkit/build_webpack/src/angular-cli-files/utilities/stats.ts b/packages/angular_devkit/build_webpack/src/angular-cli-files/utilities/stats.ts
@@ -2,7 +2,7 @@
 // TODO: cleanup this file, it's copied as is from Angular CLI.
 
 import chalk from 'chalk';
-import { stripIndents } from 'common-tags';
+import { tags } from '@angular-devkit/core';
 
 
 // Force basic color support on terminals with no color support.
@@ -47,13 +47,13 @@ export function statsToString(json: any, statsConfig: any) {
   const unchangedChunkNumber = json.chunks.length - changedChunksStats.length;
 
   if (unchangedChunkNumber > 0) {
-    return rs(stripIndents`
+    return rs(tags.stripIndents`
       Date: ${w(new Date().toISOString())} - Hash: ${w(json.hash)} - Time: ${w('' + json.time)}ms
       ${unchangedChunkNumber} unchanged chunks
       ${changedChunksStats.join('\n')}
       `);
   } else {
-    return rs(stripIndents`
+    return rs(tags.stripIndents`
       Date: ${w(new Date().toISOString())}
       Hash: ${w(json.hash)}
       Time: ${w('' + json.time)}ms
