From f771bc197c99a56061dc7be3d7f863f37eb6af63 Mon Sep 17 00:00:00 2001 From: Stephen Cavaliere Date: Wed, 22 Feb 2017 15:15:47 -0500 Subject: [PATCH] refactor(@angular/cli): move ng2 blueprint to ng --- packages/@angular/cli/addon/index.js | 2 +- .../cli/blueprints/{ng2 => ng}/files/.editorconfig | 0 .../cli/blueprints/{ng2 => ng}/files/README.md | 0 .../files/__path__/app/app-routing.module.ts | 0 .../files/__path__/app/app.component.__styleext__ | 0 .../files/__path__/app/app.component.html | 0 .../files/__path__/app/app.component.spec.ts | 0 .../{ng2 => ng}/files/__path__/app/app.component.ts | 0 .../{ng2 => ng}/files/__path__/app/app.module.ts | 0 .../{ng2 => ng}/files/__path__/assets/.gitkeep | 0 .../files/__path__/environments/environment.prod.ts | 0 .../files/__path__/environments/environment.ts | 0 .../{ng2 => ng}/files/__path__/favicon.ico | Bin .../{ng2 => ng}/files/__path__/index.html | 0 .../blueprints/{ng2 => ng}/files/__path__/main.ts | 0 .../{ng2 => ng}/files/__path__/polyfills.ts | 0 .../{ng2 => ng}/files/__path__/styles.__styleext__ | 0 .../blueprints/{ng2 => ng}/files/__path__/test.ts | 0 .../{ng2 => ng}/files/__path__/tsconfig.app.json | 0 .../{ng2 => ng}/files/__path__/tsconfig.spec.json | 0 .../blueprints/{ng2 => ng}/files/angular-cli.json | 0 .../{ng2 => ng}/files/e2e/app.e2e-spec.ts | 0 .../cli/blueprints/{ng2 => ng}/files/e2e/app.po.ts | 0 .../{ng2 => ng}/files/e2e/tsconfig.e2e.json | 0 .../cli/blueprints/{ng2 => ng}/files/gitignore | 0 .../cli/blueprints/{ng2 => ng}/files/karma.conf.js | 0 .../cli/blueprints/{ng2 => ng}/files/package.json | 0 .../blueprints/{ng2 => ng}/files/protractor.conf.js | 0 .../cli/blueprints/{ng2 => ng}/files/tsconfig.json | 0 .../cli/blueprints/{ng2 => ng}/files/tslint.json | 0 .../@angular/cli/blueprints/{ng2 => ng}/index.ts | 0 packages/@angular/cli/commands/generate.ts | 2 +- packages/@angular/cli/tasks/init.ts | 2 +- tests/acceptance/new.spec.ts | 2 +- 34 files changed, 4 insertions(+), 4 deletions(-) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/.editorconfig (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/README.md (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/app/app-routing.module.ts (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/app/app.component.__styleext__ (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/app/app.component.html (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/app/app.component.spec.ts (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/app/app.component.ts (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/app/app.module.ts (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/assets/.gitkeep (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/environments/environment.prod.ts (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/environments/environment.ts (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/favicon.ico (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/index.html (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/main.ts (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/polyfills.ts (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/styles.__styleext__ (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/test.ts (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/tsconfig.app.json (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/__path__/tsconfig.spec.json (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/angular-cli.json (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/e2e/app.e2e-spec.ts (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/e2e/app.po.ts (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/e2e/tsconfig.e2e.json (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/gitignore (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/karma.conf.js (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/package.json (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/protractor.conf.js (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/tsconfig.json (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/files/tslint.json (100%) rename packages/@angular/cli/blueprints/{ng2 => ng}/index.ts (100%) diff --git a/packages/@angular/cli/addon/index.js b/packages/@angular/cli/addon/index.js index 31435fe65859..90bd861a3f6b 100644 --- a/packages/@angular/cli/addon/index.js +++ b/packages/@angular/cli/addon/index.js @@ -5,7 +5,7 @@ const config = require('../models/config'); const path = require('path'); module.exports = { - name: 'ng2', + name: 'ng', config: function () { this.project.ngConfigObj = this.project.ngConfigObj || config.CliConfig.fromProject(); diff --git a/packages/@angular/cli/blueprints/ng2/files/.editorconfig b/packages/@angular/cli/blueprints/ng/files/.editorconfig similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/.editorconfig rename to packages/@angular/cli/blueprints/ng/files/.editorconfig diff --git a/packages/@angular/cli/blueprints/ng2/files/README.md b/packages/@angular/cli/blueprints/ng/files/README.md similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/README.md rename to packages/@angular/cli/blueprints/ng/files/README.md diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/app/app-routing.module.ts b/packages/@angular/cli/blueprints/ng/files/__path__/app/app-routing.module.ts similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/app/app-routing.module.ts rename to packages/@angular/cli/blueprints/ng/files/__path__/app/app-routing.module.ts diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/app/app.component.__styleext__ b/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.__styleext__ similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/app/app.component.__styleext__ rename to packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.__styleext__ diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/app/app.component.html b/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.html similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/app/app.component.html rename to packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.html diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/app/app.component.spec.ts b/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.spec.ts similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/app/app.component.spec.ts rename to packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.spec.ts diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/app/app.component.ts b/packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.ts similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/app/app.component.ts rename to packages/@angular/cli/blueprints/ng/files/__path__/app/app.component.ts diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/app/app.module.ts b/packages/@angular/cli/blueprints/ng/files/__path__/app/app.module.ts similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/app/app.module.ts rename to packages/@angular/cli/blueprints/ng/files/__path__/app/app.module.ts diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/assets/.gitkeep b/packages/@angular/cli/blueprints/ng/files/__path__/assets/.gitkeep similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/assets/.gitkeep rename to packages/@angular/cli/blueprints/ng/files/__path__/assets/.gitkeep diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/environments/environment.prod.ts b/packages/@angular/cli/blueprints/ng/files/__path__/environments/environment.prod.ts similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/environments/environment.prod.ts rename to packages/@angular/cli/blueprints/ng/files/__path__/environments/environment.prod.ts diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/environments/environment.ts b/packages/@angular/cli/blueprints/ng/files/__path__/environments/environment.ts similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/environments/environment.ts rename to packages/@angular/cli/blueprints/ng/files/__path__/environments/environment.ts diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/favicon.ico b/packages/@angular/cli/blueprints/ng/files/__path__/favicon.ico similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/favicon.ico rename to packages/@angular/cli/blueprints/ng/files/__path__/favicon.ico diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/index.html b/packages/@angular/cli/blueprints/ng/files/__path__/index.html similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/index.html rename to packages/@angular/cli/blueprints/ng/files/__path__/index.html diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/main.ts b/packages/@angular/cli/blueprints/ng/files/__path__/main.ts similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/main.ts rename to packages/@angular/cli/blueprints/ng/files/__path__/main.ts diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/polyfills.ts b/packages/@angular/cli/blueprints/ng/files/__path__/polyfills.ts similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/polyfills.ts rename to packages/@angular/cli/blueprints/ng/files/__path__/polyfills.ts diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/styles.__styleext__ b/packages/@angular/cli/blueprints/ng/files/__path__/styles.__styleext__ similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/styles.__styleext__ rename to packages/@angular/cli/blueprints/ng/files/__path__/styles.__styleext__ diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/test.ts b/packages/@angular/cli/blueprints/ng/files/__path__/test.ts similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/test.ts rename to packages/@angular/cli/blueprints/ng/files/__path__/test.ts diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/tsconfig.app.json b/packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.app.json similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/tsconfig.app.json rename to packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.app.json diff --git a/packages/@angular/cli/blueprints/ng2/files/__path__/tsconfig.spec.json b/packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.spec.json similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/__path__/tsconfig.spec.json rename to packages/@angular/cli/blueprints/ng/files/__path__/tsconfig.spec.json diff --git a/packages/@angular/cli/blueprints/ng2/files/angular-cli.json b/packages/@angular/cli/blueprints/ng/files/angular-cli.json similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/angular-cli.json rename to packages/@angular/cli/blueprints/ng/files/angular-cli.json diff --git a/packages/@angular/cli/blueprints/ng2/files/e2e/app.e2e-spec.ts b/packages/@angular/cli/blueprints/ng/files/e2e/app.e2e-spec.ts similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/e2e/app.e2e-spec.ts rename to packages/@angular/cli/blueprints/ng/files/e2e/app.e2e-spec.ts diff --git a/packages/@angular/cli/blueprints/ng2/files/e2e/app.po.ts b/packages/@angular/cli/blueprints/ng/files/e2e/app.po.ts similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/e2e/app.po.ts rename to packages/@angular/cli/blueprints/ng/files/e2e/app.po.ts diff --git a/packages/@angular/cli/blueprints/ng2/files/e2e/tsconfig.e2e.json b/packages/@angular/cli/blueprints/ng/files/e2e/tsconfig.e2e.json similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/e2e/tsconfig.e2e.json rename to packages/@angular/cli/blueprints/ng/files/e2e/tsconfig.e2e.json diff --git a/packages/@angular/cli/blueprints/ng2/files/gitignore b/packages/@angular/cli/blueprints/ng/files/gitignore similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/gitignore rename to packages/@angular/cli/blueprints/ng/files/gitignore diff --git a/packages/@angular/cli/blueprints/ng2/files/karma.conf.js b/packages/@angular/cli/blueprints/ng/files/karma.conf.js similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/karma.conf.js rename to packages/@angular/cli/blueprints/ng/files/karma.conf.js diff --git a/packages/@angular/cli/blueprints/ng2/files/package.json b/packages/@angular/cli/blueprints/ng/files/package.json similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/package.json rename to packages/@angular/cli/blueprints/ng/files/package.json diff --git a/packages/@angular/cli/blueprints/ng2/files/protractor.conf.js b/packages/@angular/cli/blueprints/ng/files/protractor.conf.js similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/protractor.conf.js rename to packages/@angular/cli/blueprints/ng/files/protractor.conf.js diff --git a/packages/@angular/cli/blueprints/ng2/files/tsconfig.json b/packages/@angular/cli/blueprints/ng/files/tsconfig.json similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/tsconfig.json rename to packages/@angular/cli/blueprints/ng/files/tsconfig.json diff --git a/packages/@angular/cli/blueprints/ng2/files/tslint.json b/packages/@angular/cli/blueprints/ng/files/tslint.json similarity index 100% rename from packages/@angular/cli/blueprints/ng2/files/tslint.json rename to packages/@angular/cli/blueprints/ng/files/tslint.json diff --git a/packages/@angular/cli/blueprints/ng2/index.ts b/packages/@angular/cli/blueprints/ng/index.ts similarity index 100% rename from packages/@angular/cli/blueprints/ng2/index.ts rename to packages/@angular/cli/blueprints/ng/index.ts diff --git a/packages/@angular/cli/commands/generate.ts b/packages/@angular/cli/commands/generate.ts index e449dba13b8d..830a93a2d35d 100644 --- a/packages/@angular/cli/commands/generate.ts +++ b/packages/@angular/cli/commands/generate.ts @@ -10,7 +10,7 @@ const SilentError = require('silent-error'); const blueprintList = fs.readdirSync(path.join(__dirname, '..', 'blueprints')); const blueprints = blueprintList .filter(bp => bp.indexOf('-test') === -1) - .filter(bp => bp !== 'ng2') + .filter(bp => bp !== 'ng') .map(bp => Blueprint.load(path.join(__dirname, '..', 'blueprints', bp))); const GenerateCommand = EmberGenerateCommand.extend({ diff --git a/packages/@angular/cli/tasks/init.ts b/packages/@angular/cli/tasks/init.ts index fcf5b6a32053..e2ba1c2c96eb 100644 --- a/packages/@angular/cli/tasks/init.ts +++ b/packages/@angular/cli/tasks/init.ts @@ -64,7 +64,7 @@ export default Task.extend({ const blueprintOpts = { dryRun: commandOptions.dryRun, - blueprint: 'ng2', + blueprint: 'ng', rawName: packageName, targetFiles: rawArgs || '', rawArgs: rawArgs.toString(), diff --git a/tests/acceptance/new.spec.ts b/tests/acceptance/new.spec.ts index e50457567045..107647e0d9b6 100644 --- a/tests/acceptance/new.spec.ts +++ b/tests/acceptance/new.spec.ts @@ -51,7 +51,7 @@ describe('Acceptance: ng new', function () { } function confirmBlueprinted() { - return confirmBlueprintedForDir('blueprints/ng2'); + return confirmBlueprintedForDir('blueprints/ng'); } it('requires a valid name (!)', () => {