json-schema yak shaving for schematics

bin/devkit-admin

@@ -34,6 +34,7 @@ process.chdir(path.join(__dirname, '..'));
 let logger = null;
 try {
   logger = new (require('@angular-devkit/core').IndentLogger)('root');
+  require('rxjs/add/operator/filter');
 
   logger
     .filter(entry => (entry.level !== 'debug' || args.verbose))

lib/bootstrap-local.js

@@ -85,6 +85,15 @@ require.extensions['.ts'] = function (m, filename) {
 };
 
 
+require.extensions['.ejs'] = function (m, filename) {
+  const source = fs.readFileSync(filename).toString();
+  const template = require('@angular-devkit/core').template;
+  const result = template(source, { sourceURL: filename, sourceMap: true });
+
+  return m._compile(result.source.replace(/return/, 'module.exports.default = '), filename);
+};
+
+
 // If we're running locally, meaning npm linked. This is basically "developer mode".
 if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
   const packages = require('./packages').packages;

package.json

@@ -42,8 +42,6 @@
   "homepage": "https://github.com/angular/devkit",
   "dependencies": {
     "@ngtools/json-schema": "^1.0.9",
-    "@ngtools/logger": "^1.0.1",
-    "@types/common-tags": "^1.2.4",
     "@types/glob": "^5.0.29",
     "@types/istanbul": "^0.4.29",
     "@types/jasmine": "^2.5.47",
@@ -53,7 +51,6 @@
     "@types/source-map": "^0.5.0",
     "@types/webpack": "^3.0.2",
     "@types/webpack-sources": "^0.1.3",
-    "common-tags": "^1.3.1",
     "conventional-changelog": "^1.1.0",
     "glob": "^7.0.3",
     "istanbul": "^0.4.5",

packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { oneLine, stripIndent } from 'common-tags';
+import { tags } from '@angular-devkit/core';
 import { RawSourceMap } from 'source-map';
 import { buildOptimizer } from './build-optimizer';
 
@@ -18,7 +18,7 @@ describe('build-optimizer', () => {
 
   describe('basic functionality', () => {
     it('applies class-fold, scrub-file and prefix-functions', () => {
-      const input = stripIndent`
+      const input = tags.stripIndent`
         ${imports}
         var __extends = (this && this.__extends) || function (d, b) {
             for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
@@ -37,7 +37,7 @@ describe('build-optimizer', () => {
         Clazz.ctorParameters = function () { return [{type: Injector}]; };
       `;
       // tslint:disable:max-line-length
-      const output = oneLine`
+      const output = tags.oneLine`
         /** PURE_IMPORTS_START _angular_core,tslib PURE_IMPORTS_END */
         ${imports}
         import { __extends } from "tslib";
@@ -52,12 +52,12 @@ describe('build-optimizer', () => {
 
       const inputFilePath = '/node_modules/@angular/core/@angular/core.es5.js';
       const boOutput = buildOptimizer({ content: input, inputFilePath });
-      expect(oneLine`${boOutput.content}`).toEqual(output);
+      expect(tags.oneLine`${boOutput.content}`).toEqual(output);
       expect(boOutput.emitSkipped).toEqual(false);
     });
 
     it('doesn\'t process files without decorators/ctorParameters/outside Angular', () => {
-      const input = oneLine`
+      const input = tags.oneLine`
         var Clazz = (function () { function Clazz() { } return Clazz; }());
         ${staticProperty}
       `;
@@ -70,26 +70,26 @@ describe('build-optimizer', () => {
     it('supports es2015 modules', () => {
       // prefix-functions would add PURE_IMPORTS_START and PURE to the super call.
       // This test ensures it isn't applied to es2015 modules.
-      const output = oneLine`
+      const output = tags.oneLine`
         import { Injectable } from '@angular/core';
         class Clazz extends BaseClazz { constructor(e) { super(e); } }
       `;
-      const input = stripIndent`
+      const input = tags.stripIndent`
         ${output}
         Clazz.ctorParameters = () => [ { type: Injectable } ];
       `;
 
       const inputFilePath = '/node_modules/@angular/core/@angular/core.js';
       const boOutput = buildOptimizer({ content: input, inputFilePath });
-      expect(oneLine`${boOutput.content}`).toEqual(output);
+      expect(tags.oneLine`${boOutput.content}`).toEqual(output);
       expect(boOutput.emitSkipped).toEqual(false);
     });
   });
 
 
   describe('resilience', () => {
     it('doesn\'t process files with invalid syntax by default', () => {
-      const input = oneLine`
+      const input = tags.oneLine`
         ))))invalid syntax
         ${clazz}
         Clazz.decorators = [ { type: Injectable } ];
@@ -101,7 +101,7 @@ describe('build-optimizer', () => {
     });
 
     it('throws on files with invalid syntax in strict mode', () => {
-      const input = oneLine`
+      const input = tags.oneLine`
         ))))invalid syntax
         ${clazz}
         Clazz.decorators = [ { type: Injectable } ];
@@ -137,7 +137,7 @@ describe('build-optimizer', () => {
   });
 
   describe('sourcemaps', () => {
-    const transformableInput = oneLine`
+    const transformableInput = tags.oneLine`
       ${imports}
       ${clazz}
       ${decorators}
@@ -154,11 +154,11 @@ describe('build-optimizer', () => {
     });
 
     it('doesn\'t produce sourcemaps when emitting was skipped', () => {
-      const ignoredInput = oneLine`
+      const ignoredInput = tags.oneLine`
         var Clazz = (function () { function Clazz() { } return Clazz; }());
         ${staticProperty}
       `;
-      const invalidInput = oneLine`
+      const invalidInput = tags.oneLine`
         ))))invalid syntax
         ${clazz}
         Clazz.decorators = [ { type: Injectable } ];

packages/angular_devkit/build_optimizer/src/purify/purify_spec.ts

@@ -5,77 +5,77 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { oneLine, stripIndent } from 'common-tags';
+import { tags } from '@angular-devkit/core';
 import { purify } from './purify';
 
 // tslint:disable:max-line-length
 describe('purify', () => {
   it('prefixes safe imports with /*@__PURE__*/', () => {
-    const input = stripIndent`
+    const input = tags.stripIndent`
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_rxjs_Subject__ = __webpack_require__("EEr4");
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_http__ = __webpack_require__(72);
       /** PURE_IMPORTS_START rxjs_Subject,_angular_http PURE_IMPORTS_END */
     `;
-    const output = stripIndent`
+    const output = tags.stripIndent`
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_rxjs_Subject__ = /*@__PURE__*/__webpack_require__("EEr4");
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_http__ = /*@__PURE__*/__webpack_require__(72);
       /** PURE_IMPORTS_START rxjs_Subject,_angular_http PURE_IMPORTS_END */
     `;
 
-    expect(oneLine`${purify(input)}`).toEqual(oneLine`${output}`);
+    expect(tags.oneLine`${purify(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
   it('prefixes safe default imports with /*@__PURE__*/', () => {
-    const input = stripIndent`
+    const input = tags.stripIndent`
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_Subject__ = __webpack_require__("rlar");
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_Subject___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_rxjs_Subject__);
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_zone_js___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_zone_js__);
       /** PURE_IMPORTS_START rxjs_Subject,zone_js PURE_IMPORTS_END */
     `;
-    const output = stripIndent`
+    const output = tags.stripIndent`
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_Subject__ = /*@__PURE__*/__webpack_require__("rlar");
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_Subject___default = /*@__PURE__*/__webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_rxjs_Subject__);
       /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_zone_js___default = /*@__PURE__*/__webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_zone_js__);
       /** PURE_IMPORTS_START rxjs_Subject,zone_js PURE_IMPORTS_END */
     `;
 
-    expect(oneLine`${purify(input)}`).toEqual(oneLine`${output}`);
+    expect(tags.oneLine`${purify(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
   it('prefix createComponentFactory and createNgModuleFactory function calls', () => {
-    const input = stripIndent`
+    const input = tags.stripIndent`
       var AppComponentNgFactory = __WEBPACK_IMPORTED_MODULE_1__angular_core__["I" /* ɵccf */]('app-root');
       var AppModuleNgFactory = __WEBPACK_IMPORTED_MODULE_1__angular_core__["I" /* ɵcmf */]('app-root');
       var SelectComponentNgFactory = select_component_ngfactory___WEBPACK_IMPORTED_MODULE_0__angular_core__["U" /* ɵccf */]('aio-select');
     `;
-    const output = stripIndent`
+    const output = tags.stripIndent`
       var AppComponentNgFactory = /*@__PURE__*/__WEBPACK_IMPORTED_MODULE_1__angular_core__["I" /* ɵccf */]('app-root');
       var AppModuleNgFactory = /*@__PURE__*/__WEBPACK_IMPORTED_MODULE_1__angular_core__["I" /* ɵcmf */]('app-root');
       var SelectComponentNgFactory = /*@__PURE__*/select_component_ngfactory___WEBPACK_IMPORTED_MODULE_0__angular_core__["U" /* ɵccf */]('aio-select');
     `;
 
-    expect(oneLine`${purify(input)}`).toEqual(oneLine`${output}`);
+    expect(tags.oneLine`${purify(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
   it('should prefix createRendererType2 function calls', () => {
-    const input = stripIndent`
+    const input = tags.stripIndent`
       var RenderType_MdOption = index_ngfactory___WEBPACK_IMPORTED_MODULE_0__angular_core__["W" /* ɵcrt */]({ encapsulation: 2, styles: styles_MdOption});
     `;
-    const output = stripIndent`
+    const output = tags.stripIndent`
       var RenderType_MdOption = /*@__PURE__*/index_ngfactory___WEBPACK_IMPORTED_MODULE_0__angular_core__["W" /* ɵcrt */]({ encapsulation: 2, styles: styles_MdOption});
     `;
 
-    expect(oneLine`${purify(input)}`).toEqual(oneLine`${output}`);
+    expect(tags.oneLine`${purify(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
   it('prefix module statements', () => {
-    const input = stripIndent`
+    const input = tags.stripIndent`
       var AppModuleNgFactory = new __WEBPACK_IMPORTED_MODULE_1__angular_core__["I" /* NgModuleFactory */];
     `;
-    const output = stripIndent`
+    const output = tags.stripIndent`
       var AppModuleNgFactory = /*@__PURE__*/new __WEBPACK_IMPORTED_MODULE_1__angular_core__["I" /* NgModuleFactory */];
     `;
 
-    expect(oneLine`${purify(input)}`).toEqual(oneLine`${output}`);
+    expect(tags.oneLine`${purify(input)}`).toEqual(tags.oneLine`${output}`);
   });
 });

packages/angular_devkit/build_optimizer/src/transforms/class-fold_spec.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { oneLine, stripIndent } from 'common-tags';
+import { tags } from '@angular-devkit/core';
 import { transformJavascript } from '../helpers/transform-javascript';
 import { getFoldFileTransformer } from './class-fold';
 
@@ -16,31 +16,31 @@ const transform = (content: string) => transformJavascript(
 describe('class-fold', () => {
   it('folds static properties into class', () => {
     const staticProperty = 'Clazz.prop = 1;';
-    const input = stripIndent`
+    const input = tags.stripIndent`
       var Clazz = (function () { function Clazz() { } return Clazz; }());
       ${staticProperty}
     `;
-    const output = stripIndent`
+    const output = tags.stripIndent`
       var Clazz = (function () { function Clazz() { }
       ${staticProperty} return Clazz; }());
     `;
 
-    expect(oneLine`${transform(input)}`).toEqual(oneLine`${output}`);
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
   it('folds multiple static properties into class', () => {
     const staticProperty = 'Clazz.prop = 1;';
     const anotherStaticProperty = 'Clazz.anotherProp = 2;';
-    const input = stripIndent`
+    const input = tags.stripIndent`
       var Clazz = (function () { function Clazz() { } return Clazz; }());
       ${staticProperty}
       ${anotherStaticProperty}
     `;
-    const output = stripIndent`
+    const output = tags.stripIndent`
       var Clazz = (function () { function Clazz() { }
       ${staticProperty} ${anotherStaticProperty} return Clazz; }());
     `;
 
-    expect(oneLine`${transform(input)}`).toEqual(oneLine`${output}`);
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 });

packages/angular_devkit/build_optimizer/src/transforms/import-tslib_spec.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { oneLine, stripIndent } from 'common-tags';
+import { tags } from '@angular-devkit/core';
 import { transformJavascript } from '../helpers/transform-javascript';
 import { getImportTslibTransformer, testImportTslib } from './import-tslib';
 
@@ -15,24 +15,24 @@ const transform = (content: string) => transformJavascript(
 
 describe('import-tslib', () => {
   it('replaces __extends', () => {
-    const input = stripIndent`
+    const input = tags.stripIndent`
       var __extends = (this && this.__extends) || function (d, b) {
           for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
           function __() { this.constructor = d; }
           d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
       };
     `;
-    const output = stripIndent`
+    const output = tags.stripIndent`
       import { __extends } from "tslib";
     `;
 
     expect(testImportTslib(input)).toBeTruthy();
-    expect(oneLine`${transform(input)}`).toEqual(oneLine`${output}`);
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
   it('replaces __decorate', () => {
     // tslint:disable:max-line-length
-    const input = stripIndent`
+    const input = tags.stripIndent`
       var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
           var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
           if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -41,59 +41,59 @@ describe('import-tslib', () => {
       };
     `;
     // tslint:enable:max-line-length
-    const output = stripIndent`
+    const output = tags.stripIndent`
       import { __decorate } from "tslib";
     `;
 
     expect(testImportTslib(input)).toBeTruthy();
-    expect(oneLine`${transform(input)}`).toEqual(oneLine`${output}`);
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
   it('replaces __metadata', () => {
     // tslint:disable:max-line-length
-    const input = stripIndent`
+    const input = tags.stripIndent`
       var __metadata = (this && this.__metadata) || function (k, v) {
           if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
       };
     `;
     // tslint:enable:max-line-length
-    const output = stripIndent`
+    const output = tags.stripIndent`
       import { __metadata } from "tslib";
     `;
 
     expect(testImportTslib(input)).toBeTruthy();
-    expect(oneLine`${transform(input)}`).toEqual(oneLine`${output}`);
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
   it('replaces __param', () => {
-    const input = stripIndent`
+    const input = tags.stripIndent`
       var __param = (this && this.__param) || function (paramIndex, decorator) {
           return function (target, key) { decorator(target, key, paramIndex); }
       };
     `;
 
-    const output = stripIndent`
+    const output = tags.stripIndent`
       import { __param } from "tslib";
     `;
 
     expect(testImportTslib(input)).toBeTruthy();
-    expect(oneLine`${transform(input)}`).toEqual(oneLine`${output}`);
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
   it('replaces uses "require" instead of "import" on CJS modules', () => {
-    const input = stripIndent`
+    const input = tags.stripIndent`
       var __extends = (this && this.__extends) || function (d, b) {
           for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
           function __() { this.constructor = d; }
           d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
       };
       exports.meaning = 42;
     `;
-    const output = stripIndent`
+    const output = tags.stripIndent`
       var __extends = /*@__PURE__*/ require("tslib").__extends;
       exports.meaning = 42;
     `;
 
-    expect(oneLine`${transform(input)}`).toEqual(oneLine`${output}`);
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 });