diff --git a/.eslintignore b/.eslintignore
index 974911dfbb03..bd119135a505 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -4,7 +4,7 @@ tmp/
typings/
# Ignore all blueprint files. We e2e tests those later on.
-packages/angular-cli/blueprints/*/files/
+packages/@angular/cli/blueprints/*/files/
# Ignore ember cli.
-packages/angular-cli/ember-cli/
\ No newline at end of file
+packages/@angular/cli/ember-cli/
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06b6fea56f4f..58e470a0f75c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
-
-# [1.0.0-beta.27](https://github.com/angular/angular-cli/compare/v1.0.0-beta.26...v1.0.0-beta.27) (2017-02-01)
+
+# [1.0.0-beta.28](https://github.com/angular/angular-cli/compare/v1.0.0-beta.26...v1.0.0-beta.28) (2017-02-01)
### Bug Fixes
diff --git a/bin/ng b/bin/ng
index 5e770a2caa95..00d18bf83791 100755
--- a/bin/ng
+++ b/bin/ng
@@ -2,7 +2,7 @@
'use strict';
// Provide a title to the process in `ps`
-process.title = 'angular-cli';
+process.title = '@angular/cli';
require('../lib/bootstrap-local');
-require('../packages/angular-cli/bin/ng');
+require('../packages/@angular/cli/bin/ng');
diff --git a/lib/bootstrap-local.js b/lib/bootstrap-local.js
index 802e55ebae0e..a4e2d58e3438 100644
--- a/lib/bootstrap-local.js
+++ b/lib/bootstrap-local.js
@@ -15,8 +15,8 @@ const oldRequireTs = require.extensions['.ts'];
require.extensions['.ts'] = function(m, filename) {
// If we're in node module, either call the old hook or simply compile the
// file without transpilation. We do not touch node_modules/**.
- // We do touch `angular-cli` files anywhere though.
- if (!filename.match(/angular-cli/) && filename.match(/node_modules/)) {
+ // We do touch `Angular CLI` files anywhere though.
+ if (!filename.match(/@angular\/cli/) && filename.match(/node_modules/)) {
if (oldRequireTs) {
return oldRequireTs(m, filename);
}
@@ -54,9 +54,9 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
Module._load = function (request, parent) {
if (request in packages) {
return oldLoad.call(this, packages[request].main, parent);
- } else if (request.startsWith('angular-cli/')) {
+ } else if (request.startsWith('@angular/cli/')) {
// We allow deep imports (for now).
- // TODO: move tests to inside angular-cli package so they don't have to deep import.
+ // TODO: move tests to inside @angular/cli package so they don't have to deep import.
const dir = path.dirname(parent.filename);
const newRequest = path.relative(dir, path.join(__dirname, '../packages', request));
return oldLoad.call(this, newRequest, parent);
diff --git a/package.json b/package.json
index 3c6058cd58d0..d1921c920aca 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
{
- "name": "angular-cli",
- "version": "1.0.0-beta.28.3",
+ "name": "@angular/cli",
+ "version": "1.0.0-beta.29",
"description": "CLI tool for Angular",
- "main": "packages/angular-cli/lib/cli/index.js",
+ "main": "packages/@angular/cli/lib/cli/index.js",
"trackingCode": "UA-8594346-19",
"bin": {
"ng": "./bin/ng"
@@ -112,7 +112,7 @@
},
"ember-addon": {
"paths": [
- "./packages/angular-cli/lib/addon"
+ "./packages/@angular/cli/lib/addon"
]
},
"devDependencies": {
diff --git a/packages/@angular-cli/ast-tools/src/change.spec.ts b/packages/@angular-cli/ast-tools/src/change.spec.ts
index 1a3cc1833bcf..39802d88e186 100644
--- a/packages/@angular-cli/ast-tools/src/change.spec.ts
+++ b/packages/@angular-cli/ast-tools/src/change.spec.ts
@@ -8,7 +8,7 @@ import {InsertChange, NodeHost, RemoveChange, ReplaceChange} from './change';
import fs = require('fs');
let path = require('path');
-let Promise = require('angular-cli/ember-cli/lib/ext/promise');
+let Promise = require('@angular/cli/ember-cli/lib/ext/promise');
const readFile = Promise.denodeify(fs.readFile);
diff --git a/packages/angular-cli/addon/index.js b/packages/@angular/cli/addon/index.js
similarity index 100%
rename from packages/angular-cli/addon/index.js
rename to packages/@angular/cli/addon/index.js
diff --git a/packages/angular-cli/bin/ng b/packages/@angular/cli/bin/ng
similarity index 96%
rename from packages/angular-cli/bin/ng
rename to packages/@angular/cli/bin/ng
index 3473c68ab269..2fb562e1fe29 100755
--- a/packages/angular-cli/bin/ng
+++ b/packages/@angular/cli/bin/ng
@@ -2,7 +2,7 @@
'use strict';
// Provide a title to the process in `ps`
-process.title = 'angular-cli';
+process.title = '@angular/cli';
const CliConfig = require('../models/config').CliConfig;
const Version = require('../upgrade/version').Version;
@@ -20,7 +20,7 @@ function _fromPackageJson(cwd) {
cwd = cwd || process.cwd();
do {
- const packageJsonPath = path.join(cwd, 'node_modules/angular-cli/package.json');
+ const packageJsonPath = path.join(cwd, 'node_modules/@angular/cli/package.json');
if (fs.existsSync(packageJsonPath)) {
const content = fs.readFileSync(packageJsonPath, 'utf-8');
if (content) {
@@ -87,7 +87,7 @@ if (require('../package.json')['name'] == 'angular-cli'
}
-resolve('angular-cli', { basedir: process.cwd() },
+resolve('@angular/cli', { basedir: process.cwd() },
function (error, projectLocalCli) {
var cli;
if (error) {
diff --git a/packages/angular-cli/blueprints/class/files/__path__/__name__.spec.ts b/packages/@angular/cli/blueprints/class/files/__path__/__name__.spec.ts
similarity index 100%
rename from packages/angular-cli/blueprints/class/files/__path__/__name__.spec.ts
rename to packages/@angular/cli/blueprints/class/files/__path__/__name__.spec.ts
diff --git a/packages/angular-cli/blueprints/class/files/__path__/__name__.ts b/packages/@angular/cli/blueprints/class/files/__path__/__name__.ts
similarity index 100%
rename from packages/angular-cli/blueprints/class/files/__path__/__name__.ts
rename to packages/@angular/cli/blueprints/class/files/__path__/__name__.ts
diff --git a/packages/angular-cli/blueprints/class/index.ts b/packages/@angular/cli/blueprints/class/index.ts
similarity index 100%
rename from packages/angular-cli/blueprints/class/index.ts
rename to packages/@angular/cli/blueprints/class/index.ts
diff --git a/packages/angular-cli/blueprints/component/files/__path__/__name__.component.__styleext__ b/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.__styleext__
similarity index 100%
rename from packages/angular-cli/blueprints/component/files/__path__/__name__.component.__styleext__
rename to packages/@angular/cli/blueprints/component/files/__path__/__name__.component.__styleext__
diff --git a/packages/angular-cli/blueprints/component/files/__path__/__name__.component.html b/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.html
similarity index 100%
rename from packages/angular-cli/blueprints/component/files/__path__/__name__.component.html
rename to packages/@angular/cli/blueprints/component/files/__path__/__name__.component.html
diff --git a/packages/angular-cli/blueprints/component/files/__path__/__name__.component.spec.ts b/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.spec.ts
similarity index 100%
rename from packages/angular-cli/blueprints/component/files/__path__/__name__.component.spec.ts
rename to packages/@angular/cli/blueprints/component/files/__path__/__name__.component.spec.ts
diff --git a/packages/angular-cli/blueprints/component/files/__path__/__name__.component.ts b/packages/@angular/cli/blueprints/component/files/__path__/__name__.component.ts
similarity index 100%
rename from packages/angular-cli/blueprints/component/files/__path__/__name__.component.ts
rename to packages/@angular/cli/blueprints/component/files/__path__/__name__.component.ts
diff --git a/packages/angular-cli/blueprints/component/index.ts b/packages/@angular/cli/blueprints/component/index.ts
similarity index 100%
rename from packages/angular-cli/blueprints/component/index.ts
rename to packages/@angular/cli/blueprints/component/index.ts
diff --git a/packages/angular-cli/blueprints/directive/files/__path__/__name__.directive.spec.ts b/packages/@angular/cli/blueprints/directive/files/__path__/__name__.directive.spec.ts
similarity index 100%
rename from packages/angular-cli/blueprints/directive/files/__path__/__name__.directive.spec.ts
rename to packages/@angular/cli/blueprints/directive/files/__path__/__name__.directive.spec.ts
diff --git a/packages/angular-cli/blueprints/directive/files/__path__/__name__.directive.ts b/packages/@angular/cli/blueprints/directive/files/__path__/__name__.directive.ts
similarity index 100%
rename from packages/angular-cli/blueprints/directive/files/__path__/__name__.directive.ts
rename to packages/@angular/cli/blueprints/directive/files/__path__/__name__.directive.ts
diff --git a/packages/angular-cli/blueprints/directive/index.ts b/packages/@angular/cli/blueprints/directive/index.ts
similarity index 100%
rename from packages/angular-cli/blueprints/directive/index.ts
rename to packages/@angular/cli/blueprints/directive/index.ts
diff --git a/packages/angular-cli/blueprints/enum/files/__path__/__name__.enum.ts b/packages/@angular/cli/blueprints/enum/files/__path__/__name__.enum.ts
similarity index 100%
rename from packages/angular-cli/blueprints/enum/files/__path__/__name__.enum.ts
rename to packages/@angular/cli/blueprints/enum/files/__path__/__name__.enum.ts
diff --git a/packages/angular-cli/blueprints/enum/index.ts b/packages/@angular/cli/blueprints/enum/index.ts
similarity index 100%
rename from packages/angular-cli/blueprints/enum/index.ts
rename to packages/@angular/cli/blueprints/enum/index.ts
diff --git a/packages/angular-cli/blueprints/interface/files/__path__/__name__.ts b/packages/@angular/cli/blueprints/interface/files/__path__/__name__.ts
similarity index 100%
rename from packages/angular-cli/blueprints/interface/files/__path__/__name__.ts
rename to packages/@angular/cli/blueprints/interface/files/__path__/__name__.ts
diff --git a/packages/angular-cli/blueprints/interface/index.ts b/packages/@angular/cli/blueprints/interface/index.ts
similarity index 100%
rename from packages/angular-cli/blueprints/interface/index.ts
rename to packages/@angular/cli/blueprints/interface/index.ts
diff --git a/packages/angular-cli/blueprints/module/files/__path__/__name__-routing.module.ts b/packages/@angular/cli/blueprints/module/files/__path__/__name__-routing.module.ts
similarity index 100%
rename from packages/angular-cli/blueprints/module/files/__path__/__name__-routing.module.ts
rename to packages/@angular/cli/blueprints/module/files/__path__/__name__-routing.module.ts
diff --git a/packages/angular-cli/blueprints/module/files/__path__/__name__.module.spec.ts b/packages/@angular/cli/blueprints/module/files/__path__/__name__.module.spec.ts
similarity index 100%
rename from packages/angular-cli/blueprints/module/files/__path__/__name__.module.spec.ts
rename to packages/@angular/cli/blueprints/module/files/__path__/__name__.module.spec.ts
diff --git a/packages/angular-cli/blueprints/module/files/__path__/__name__.module.ts b/packages/@angular/cli/blueprints/module/files/__path__/__name__.module.ts
similarity index 100%
rename from packages/angular-cli/blueprints/module/files/__path__/__name__.module.ts
rename to packages/@angular/cli/blueprints/module/files/__path__/__name__.module.ts
diff --git a/packages/angular-cli/blueprints/module/index.ts b/packages/@angular/cli/blueprints/module/index.ts
similarity index 100%
rename from packages/angular-cli/blueprints/module/index.ts
rename to packages/@angular/cli/blueprints/module/index.ts
diff --git a/packages/angular-cli/blueprints/ng2/files/.editorconfig b/packages/@angular/cli/blueprints/ng2/files/.editorconfig
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/.editorconfig
rename to packages/@angular/cli/blueprints/ng2/files/.editorconfig
diff --git a/packages/angular-cli/blueprints/ng2/files/README.md b/packages/@angular/cli/blueprints/ng2/files/README.md
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/README.md
rename to packages/@angular/cli/blueprints/ng2/files/README.md
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/app/app-routing.module.ts b/packages/@angular/cli/blueprints/ng2/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/ng2/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/ng2/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/ng2/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/ng2/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/ng2/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/ng2/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/ng2/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/ng2/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/ng2/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/ng2/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/ng2/files/__path__/app/app.module.ts
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/assets/.gitkeep b/packages/@angular/cli/blueprints/ng2/files/__path__/assets/.gitkeep
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/__path__/assets/.gitkeep
rename to packages/@angular/cli/blueprints/ng2/files/__path__/assets/.gitkeep
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/environments/environment.prod.ts b/packages/@angular/cli/blueprints/ng2/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/ng2/files/__path__/environments/environment.prod.ts
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/environments/environment.ts b/packages/@angular/cli/blueprints/ng2/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/ng2/files/__path__/environments/environment.ts
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/favicon.ico b/packages/@angular/cli/blueprints/ng2/files/__path__/favicon.ico
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/__path__/favicon.ico
rename to packages/@angular/cli/blueprints/ng2/files/__path__/favicon.ico
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/index.html b/packages/@angular/cli/blueprints/ng2/files/__path__/index.html
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/__path__/index.html
rename to packages/@angular/cli/blueprints/ng2/files/__path__/index.html
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/main.ts b/packages/@angular/cli/blueprints/ng2/files/__path__/main.ts
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/__path__/main.ts
rename to packages/@angular/cli/blueprints/ng2/files/__path__/main.ts
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/polyfills.ts b/packages/@angular/cli/blueprints/ng2/files/__path__/polyfills.ts
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/__path__/polyfills.ts
rename to packages/@angular/cli/blueprints/ng2/files/__path__/polyfills.ts
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/styles.__styleext__ b/packages/@angular/cli/blueprints/ng2/files/__path__/styles.__styleext__
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/__path__/styles.__styleext__
rename to packages/@angular/cli/blueprints/ng2/files/__path__/styles.__styleext__
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/test.ts b/packages/@angular/cli/blueprints/ng2/files/__path__/test.ts
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/__path__/test.ts
rename to packages/@angular/cli/blueprints/ng2/files/__path__/test.ts
diff --git a/packages/angular-cli/blueprints/ng2/files/__path__/tsconfig.json b/packages/@angular/cli/blueprints/ng2/files/__path__/tsconfig.json
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/__path__/tsconfig.json
rename to packages/@angular/cli/blueprints/ng2/files/__path__/tsconfig.json
diff --git a/packages/angular-cli/blueprints/ng2/files/angular-cli.json b/packages/@angular/cli/blueprints/ng2/files/angular-cli.json
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/angular-cli.json
rename to packages/@angular/cli/blueprints/ng2/files/angular-cli.json
diff --git a/packages/angular-cli/blueprints/ng2/files/e2e/app.e2e-spec.ts b/packages/@angular/cli/blueprints/ng2/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/ng2/files/e2e/app.e2e-spec.ts
diff --git a/packages/angular-cli/blueprints/ng2/files/e2e/app.po.ts b/packages/@angular/cli/blueprints/ng2/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/ng2/files/e2e/app.po.ts
diff --git a/packages/angular-cli/blueprints/ng2/files/e2e/tsconfig.json b/packages/@angular/cli/blueprints/ng2/files/e2e/tsconfig.json
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/e2e/tsconfig.json
rename to packages/@angular/cli/blueprints/ng2/files/e2e/tsconfig.json
diff --git a/packages/angular-cli/blueprints/ng2/files/gitignore b/packages/@angular/cli/blueprints/ng2/files/gitignore
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/gitignore
rename to packages/@angular/cli/blueprints/ng2/files/gitignore
diff --git a/packages/angular-cli/blueprints/ng2/files/karma.conf.js b/packages/@angular/cli/blueprints/ng2/files/karma.conf.js
similarity index 87%
rename from packages/angular-cli/blueprints/ng2/files/karma.conf.js
rename to packages/@angular/cli/blueprints/ng2/files/karma.conf.js
index 2ec744bb0530..f22d900ecc6a 100644
--- a/packages/angular-cli/blueprints/ng2/files/karma.conf.js
+++ b/packages/@angular/cli/blueprints/ng2/files/karma.conf.js
@@ -4,18 +4,18 @@
module.exports = function (config) {
config.set({
basePath: '',
- frameworks: ['jasmine', 'angular-cli'],
+ frameworks: ['jasmine', '@angular/cli'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-remap-istanbul'),
- require('angular-cli/plugins/karma')
+ require('@angular/cli/plugins/karma')
],
files: [
{ pattern: './<%= sourceDir %>/test.ts', watched: false }
],
preprocessors: {
- './<%= sourceDir %>/test.ts': ['angular-cli']
+ './<%= sourceDir %>/test.ts': ['@angular/cli']
},
mime: {
'text/x-typescript': ['ts','tsx']
diff --git a/packages/angular-cli/blueprints/ng2/files/package.json b/packages/@angular/cli/blueprints/ng2/files/package.json
similarity index 96%
rename from packages/angular-cli/blueprints/ng2/files/package.json
rename to packages/@angular/cli/blueprints/ng2/files/package.json
index aae643b81390..9d072447a11c 100644
--- a/packages/angular-cli/blueprints/ng2/files/package.json
+++ b/packages/@angular/cli/blueprints/ng2/files/package.json
@@ -26,10 +26,10 @@
"zone.js": "^0.7.2"
},
"devDependencies": {
+ "@angular/cli": "<%= version %>",
"@angular/compiler-cli": "^2.3.1",
"@types/jasmine": "2.5.38",
"@types/node": "^6.0.42",
- "angular-cli": "<%= version %>",
"codelyzer": "~2.0.0-beta.1",
"jasmine-core": "2.5.2",
"jasmine-spec-reporter": "2.5.0",
diff --git a/packages/angular-cli/blueprints/ng2/files/protractor.conf.js b/packages/@angular/cli/blueprints/ng2/files/protractor.conf.js
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/protractor.conf.js
rename to packages/@angular/cli/blueprints/ng2/files/protractor.conf.js
diff --git a/packages/angular-cli/blueprints/ng2/files/tslint.json b/packages/@angular/cli/blueprints/ng2/files/tslint.json
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/files/tslint.json
rename to packages/@angular/cli/blueprints/ng2/files/tslint.json
diff --git a/packages/angular-cli/blueprints/ng2/index.ts b/packages/@angular/cli/blueprints/ng2/index.ts
similarity index 100%
rename from packages/angular-cli/blueprints/ng2/index.ts
rename to packages/@angular/cli/blueprints/ng2/index.ts
diff --git a/packages/angular-cli/blueprints/pipe/files/__path__/__name__.pipe.spec.ts b/packages/@angular/cli/blueprints/pipe/files/__path__/__name__.pipe.spec.ts
similarity index 100%
rename from packages/angular-cli/blueprints/pipe/files/__path__/__name__.pipe.spec.ts
rename to packages/@angular/cli/blueprints/pipe/files/__path__/__name__.pipe.spec.ts
diff --git a/packages/angular-cli/blueprints/pipe/files/__path__/__name__.pipe.ts b/packages/@angular/cli/blueprints/pipe/files/__path__/__name__.pipe.ts
similarity index 100%
rename from packages/angular-cli/blueprints/pipe/files/__path__/__name__.pipe.ts
rename to packages/@angular/cli/blueprints/pipe/files/__path__/__name__.pipe.ts
diff --git a/packages/angular-cli/blueprints/pipe/index.ts b/packages/@angular/cli/blueprints/pipe/index.ts
similarity index 100%
rename from packages/angular-cli/blueprints/pipe/index.ts
rename to packages/@angular/cli/blueprints/pipe/index.ts
diff --git a/packages/angular-cli/blueprints/service/files/__path__/__name__.service.spec.ts b/packages/@angular/cli/blueprints/service/files/__path__/__name__.service.spec.ts
similarity index 100%
rename from packages/angular-cli/blueprints/service/files/__path__/__name__.service.spec.ts
rename to packages/@angular/cli/blueprints/service/files/__path__/__name__.service.spec.ts
diff --git a/packages/angular-cli/blueprints/service/files/__path__/__name__.service.ts b/packages/@angular/cli/blueprints/service/files/__path__/__name__.service.ts
similarity index 100%
rename from packages/angular-cli/blueprints/service/files/__path__/__name__.service.ts
rename to packages/@angular/cli/blueprints/service/files/__path__/__name__.service.ts
diff --git a/packages/angular-cli/blueprints/service/index.ts b/packages/@angular/cli/blueprints/service/index.ts
similarity index 100%
rename from packages/angular-cli/blueprints/service/index.ts
rename to packages/@angular/cli/blueprints/service/index.ts
diff --git a/packages/angular-cli/commands/build.run.ts b/packages/@angular/cli/commands/build.run.ts
similarity index 100%
rename from packages/angular-cli/commands/build.run.ts
rename to packages/@angular/cli/commands/build.run.ts
diff --git a/packages/angular-cli/commands/build.ts b/packages/@angular/cli/commands/build.ts
similarity index 97%
rename from packages/angular-cli/commands/build.ts
rename to packages/@angular/cli/commands/build.ts
index f6769aade08f..e0fc112c3d8e 100644
--- a/packages/angular-cli/commands/build.ts
+++ b/packages/@angular/cli/commands/build.ts
@@ -12,7 +12,7 @@ export const BaseBuildCommandOptions: any = [
},
{ name: 'environment', type: String, aliases: ['e'] },
{ name: 'output-path', type: 'Path', aliases: ['op'] },
- { name: 'aot', type: Boolean, default: false },
+ { name: 'aot', type: Boolean },
{ name: 'sourcemap', type: Boolean, aliases: ['sm'] },
{ name: 'vendor-chunk', type: Boolean, default: true, aliases: ['vc'] },
{ name: 'base-href', type: String, default: '/', aliases: ['bh'] },
diff --git a/packages/angular-cli/commands/completion.ts b/packages/@angular/cli/commands/completion.ts
similarity index 100%
rename from packages/angular-cli/commands/completion.ts
rename to packages/@angular/cli/commands/completion.ts
diff --git a/packages/angular-cli/commands/destroy.ts b/packages/@angular/cli/commands/destroy.ts
similarity index 100%
rename from packages/angular-cli/commands/destroy.ts
rename to packages/@angular/cli/commands/destroy.ts
diff --git a/packages/angular-cli/commands/doc.ts b/packages/@angular/cli/commands/doc.ts
similarity index 100%
rename from packages/angular-cli/commands/doc.ts
rename to packages/@angular/cli/commands/doc.ts
diff --git a/packages/angular-cli/commands/e2e.ts b/packages/@angular/cli/commands/e2e.ts
similarity index 100%
rename from packages/angular-cli/commands/e2e.ts
rename to packages/@angular/cli/commands/e2e.ts
diff --git a/packages/angular-cli/commands/easter-egg.ts b/packages/@angular/cli/commands/easter-egg.ts
similarity index 100%
rename from packages/angular-cli/commands/easter-egg.ts
rename to packages/@angular/cli/commands/easter-egg.ts
diff --git a/packages/angular-cli/commands/generate.ts b/packages/@angular/cli/commands/generate.ts
similarity index 92%
rename from packages/angular-cli/commands/generate.ts
rename to packages/@angular/cli/commands/generate.ts
index 3b03d3daa0f0..79f2b9925c1a 100644
--- a/packages/angular-cli/commands/generate.ts
+++ b/packages/@angular/cli/commands/generate.ts
@@ -21,11 +21,11 @@ const GenerateCommand = EmberGenerateCommand.extend({
if (rawArgs[0] !== '--help' &&
!fs.existsSync(path.join(__dirname, '..', 'blueprints', rawArgs[0]))) {
- SilentError.debugOrThrow('angular-cli/commands/generate', `Invalid blueprint: ${rawArgs[0]}`);
+ SilentError.debugOrThrow('@angular/cli/commands/generate', `Invalid blueprint: ${rawArgs[0]}`);
}
if (!rawArgs[1]) {
- SilentError.debugOrThrow('angular-cli/commands/generate',
+ SilentError.debugOrThrow('@angular/cli/commands/generate',
`The \`ng generate ${rawArgs[0]}\` command requires a name to be specified.`);
}
diff --git a/packages/angular-cli/commands/get.ts b/packages/@angular/cli/commands/get.ts
similarity index 100%
rename from packages/angular-cli/commands/get.ts
rename to packages/@angular/cli/commands/get.ts
diff --git a/packages/angular-cli/commands/github-pages-deploy.run.ts b/packages/@angular/cli/commands/github-pages-deploy.run.ts
similarity index 100%
rename from packages/angular-cli/commands/github-pages-deploy.run.ts
rename to packages/@angular/cli/commands/github-pages-deploy.run.ts
diff --git a/packages/angular-cli/commands/github-pages-deploy.ts b/packages/@angular/cli/commands/github-pages-deploy.ts
similarity index 100%
rename from packages/angular-cli/commands/github-pages-deploy.ts
rename to packages/@angular/cli/commands/github-pages-deploy.ts
diff --git a/packages/angular-cli/commands/help.ts b/packages/@angular/cli/commands/help.ts
similarity index 100%
rename from packages/angular-cli/commands/help.ts
rename to packages/@angular/cli/commands/help.ts
diff --git a/packages/angular-cli/commands/init.run.ts b/packages/@angular/cli/commands/init.run.ts
similarity index 100%
rename from packages/angular-cli/commands/init.run.ts
rename to packages/@angular/cli/commands/init.run.ts
diff --git a/packages/angular-cli/commands/init.ts b/packages/@angular/cli/commands/init.ts
similarity index 100%
rename from packages/angular-cli/commands/init.ts
rename to packages/@angular/cli/commands/init.ts
diff --git a/packages/angular-cli/commands/lint.ts b/packages/@angular/cli/commands/lint.ts
similarity index 100%
rename from packages/angular-cli/commands/lint.ts
rename to packages/@angular/cli/commands/lint.ts
diff --git a/packages/angular-cli/commands/new.ts b/packages/@angular/cli/commands/new.ts
similarity index 100%
rename from packages/angular-cli/commands/new.ts
rename to packages/@angular/cli/commands/new.ts
diff --git a/packages/angular-cli/commands/serve.run.ts b/packages/@angular/cli/commands/serve.run.ts
similarity index 100%
rename from packages/angular-cli/commands/serve.run.ts
rename to packages/@angular/cli/commands/serve.run.ts
diff --git a/packages/angular-cli/commands/serve.ts b/packages/@angular/cli/commands/serve.ts
similarity index 100%
rename from packages/angular-cli/commands/serve.ts
rename to packages/@angular/cli/commands/serve.ts
diff --git a/packages/angular-cli/commands/set.ts b/packages/@angular/cli/commands/set.ts
similarity index 100%
rename from packages/angular-cli/commands/set.ts
rename to packages/@angular/cli/commands/set.ts
diff --git a/packages/angular-cli/commands/test.ts b/packages/@angular/cli/commands/test.ts
similarity index 100%
rename from packages/angular-cli/commands/test.ts
rename to packages/@angular/cli/commands/test.ts
diff --git a/packages/angular-cli/commands/version.ts b/packages/@angular/cli/commands/version.ts
similarity index 98%
rename from packages/angular-cli/commands/version.ts
rename to packages/@angular/cli/commands/version.ts
index 00a823a7784d..ac531ede947e 100644
--- a/packages/angular-cli/commands/version.ts
+++ b/packages/@angular/cli/commands/version.ts
@@ -54,7 +54,7 @@ const VersionCommand = Command.extend({
\\__,_||_| |_| \\__, | \\__,_||_| \\__,_||_| \\___||_||_|
|___/`;
this.ui.writeLine(chalk.red(asciiArt));
- this.printVersion('angular-cli', ngCliVersion);
+ this.printVersion('@angular/cli', ngCliVersion);
for (const module of Object.keys(versions)) {
const isRoot = roots.some(root => module.startsWith(root));
diff --git a/packages/angular-cli/custom-typings.d.ts b/packages/@angular/cli/custom-typings.d.ts
similarity index 100%
rename from packages/angular-cli/custom-typings.d.ts
rename to packages/@angular/cli/custom-typings.d.ts
diff --git a/packages/angular-cli/ember-cli/LICENSE.md b/packages/@angular/cli/ember-cli/LICENSE.md
similarity index 100%
rename from packages/angular-cli/ember-cli/LICENSE.md
rename to packages/@angular/cli/ember-cli/LICENSE.md
diff --git a/packages/angular-cli/ember-cli/lib/cli/cli.js b/packages/@angular/cli/ember-cli/lib/cli/cli.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/cli/cli.js
rename to packages/@angular/cli/ember-cli/lib/cli/cli.js
diff --git a/packages/angular-cli/ember-cli/lib/cli/index.js b/packages/@angular/cli/ember-cli/lib/cli/index.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/cli/index.js
rename to packages/@angular/cli/ember-cli/lib/cli/index.js
diff --git a/packages/angular-cli/ember-cli/lib/cli/lookup-command.js b/packages/@angular/cli/ember-cli/lib/cli/lookup-command.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/cli/lookup-command.js
rename to packages/@angular/cli/ember-cli/lib/cli/lookup-command.js
diff --git a/packages/angular-cli/ember-cli/lib/commands.js b/packages/@angular/cli/ember-cli/lib/commands.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/commands.js
rename to packages/@angular/cli/ember-cli/lib/commands.js
diff --git a/packages/angular-cli/ember-cli/lib/commands/generate.js b/packages/@angular/cli/ember-cli/lib/commands/generate.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/commands/generate.js
rename to packages/@angular/cli/ember-cli/lib/commands/generate.js
diff --git a/packages/angular-cli/ember-cli/lib/commands/test.js b/packages/@angular/cli/ember-cli/lib/commands/test.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/commands/test.js
rename to packages/@angular/cli/ember-cli/lib/commands/test.js
diff --git a/packages/angular-cli/ember-cli/lib/commands/unknown.js b/packages/@angular/cli/ember-cli/lib/commands/unknown.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/commands/unknown.js
rename to packages/@angular/cli/ember-cli/lib/commands/unknown.js
diff --git a/packages/angular-cli/ember-cli/lib/ext/core-object.js b/packages/@angular/cli/ember-cli/lib/ext/core-object.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/ext/core-object.js
rename to packages/@angular/cli/ember-cli/lib/ext/core-object.js
diff --git a/packages/angular-cli/ember-cli/lib/ext/promise.js b/packages/@angular/cli/ember-cli/lib/ext/promise.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/ext/promise.js
rename to packages/@angular/cli/ember-cli/lib/ext/promise.js
diff --git a/packages/angular-cli/ember-cli/lib/models/addon.js b/packages/@angular/cli/ember-cli/lib/models/addon.js
similarity index 99%
rename from packages/angular-cli/ember-cli/lib/models/addon.js
rename to packages/@angular/cli/ember-cli/lib/models/addon.js
index 3af4880111a7..2b764992427e 100644
--- a/packages/angular-cli/ember-cli/lib/models/addon.js
+++ b/packages/@angular/cli/ember-cli/lib/models/addon.js
@@ -58,8 +58,8 @@ Addon.prototype.initializeAddons = function() {
}
this._addonsInitialized = true;
this.addonPackages = {
- 'angular-cli': {
- name: 'angular-cli',
+ '@angular/cli': {
+ name: '@angular/cli',
path: path.join(__dirname, '../../../'),
pkg: cliPkg,
}
diff --git a/packages/angular-cli/ember-cli/lib/models/blueprint.js b/packages/@angular/cli/ember-cli/lib/models/blueprint.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/models/blueprint.js
rename to packages/@angular/cli/ember-cli/lib/models/blueprint.js
diff --git a/packages/angular-cli/ember-cli/lib/models/command.js b/packages/@angular/cli/ember-cli/lib/models/command.js
similarity index 99%
rename from packages/angular-cli/ember-cli/lib/models/command.js
rename to packages/@angular/cli/ember-cli/lib/models/command.js
index 7f3d0349c99d..562ae731157c 100644
--- a/packages/angular-cli/ember-cli/lib/models/command.js
+++ b/packages/@angular/cli/ember-cli/lib/models/command.js
@@ -275,7 +275,7 @@ Command.prototype.parseAlias = function(option, alias) {
try {
aliasValue = JSON.parse(alias);
} catch (e) {
- var debug = require('debug')('angular-cli/ember-cli/models/command');
+ var debug = require('debug')('@angular/cli/ember-cli/models/command');
debug(e);
}
}
diff --git a/packages/angular-cli/ember-cli/lib/models/edit-file-diff.js b/packages/@angular/cli/ember-cli/lib/models/edit-file-diff.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/models/edit-file-diff.js
rename to packages/@angular/cli/ember-cli/lib/models/edit-file-diff.js
diff --git a/packages/angular-cli/ember-cli/lib/models/file-info.js b/packages/@angular/cli/ember-cli/lib/models/file-info.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/models/file-info.js
rename to packages/@angular/cli/ember-cli/lib/models/file-info.js
diff --git a/packages/angular-cli/ember-cli/lib/models/installation-checker.js b/packages/@angular/cli/ember-cli/lib/models/installation-checker.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/models/installation-checker.js
rename to packages/@angular/cli/ember-cli/lib/models/installation-checker.js
diff --git a/packages/angular-cli/ember-cli/lib/models/project.js b/packages/@angular/cli/ember-cli/lib/models/project.js
similarity index 99%
rename from packages/angular-cli/ember-cli/lib/models/project.js
rename to packages/@angular/cli/ember-cli/lib/models/project.js
index fa0fcc206fcf..56221b5a5330 100644
--- a/packages/angular-cli/ember-cli/lib/models/project.js
+++ b/packages/@angular/cli/ember-cli/lib/models/project.js
@@ -293,7 +293,7 @@ Project.prototype.initializeAddons = function() {
const cliPkg = require(path.resolve(__dirname, '../../../package.json'));
const Addon = require('../models/addon');
const Constructor = Addon.lookup({
- name: 'angular-cli',
+ name: '@angular/cli',
path: path.join(__dirname, '../../../'),
pkg: cliPkg,
});
diff --git a/packages/angular-cli/ember-cli/lib/models/task.js b/packages/@angular/cli/ember-cli/lib/models/task.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/models/task.js
rename to packages/@angular/cli/ember-cli/lib/models/task.js
diff --git a/packages/angular-cli/ember-cli/lib/models/watcher.js b/packages/@angular/cli/ember-cli/lib/models/watcher.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/models/watcher.js
rename to packages/@angular/cli/ember-cli/lib/models/watcher.js
diff --git a/packages/angular-cli/ember-cli/lib/tasks.js b/packages/@angular/cli/ember-cli/lib/tasks.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/tasks.js
rename to packages/@angular/cli/ember-cli/lib/tasks.js
diff --git a/packages/angular-cli/ember-cli/lib/tasks/create-and-step-into-directory.js b/packages/@angular/cli/ember-cli/lib/tasks/create-and-step-into-directory.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/tasks/create-and-step-into-directory.js
rename to packages/@angular/cli/ember-cli/lib/tasks/create-and-step-into-directory.js
diff --git a/packages/angular-cli/ember-cli/lib/tasks/destroy-from-blueprint.js b/packages/@angular/cli/ember-cli/lib/tasks/destroy-from-blueprint.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/tasks/destroy-from-blueprint.js
rename to packages/@angular/cli/ember-cli/lib/tasks/destroy-from-blueprint.js
diff --git a/packages/angular-cli/ember-cli/lib/tasks/generate-from-blueprint.js b/packages/@angular/cli/ember-cli/lib/tasks/generate-from-blueprint.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/tasks/generate-from-blueprint.js
rename to packages/@angular/cli/ember-cli/lib/tasks/generate-from-blueprint.js
diff --git a/packages/angular-cli/ember-cli/lib/tasks/git-init.js b/packages/@angular/cli/ember-cli/lib/tasks/git-init.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/tasks/git-init.js
rename to packages/@angular/cli/ember-cli/lib/tasks/git-init.js
diff --git a/packages/angular-cli/ember-cli/lib/tasks/install-blueprint.js b/packages/@angular/cli/ember-cli/lib/tasks/install-blueprint.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/tasks/install-blueprint.js
rename to packages/@angular/cli/ember-cli/lib/tasks/install-blueprint.js
diff --git a/packages/angular-cli/ember-cli/lib/tasks/npm-install.js b/packages/@angular/cli/ember-cli/lib/tasks/npm-install.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/tasks/npm-install.js
rename to packages/@angular/cli/ember-cli/lib/tasks/npm-install.js
diff --git a/packages/angular-cli/ember-cli/lib/tasks/npm-task.js b/packages/@angular/cli/ember-cli/lib/tasks/npm-task.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/tasks/npm-task.js
rename to packages/@angular/cli/ember-cli/lib/tasks/npm-task.js
diff --git a/packages/angular-cli/ember-cli/lib/ui/index.js b/packages/@angular/cli/ember-cli/lib/ui/index.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/ui/index.js
rename to packages/@angular/cli/ember-cli/lib/ui/index.js
diff --git a/packages/angular-cli/ember-cli/lib/ui/write-error.js b/packages/@angular/cli/ember-cli/lib/ui/write-error.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/ui/write-error.js
rename to packages/@angular/cli/ember-cli/lib/ui/write-error.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/COMMIT_MESSAGE.txt b/packages/@angular/cli/ember-cli/lib/utilities/COMMIT_MESSAGE.txt
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/COMMIT_MESSAGE.txt
rename to packages/@angular/cli/ember-cli/lib/utilities/COMMIT_MESSAGE.txt
diff --git a/packages/angular-cli/ember-cli/lib/utilities/DAG.js b/packages/@angular/cli/ember-cli/lib/utilities/DAG.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/DAG.js
rename to packages/@angular/cli/ember-cli/lib/utilities/DAG.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/get-option-args.js b/packages/@angular/cli/ember-cli/lib/utilities/get-option-args.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/get-option-args.js
rename to packages/@angular/cli/ember-cli/lib/utilities/get-option-args.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/get-package-base-name.js b/packages/@angular/cli/ember-cli/lib/utilities/get-package-base-name.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/get-package-base-name.js
rename to packages/@angular/cli/ember-cli/lib/utilities/get-package-base-name.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/merge-blueprint-options.js b/packages/@angular/cli/ember-cli/lib/utilities/merge-blueprint-options.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/merge-blueprint-options.js
rename to packages/@angular/cli/ember-cli/lib/utilities/merge-blueprint-options.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/mk-tmp-dir-in.js b/packages/@angular/cli/ember-cli/lib/utilities/mk-tmp-dir-in.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/mk-tmp-dir-in.js
rename to packages/@angular/cli/ember-cli/lib/utilities/mk-tmp-dir-in.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/normalize-blueprint-option.js b/packages/@angular/cli/ember-cli/lib/utilities/normalize-blueprint-option.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/normalize-blueprint-option.js
rename to packages/@angular/cli/ember-cli/lib/utilities/normalize-blueprint-option.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/open-editor.js b/packages/@angular/cli/ember-cli/lib/utilities/open-editor.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/open-editor.js
rename to packages/@angular/cli/ember-cli/lib/utilities/open-editor.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/parse-options.js b/packages/@angular/cli/ember-cli/lib/utilities/parse-options.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/parse-options.js
rename to packages/@angular/cli/ember-cli/lib/utilities/parse-options.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/path.js b/packages/@angular/cli/ember-cli/lib/utilities/path.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/path.js
rename to packages/@angular/cli/ember-cli/lib/utilities/path.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/platform-checker.js b/packages/@angular/cli/ember-cli/lib/utilities/platform-checker.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/platform-checker.js
rename to packages/@angular/cli/ember-cli/lib/utilities/platform-checker.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/print-command.js b/packages/@angular/cli/ember-cli/lib/utilities/print-command.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/print-command.js
rename to packages/@angular/cli/ember-cli/lib/utilities/print-command.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/printable-properties.js b/packages/@angular/cli/ember-cli/lib/utilities/printable-properties.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/printable-properties.js
rename to packages/@angular/cli/ember-cli/lib/utilities/printable-properties.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/sequence.js b/packages/@angular/cli/ember-cli/lib/utilities/sequence.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/sequence.js
rename to packages/@angular/cli/ember-cli/lib/utilities/sequence.js
diff --git a/packages/angular-cli/ember-cli/lib/utilities/valid-project-name.js b/packages/@angular/cli/ember-cli/lib/utilities/valid-project-name.js
similarity index 100%
rename from packages/angular-cli/ember-cli/lib/utilities/valid-project-name.js
rename to packages/@angular/cli/ember-cli/lib/utilities/valid-project-name.js
diff --git a/packages/angular-cli/lib/cli/index.js b/packages/@angular/cli/lib/cli/index.js
similarity index 97%
rename from packages/angular-cli/lib/cli/index.js
rename to packages/@angular/cli/lib/cli/index.js
index 6bddeabc3ccf..f359071438be 100644
--- a/packages/angular-cli/lib/cli/index.js
+++ b/packages/@angular/cli/lib/cli/index.js
@@ -28,7 +28,7 @@ module.exports = function(options) {
options.cli = {
name: 'ng',
root: path.join(__dirname, '..', '..'),
- npmPackage: 'angular-cli'
+ npmPackage: '@angular/cli'
};
// ensure the environemnt variable for dynamic paths
diff --git a/packages/angular-cli/lib/config/.gitignore b/packages/@angular/cli/lib/config/.gitignore
similarity index 100%
rename from packages/angular-cli/lib/config/.gitignore
rename to packages/@angular/cli/lib/config/.gitignore
diff --git a/packages/angular-cli/lib/config/schema.json b/packages/@angular/cli/lib/config/schema.json
similarity index 100%
rename from packages/angular-cli/lib/config/schema.json
rename to packages/@angular/cli/lib/config/schema.json
diff --git a/packages/angular-cli/lib/webpack/compression-plugin.ts b/packages/@angular/cli/lib/webpack/compression-plugin.ts
similarity index 100%
rename from packages/angular-cli/lib/webpack/compression-plugin.ts
rename to packages/@angular/cli/lib/webpack/compression-plugin.ts
diff --git a/packages/angular-cli/models/config.ts b/packages/@angular/cli/models/config.ts
similarity index 100%
rename from packages/angular-cli/models/config.ts
rename to packages/@angular/cli/models/config.ts
diff --git a/packages/angular-cli/models/config/config.spec.ts b/packages/@angular/cli/models/config/config.spec.ts
similarity index 100%
rename from packages/angular-cli/models/config/config.spec.ts
rename to packages/@angular/cli/models/config/config.spec.ts
diff --git a/packages/angular-cli/models/config/config.ts b/packages/@angular/cli/models/config/config.ts
similarity index 100%
rename from packages/angular-cli/models/config/config.ts
rename to packages/@angular/cli/models/config/config.ts
diff --git a/packages/angular-cli/models/config/spec-schema.d.ts b/packages/@angular/cli/models/config/spec-schema.d.ts
similarity index 100%
rename from packages/angular-cli/models/config/spec-schema.d.ts
rename to packages/@angular/cli/models/config/spec-schema.d.ts
diff --git a/packages/angular-cli/models/config/spec-schema.json b/packages/@angular/cli/models/config/spec-schema.json
similarity index 100%
rename from packages/angular-cli/models/config/spec-schema.json
rename to packages/@angular/cli/models/config/spec-schema.json
diff --git a/packages/angular-cli/models/error.ts b/packages/@angular/cli/models/error.ts
similarity index 100%
rename from packages/angular-cli/models/error.ts
rename to packages/@angular/cli/models/error.ts
diff --git a/packages/angular-cli/models/webpack-config.ts b/packages/@angular/cli/models/webpack-config.ts
similarity index 100%
rename from packages/angular-cli/models/webpack-config.ts
rename to packages/@angular/cli/models/webpack-config.ts
diff --git a/packages/angular-cli/models/webpack-configs/common.ts b/packages/@angular/cli/models/webpack-configs/common.ts
similarity index 100%
rename from packages/angular-cli/models/webpack-configs/common.ts
rename to packages/@angular/cli/models/webpack-configs/common.ts
diff --git a/packages/angular-cli/models/webpack-configs/development.ts b/packages/@angular/cli/models/webpack-configs/development.ts
similarity index 100%
rename from packages/angular-cli/models/webpack-configs/development.ts
rename to packages/@angular/cli/models/webpack-configs/development.ts
diff --git a/packages/angular-cli/models/webpack-configs/index.ts b/packages/@angular/cli/models/webpack-configs/index.ts
similarity index 100%
rename from packages/angular-cli/models/webpack-configs/index.ts
rename to packages/@angular/cli/models/webpack-configs/index.ts
diff --git a/packages/angular-cli/models/webpack-configs/production.ts b/packages/@angular/cli/models/webpack-configs/production.ts
similarity index 100%
rename from packages/angular-cli/models/webpack-configs/production.ts
rename to packages/@angular/cli/models/webpack-configs/production.ts
diff --git a/packages/angular-cli/models/webpack-configs/styles.ts b/packages/@angular/cli/models/webpack-configs/styles.ts
similarity index 100%
rename from packages/angular-cli/models/webpack-configs/styles.ts
rename to packages/@angular/cli/models/webpack-configs/styles.ts
diff --git a/packages/angular-cli/models/webpack-configs/test.js b/packages/@angular/cli/models/webpack-configs/test.js
similarity index 100%
rename from packages/angular-cli/models/webpack-configs/test.js
rename to packages/@angular/cli/models/webpack-configs/test.js
diff --git a/packages/angular-cli/models/webpack-configs/typescript.ts b/packages/@angular/cli/models/webpack-configs/typescript.ts
similarity index 100%
rename from packages/angular-cli/models/webpack-configs/typescript.ts
rename to packages/@angular/cli/models/webpack-configs/typescript.ts
diff --git a/packages/angular-cli/models/webpack-configs/utils.ts b/packages/@angular/cli/models/webpack-configs/utils.ts
similarity index 100%
rename from packages/angular-cli/models/webpack-configs/utils.ts
rename to packages/@angular/cli/models/webpack-configs/utils.ts
diff --git a/packages/angular-cli/package.json b/packages/@angular/cli/package.json
similarity index 97%
rename from packages/angular-cli/package.json
rename to packages/@angular/cli/package.json
index 0f04ef0bc452..bc2acbdcf51e 100644
--- a/packages/angular-cli/package.json
+++ b/packages/@angular/cli/package.json
@@ -1,6 +1,6 @@
{
- "name": "angular-cli",
- "version": "1.0.0-beta.28.3",
+ "name": "@angular/cli",
+ "version": "1.0.0-beta.29",
"description": "CLI tool for Angular",
"main": "lib/cli/index.js",
"trackingCode": "UA-8594346-19",
@@ -16,7 +16,7 @@
"url": "https://github.com/angular/angular-cli.git"
},
"engines": {
- "node": ">= 4.1.0",
+ "node": ">= 6.9.0",
"npm": ">= 3.0.0"
},
"author": "Angular Authors",
diff --git a/packages/angular-cli/plugins/glob-copy-webpack-plugin.ts b/packages/@angular/cli/plugins/glob-copy-webpack-plugin.ts
similarity index 100%
rename from packages/angular-cli/plugins/glob-copy-webpack-plugin.ts
rename to packages/@angular/cli/plugins/glob-copy-webpack-plugin.ts
diff --git a/packages/angular-cli/plugins/karma.js b/packages/@angular/cli/plugins/karma.js
similarity index 93%
rename from packages/angular-cli/plugins/karma.js
rename to packages/@angular/cli/plugins/karma.js
index ce84169a3e89..0be0860eaaff 100644
--- a/packages/angular-cli/plugins/karma.js
+++ b/packages/@angular/cli/plugins/karma.js
@@ -63,9 +63,9 @@ const init = (config) => {
// replace the angular-cli preprocessor with webpack+sourcemap
Object.keys(config.preprocessors)
- .filter((file) => config.preprocessors[file].indexOf('angular-cli') !== -1)
+ .filter((file) => config.preprocessors[file].indexOf('@angular/cli') !== -1)
.map((file) => config.preprocessors[file])
- .map((arr) => arr.splice(arr.indexOf('angular-cli'), 1, 'webpack', 'sourcemap'));
+ .map((arr) => arr.splice(arr.indexOf('@angular/cli'), 1, 'webpack', 'sourcemap'));
// Add polyfills file
if (appConfig.polyfills) {
@@ -108,6 +108,6 @@ preprocessor.$inject = [];
// also export karma-webpack and karma-sourcemap-loader
module.exports = Object.assign({
- 'framework:angular-cli': ['factory', init],
- 'preprocessor:angular-cli': ['factory', preprocessor]
+ 'framework:@angular/cli': ['factory', init],
+ 'preprocessor:@angular/cli': ['factory', preprocessor]
}, require('karma-webpack'), require('karma-sourcemap-loader'));
diff --git a/packages/angular-cli/plugins/suppress-entry-chunks-webpack-plugin.ts b/packages/@angular/cli/plugins/suppress-entry-chunks-webpack-plugin.ts
similarity index 100%
rename from packages/angular-cli/plugins/suppress-entry-chunks-webpack-plugin.ts
rename to packages/@angular/cli/plugins/suppress-entry-chunks-webpack-plugin.ts
diff --git a/packages/angular-cli/tasks/build.ts b/packages/@angular/cli/tasks/build.ts
similarity index 100%
rename from packages/angular-cli/tasks/build.ts
rename to packages/@angular/cli/tasks/build.ts
diff --git a/packages/angular-cli/tasks/create-github-repo.ts b/packages/@angular/cli/tasks/create-github-repo.ts
similarity index 100%
rename from packages/angular-cli/tasks/create-github-repo.ts
rename to packages/@angular/cli/tasks/create-github-repo.ts
diff --git a/packages/angular-cli/tasks/doc.ts b/packages/@angular/cli/tasks/doc.ts
similarity index 100%
rename from packages/angular-cli/tasks/doc.ts
rename to packages/@angular/cli/tasks/doc.ts
diff --git a/packages/angular-cli/tasks/e2e.ts b/packages/@angular/cli/tasks/e2e.ts
similarity index 100%
rename from packages/angular-cli/tasks/e2e.ts
rename to packages/@angular/cli/tasks/e2e.ts
diff --git a/packages/angular-cli/tasks/git-init.js b/packages/@angular/cli/tasks/git-init.js
similarity index 98%
rename from packages/angular-cli/tasks/git-init.js
rename to packages/@angular/cli/tasks/git-init.js
index e82c7fa3b4db..061b332ce47f 100644
--- a/packages/angular-cli/tasks/git-init.js
+++ b/packages/@angular/cli/tasks/git-init.js
@@ -9,7 +9,7 @@ var template = require('lodash/template');
var Task = require('../ember-cli/lib/models/task');
var gitEnvironmentVariables = {
- GIT_AUTHOR_NAME: 'angular-cli',
+ GIT_AUTHOR_NAME: 'Angular CLI',
GIT_AUTHOR_EMAIL: 'angular-cli@angular.io',
get GIT_COMMITTER_NAME() {
return this.GIT_AUTHOR_NAME;
diff --git a/packages/angular-cli/tasks/link-cli.ts b/packages/@angular/cli/tasks/link-cli.ts
similarity index 64%
rename from packages/angular-cli/tasks/link-cli.ts
rename to packages/@angular/cli/tasks/link-cli.ts
index cb2ee1175e68..176e080c2276 100644
--- a/packages/angular-cli/tasks/link-cli.ts
+++ b/packages/@angular/cli/tasks/link-cli.ts
@@ -7,12 +7,12 @@ export default Task.extend({
const ui = this.ui;
return new Promise(function(resolve, reject) {
- exec('npm link angular-cli', (err) => {
+ exec('npm link @angular/cli', (err) => {
if (err) {
- ui.writeLine(chalk.red('Couldn\'t do \'npm link angular-cli\'.'));
+ ui.writeLine(chalk.red('Couldn\'t do \'npm link @angular/cli\'.'));
reject();
} else {
- ui.writeLine(chalk.green('Successfully linked to angular-cli.'));
+ ui.writeLine(chalk.green('Successfully linked to @angular/cli.'));
resolve();
}
});
diff --git a/packages/angular-cli/tasks/lint.ts b/packages/@angular/cli/tasks/lint.ts
similarity index 100%
rename from packages/angular-cli/tasks/lint.ts
rename to packages/@angular/cli/tasks/lint.ts
diff --git a/packages/angular-cli/tasks/npm-install.ts b/packages/@angular/cli/tasks/npm-install.ts
similarity index 100%
rename from packages/angular-cli/tasks/npm-install.ts
rename to packages/@angular/cli/tasks/npm-install.ts
diff --git a/packages/angular-cli/tasks/serve.ts b/packages/@angular/cli/tasks/serve.ts
similarity index 98%
rename from packages/angular-cli/tasks/serve.ts
rename to packages/@angular/cli/tasks/serve.ts
index 64201cce0fc3..6a376f35ac86 100644
--- a/packages/angular-cli/tasks/serve.ts
+++ b/packages/@angular/cli/tasks/serve.ts
@@ -47,7 +47,7 @@ export default Task.extend({
`);
ui.writeLine(' The project will still live reload when HMR is enabled,');
ui.writeLine(' but to take advantage of HMR additional application code is required');
- ui.writeLine(' (not included in an angular-cli project by default).');
+ ui.writeLine(' (not included in an Angular CLI project by default).');
ui.writeLine(` See ${chalk.blue(webpackHmrLink)}`);
ui.writeLine(' for information on working with HMR for Webpack.');
entryPoints.push('webpack/hot/dev-server');
diff --git a/packages/angular-cli/tasks/test.ts b/packages/@angular/cli/tasks/test.ts
similarity index 100%
rename from packages/angular-cli/tasks/test.ts
rename to packages/@angular/cli/tasks/test.ts
diff --git a/packages/angular-cli/tsconfig.json b/packages/@angular/cli/tsconfig.json
similarity index 53%
rename from packages/angular-cli/tsconfig.json
rename to packages/@angular/cli/tsconfig.json
index fc88d7050536..b71226c5e9da 100644
--- a/packages/angular-cli/tsconfig.json
+++ b/packages/@angular/cli/tsconfig.json
@@ -8,7 +8,7 @@
"moduleResolution": "node",
"noEmitOnError": true,
"noImplicitAny": true,
- "outDir": "../../dist/angular-cli",
+ "outDir": "../../../dist/@angular/cli",
"rootDir": ".",
"sourceMap": true,
"sourceRoot": "/",
@@ -16,15 +16,15 @@
"lib": ["es6"],
"skipLibCheck": true,
"typeRoots": [
- "../../node_modules/@types"
+ "../../../node_modules/@types"
],
"baseUrl": "",
"paths": {
- "@angular-cli/ast-tools": [ "../../dist/@angular-cli/ast-tools/src" ],
- "@angular-cli/base-href-webpack": [ "../../dist/@angular-cli/base-href-webpack/src" ],
- "@angular-cli/version": [ "../../dist/@angular-cli/version/src" ],
- "@ngtools/json-schema": [ "../../dist/@ngtools/json-schema/src" ],
- "@ngtools/webpack": [ "../../dist/@ngtools/webpack/src" ]
+ "@angular-cli/ast-tools": [ "../../../dist/@angular-cli/ast-tools/src" ],
+ "@angular-cli/base-href-webpack": [ "../../../dist/@angular-cli/base-href-webpack/src" ],
+ "@angular-cli/version": [ "../../../dist/@angular-cli/version/src" ],
+ "@ngtools/json-schema": [ "../../../dist/@ngtools/json-schema/src" ],
+ "@ngtools/webpack": [ "../../../dist/@ngtools/webpack/src" ]
}
},
"include": [
diff --git a/packages/angular-cli/upgrade/version.ts b/packages/@angular/cli/upgrade/version.ts
similarity index 98%
rename from packages/angular-cli/upgrade/version.ts
rename to packages/@angular/cli/upgrade/version.ts
index 506993d9ee45..1b363ab5e1a7 100644
--- a/packages/angular-cli/upgrade/version.ts
+++ b/packages/@angular/cli/upgrade/version.ts
@@ -62,7 +62,7 @@ export class Version {
let packageJson: any = null;
try {
- const angularCliPath = resolve.sync('angular-cli', {
+ const angularCliPath = resolve.sync('@angular/cli', {
basedir: process.cwd(),
packageFilter: (pkg: any, pkgFile: string) => {
packageJson = pkg;
diff --git a/packages/angular-cli/utilities/INITIAL_COMMIT_MESSAGE.txt b/packages/@angular/cli/utilities/INITIAL_COMMIT_MESSAGE.txt
similarity index 89%
rename from packages/angular-cli/utilities/INITIAL_COMMIT_MESSAGE.txt
rename to packages/@angular/cli/utilities/INITIAL_COMMIT_MESSAGE.txt
index 0c4e93225506..2857944ad89c 100644
--- a/packages/angular-cli/utilities/INITIAL_COMMIT_MESSAGE.txt
+++ b/packages/@angular/cli/utilities/INITIAL_COMMIT_MESSAGE.txt
@@ -1,4 +1,4 @@
-chore: initial commit from angular-cli
+chore: initial commit from @angular/cli
_ _ _
__ _ _ __ __ _ _ _| | __ _ _ __ ___| (_)
/ _ | _ \ / _ | | | | |/ _ | __|____ / __| | |
diff --git a/packages/angular-cli/utilities/ast-utils.ts b/packages/@angular/cli/utilities/ast-utils.ts
similarity index 100%
rename from packages/angular-cli/utilities/ast-utils.ts
rename to packages/@angular/cli/utilities/ast-utils.ts
diff --git a/packages/angular-cli/utilities/change.ts b/packages/@angular/cli/utilities/change.ts
similarity index 100%
rename from packages/angular-cli/utilities/change.ts
rename to packages/@angular/cli/utilities/change.ts
diff --git a/packages/angular-cli/utilities/completion.sh b/packages/@angular/cli/utilities/completion.sh
similarity index 100%
rename from packages/angular-cli/utilities/completion.sh
rename to packages/@angular/cli/utilities/completion.sh
diff --git a/packages/angular-cli/utilities/dynamic-path-parser.js b/packages/@angular/cli/utilities/dynamic-path-parser.js
similarity index 100%
rename from packages/angular-cli/utilities/dynamic-path-parser.js
rename to packages/@angular/cli/utilities/dynamic-path-parser.js
diff --git a/packages/angular-cli/utilities/find-parent-module.ts b/packages/@angular/cli/utilities/find-parent-module.ts
similarity index 100%
rename from packages/angular-cli/utilities/find-parent-module.ts
rename to packages/@angular/cli/utilities/find-parent-module.ts
diff --git a/packages/angular-cli/utilities/get-dependent-files.ts b/packages/@angular/cli/utilities/get-dependent-files.ts
similarity index 100%
rename from packages/angular-cli/utilities/get-dependent-files.ts
rename to packages/@angular/cli/utilities/get-dependent-files.ts
diff --git a/packages/angular-cli/utilities/module-resolver.ts b/packages/@angular/cli/utilities/module-resolver.ts
similarity index 100%
rename from packages/angular-cli/utilities/module-resolver.ts
rename to packages/@angular/cli/utilities/module-resolver.ts
diff --git a/packages/angular-cli/utilities/package-chunk-sort.ts b/packages/@angular/cli/utilities/package-chunk-sort.ts
similarity index 100%
rename from packages/angular-cli/utilities/package-chunk-sort.ts
rename to packages/@angular/cli/utilities/package-chunk-sort.ts
diff --git a/packages/angular-cli/utilities/prerender-webpack-plugin.ts b/packages/@angular/cli/utilities/prerender-webpack-plugin.ts
similarity index 100%
rename from packages/angular-cli/utilities/prerender-webpack-plugin.ts
rename to packages/@angular/cli/utilities/prerender-webpack-plugin.ts
diff --git a/packages/angular-cli/utilities/require-project-module.ts b/packages/@angular/cli/utilities/require-project-module.ts
similarity index 100%
rename from packages/angular-cli/utilities/require-project-module.ts
rename to packages/@angular/cli/utilities/require-project-module.ts
diff --git a/packages/angular-cli/utilities/route-utils.ts b/packages/@angular/cli/utilities/route-utils.ts
similarity index 100%
rename from packages/angular-cli/utilities/route-utils.ts
rename to packages/@angular/cli/utilities/route-utils.ts
diff --git a/plugins/karma.js b/plugins/karma.js
index af2a8200130c..7fc58fb37d4c 100644
--- a/plugins/karma.js
+++ b/plugins/karma.js
@@ -1,4 +1,4 @@
// This file is necessary when using a linked angular-cli to this repo, meaning that
// require('angular-cli/plugins/karma') will load this file, and we just forward to
// the actual published file.
-module.exports = require('../packages/angular-cli/plugins/karma');
+module.exports = require('../packages/@angular/cli/plugins/karma');
diff --git a/scripts/publish/build.js b/scripts/publish/build.js
index 3453edb2dcbe..12fb7ec6856b 100755
--- a/scripts/publish/build.js
+++ b/scripts/publish/build.js
@@ -59,27 +59,37 @@ Promise.resolve()
.then(() => console.log('Creating schema.d.ts...'))
.then(() => {
const script = path.join(root, 'scripts/build-schema-dts.js');
- const input = path.join(root, 'packages/angular-cli/lib/config/schema.json');
- const output = path.join(root, 'packages/angular-cli/lib/config/schema.d.ts');
+ const input = path.join(root, 'packages/@angular/cli/lib/config/schema.json');
+ const output = path.join(root, 'packages/@angular/cli/lib/config/schema.d.ts');
return npmRun.execSync(`node "${script}" "${input}" "${output}"`);
})
.then(() => console.log('Compiling packages...'))
.then(() => {
const packages = require('../../lib/packages');
- return Object.keys(packages)
- // Order packages in order of dependency.
- .sort((a, b) => {
- const aDependsOnB = Object.keys(getDeps(packages[a])).indexOf(b) != -1;
- const bDependsOnA = Object.keys(getDeps(packages[b])).indexOf(a) != -1;
-
- if (!aDependsOnB && !bDependsOnA) {
- return 0;
- } else if (aDependsOnB) {
- return 1;
- } else {
- return -1;
+
+ // Order packages in order of dependency.
+ // We use bubble sort because we need a full topological sort but adding another dependency
+ // or implementing a full topo sort would be too much work and I'm lazy. We don't anticipate
+ // any large number of
+ const sortedPackages = Object.keys(packages);
+ let swapped = false;
+ do {
+ swapped = false;
+ for (let i = 0; i < sortedPackages.length - 1; i++) {
+ for (let j = i + 1; j < sortedPackages.length; j++) {
+ const a = sortedPackages[i];
+ const b = sortedPackages[j];
+
+ if (Object.keys(getDeps(packages[a])).indexOf(b) != -1) {
+ // Swap them.
+ [sortedPackages[i], sortedPackages[i + 1]] = [sortedPackages[i + 1], sortedPackages[i]];
+ swapped = true;
+ }
}
- })
+ }
+ } while(swapped);
+
+ return sortedPackages
.reduce((promise, packageName) => {
const pkg = packages[packageName];
const name = path.relative(packagesRoot, pkg.root);
@@ -101,7 +111,7 @@ Promise.resolve()
return files
.map((fileName) => path.relative(packagesRoot, fileName))
.filter((fileName) => {
- if (/^angular-cli[\\\/]blueprints/.test(fileName)) {
+ if (/^@angular[\\\/]cli[\\\/]blueprints/.test(fileName)) {
return true;
}
if (/\.d\.ts$/.test(fileName)) {
@@ -153,7 +163,7 @@ Promise.resolve()
})
.then(() => glob(path.join(dist, '**/*.spec.*')))
.then(specFiles => specFiles.filter(fileName => {
- return !/[\\\/]angular-cli[\\\/]blueprints/.test(fileName);
+ return !/[\\\/]@angular[\\\/]cli[\\\/]blueprints/.test(fileName);
}))
.then(specFiles => {
console.log(`Found ${specFiles.length} spec files...`);
@@ -164,7 +174,7 @@ Promise.resolve()
const extraFiles = ['CHANGELOG.md', 'CONTRIBUTING.md', 'README.md'];
return Promise.all(extraFiles.map(fileName => {
console.log(`Copying ${fileName}...`);
- return copy(fileName, path.join('dist/angular-cli', fileName));
+ return copy(fileName, path.join('dist/@angular/cli', fileName));
}));
})
.then(() => {
diff --git a/tests/acceptance/dynamic-path-parser.spec.js b/tests/acceptance/dynamic-path-parser.spec.js
index 5124976ad26b..90058810d971 100644
--- a/tests/acceptance/dynamic-path-parser.spec.js
+++ b/tests/acceptance/dynamic-path-parser.spec.js
@@ -2,7 +2,7 @@
var expect = require('chai').expect;
var path = require('path');
-var dynamicPathParser = require('../../packages/angular-cli/utilities/dynamic-path-parser');
+var dynamicPathParser = require('../../packages/@angular/cli/utilities/dynamic-path-parser');
var mockFs = require('mock-fs');
var appDir = `src${path.sep}app`;
diff --git a/tests/acceptance/generate-component.spec.js b/tests/acceptance/generate-component.spec.js
index 3a87108c4a55..5f2b6f541798 100644
--- a/tests/acceptance/generate-component.spec.js
+++ b/tests/acceptance/generate-component.spec.js
@@ -7,7 +7,7 @@ var expect = require('chai').expect;
var path = require('path');
var tmp = require('../helpers/tmp');
var root = process.cwd();
-var Promise = require('angular-cli/ember-cli/lib/ext/promise');
+var Promise = require('@angular/cli/ember-cli/lib/ext/promise');
var SilentError = require('silent-error');
const denodeify = require('denodeify');
diff --git a/tests/acceptance/generate-directive.spec.js b/tests/acceptance/generate-directive.spec.js
index 4a4ef87570bd..089fda0c640e 100644
--- a/tests/acceptance/generate-directive.spec.js
+++ b/tests/acceptance/generate-directive.spec.js
@@ -7,7 +7,7 @@ var expect = require('chai').expect;
var path = require('path');
var tmp = require('../helpers/tmp');
var root = process.cwd();
-var Promise = require('angular-cli/ember-cli/lib/ext/promise');
+var Promise = require('@angular/cli/ember-cli/lib/ext/promise');
var SilentError = require('silent-error');
const denodeify = require('denodeify');
diff --git a/tests/acceptance/generate-module.spec.js b/tests/acceptance/generate-module.spec.js
index 29a64a7eb973..7ba774885ba7 100644
--- a/tests/acceptance/generate-module.spec.js
+++ b/tests/acceptance/generate-module.spec.js
@@ -5,7 +5,7 @@ const tmp = require('../helpers/tmp');
const fs = require('fs-extra');
const existsSync = require('exists-sync');
const expect = require('chai').expect;
-const Promise = require('angular-cli/ember-cli/lib/ext/promise');
+const Promise = require('@angular/cli/ember-cli/lib/ext/promise');
const path = require('path');
const root = process.cwd();
diff --git a/tests/acceptance/generate-pipe.spec.js b/tests/acceptance/generate-pipe.spec.js
index ae8c578afce5..d930f9927875 100644
--- a/tests/acceptance/generate-pipe.spec.js
+++ b/tests/acceptance/generate-pipe.spec.js
@@ -8,7 +8,7 @@ var expect = require('chai').expect;
var path = require('path');
var tmp = require('../helpers/tmp');
var root = process.cwd();
-var Promise = require('angular-cli/ember-cli/lib/ext/promise');
+var Promise = require('@angular/cli/ember-cli/lib/ext/promise');
var SilentError = require('silent-error');
const denodeify = require('denodeify');
diff --git a/tests/acceptance/generate-service.spec.js b/tests/acceptance/generate-service.spec.js
index 8a011bfc28f9..1aa55f8210a2 100644
--- a/tests/acceptance/generate-service.spec.js
+++ b/tests/acceptance/generate-service.spec.js
@@ -7,7 +7,7 @@ var expect = require('chai').expect;
var path = require('path');
var tmp = require('../helpers/tmp');
var root = process.cwd();
-var Promise = require('angular-cli/ember-cli/lib/ext/promise');
+var Promise = require('@angular/cli/ember-cli/lib/ext/promise');
var SilentError = require('silent-error');
const denodeify = require('denodeify');
diff --git a/tests/acceptance/get-dependent-files.spec.ts b/tests/acceptance/get-dependent-files.spec.ts
index a74c1ab363b6..b37a345e7688 100644
--- a/tests/acceptance/get-dependent-files.spec.ts
+++ b/tests/acceptance/get-dependent-files.spec.ts
@@ -5,7 +5,7 @@ let mockFs = require('mock-fs');
import { expect, assert } from 'chai';
import * as path from 'path';
import * as ts from 'typescript';
-import * as dependentFilesUtils from 'angular-cli/utilities/get-dependent-files';
+import * as dependentFilesUtils from '@angular/cli/utilities/get-dependent-files';
describe('Get Dependent Files: ', () => {
let rootPath = 'src/app';
diff --git a/tests/acceptance/github-pages-deploy.spec.js b/tests/acceptance/github-pages-deploy.spec.js
index fec9d3e8c8c7..032ad3e9eaeb 100644
--- a/tests/acceptance/github-pages-deploy.spec.js
+++ b/tests/acceptance/github-pages-deploy.spec.js
@@ -3,7 +3,7 @@
var ng = require('../helpers/ng');
var tmp = require('../helpers/tmp');
-var Promise = require('angular-cli/ember-cli/lib/ext/promise');
+var Promise = require('@angular/cli/ember-cli/lib/ext/promise');
var fs = require('fs');
var path = require('path');
var chai = require('chai');
diff --git a/tests/acceptance/init.spec.js b/tests/acceptance/init.spec.js
index adb73e65953a..ca8a81c7e823 100644
--- a/tests/acceptance/init.spec.js
+++ b/tests/acceptance/init.spec.js
@@ -4,10 +4,10 @@ var ng = require('../helpers/ng');
var expect = require('chai').expect;
var walkSync = require('walk-sync');
var glob = require('glob');
-var Blueprint = require('angular-cli/ember-cli/lib/models/blueprint');
+var Blueprint = require('@angular/cli/ember-cli/lib/models/blueprint');
var path = require('path');
var tmp = require('../helpers/tmp');
-var root = path.join(__dirname, '../../packages/angular-cli');
+var root = path.join(__dirname, '../../packages/@angular/cli');
var util = require('util');
var minimatch = require('minimatch');
var intersect = require('lodash/intersection');
diff --git a/tests/acceptance/module-resolver.spec.ts b/tests/acceptance/module-resolver.spec.ts
index 4db9a7767d81..d4a5fd074a5f 100644
--- a/tests/acceptance/module-resolver.spec.ts
+++ b/tests/acceptance/module-resolver.spec.ts
@@ -4,10 +4,10 @@ const mockFs = require('mock-fs');
import * as ts from 'typescript';
import * as path from 'path';
-import * as dependentFilesUtils from 'angular-cli/utilities/get-dependent-files';
+import * as dependentFilesUtils from '@angular/cli/utilities/get-dependent-files';
import { expect } from 'chai';
-import { ModuleResolver } from 'angular-cli/utilities/module-resolver';
+import { ModuleResolver } from '@angular/cli/utilities/module-resolver';
describe('ModuleResolver', () => {
let rootPath = 'src/app';
diff --git a/tests/acceptance/new.spec.ts b/tests/acceptance/new.spec.ts
index 89e6a2cbc582..93c56532b7d7 100644
--- a/tests/acceptance/new.spec.ts
+++ b/tests/acceptance/new.spec.ts
@@ -4,7 +4,7 @@ const existsSync = require('exists-sync');
const expect = require('chai').expect;
const forEach = require('lodash/forEach');
const walkSync = require('walk-sync');
-const Blueprint = require('angular-cli/ember-cli/lib/models/blueprint');
+const Blueprint = require('@angular/cli/ember-cli/lib/models/blueprint');
const path = require('path');
const tmp = require('../helpers/tmp');
const root = process.cwd();
@@ -37,7 +37,7 @@ describe('Acceptance: ng new', function () {
});
expected.forEach(function (file, index) {
- expected[index] = file.replace(/__name__/g, 'angular-cli');
+ expected[index] = file.replace(/__name__/g, '@angular/cli');
});
expected.sort();
@@ -111,11 +111,11 @@ describe('Acceptance: ng new', function () {
});
});
- it('Cannot run ng new, inside of angular-cli project', function () {
+ it('Cannot run ng new, inside of Angular CLI project', function () {
return ng(['new', 'foo', '--skip-npm', '--skip-git'])
.then(function () {
return ng(['new', 'foo', '--skip-npm', '--skip-git']).then(() => {
- throw new SilentError('Cannot run ng new, inside of angular-cli project should fail.');
+ throw new SilentError('Cannot run ng new, inside of Angular CLI project should fail.');
}, () => {
expect(!existsSync('foo'));
});
diff --git a/tests/e2e/setup/000-pwd.ts b/tests/e2e/setup/000-pwd.ts
index 7b663227f9a7..e36f652698d8 100644
--- a/tests/e2e/setup/000-pwd.ts
+++ b/tests/e2e/setup/000-pwd.ts
@@ -2,6 +2,6 @@ import {join} from 'path';
export default function() {
- // Setup to use the local angular-cli copy.
- process.chdir(join(__dirname, '../..'));
+ // Setup to use the local @angular/cli copy.
+ process.chdir(join(__dirname, '../../..'));
}
diff --git a/tests/e2e/setup/100-npm-link.ts b/tests/e2e/setup/100-npm-link.ts
index a04a6980dfbd..f296b43a7687 100644
--- a/tests/e2e/setup/100-npm-link.ts
+++ b/tests/e2e/setup/100-npm-link.ts
@@ -14,7 +14,7 @@ export default function () {
return;
}
- const distAngularCli = join(__dirname, '../../../dist/angular-cli');
+ const distAngularCli = packages['@angular/cli'].dist;
const oldCwd = process.cwd();
process.chdir(distAngularCli);
diff --git a/tests/e2e/tests/build/prod-build.ts b/tests/e2e/tests/build/prod-build.ts
index 8866b220edb1..7a8d5010306f 100644
--- a/tests/e2e/tests/build/prod-build.ts
+++ b/tests/e2e/tests/build/prod-build.ts
@@ -16,7 +16,7 @@ export default function() {
// Defaults to AoT
.then(() => {
const main = readdirSync('./dist').find(name => !!name.match(/main.[a-z0-9]+\.bundle\.js/));
- expectFileToMatch(`dist/${main}`, /bootstrapModuleFactory.*\/\* AppModuleNgFactory \*\//);
+ expectFileToMatch(`dist/${main}`, /bootstrapModuleFactory\(/);
})
// Check that the process didn't change local files.
.then(() => expectGitToBeClean());
diff --git a/tests/e2e/tests/build/rebuild-deps-type-check.ts b/tests/e2e/tests/build/rebuild-deps-type-check.ts
index 95884090295b..24d8efba84fb 100644
--- a/tests/e2e/tests/build/rebuild-deps-type-check.ts
+++ b/tests/e2e/tests/build/rebuild-deps-type-check.ts
@@ -7,12 +7,17 @@ import {writeFile, prependToFile, appendToFile} from '../../utils/fs';
import {wait} from '../../utils/utils';
+const doneRe =
+ /webpack: bundle is now VALID|webpack: Compiled successfully.|webpack: Failed to compile./;
+
+
+
export default function() {
if (process.platform.startsWith('win')) {
return Promise.resolve();
}
- return silentExecAndWaitForOutputToMatch('ng', ['serve'], /webpack: bundle is now VALID/)
+ return silentExecAndWaitForOutputToMatch('ng', ['serve'], doneRe)
// Create and import files.
.then(() => writeFile('src/funky2.ts', `
export function funky2(value: string): string {
@@ -29,7 +34,7 @@ export default function() {
console.log(funky('town'));
`))
// Should trigger a rebuild, no error expected.
- .then(() => waitForAnyProcessOutputToMatch(/webpack: bundle is now VALID/, 5000))
+ .then(() => waitForAnyProcessOutputToMatch(doneRe, 5000))
// Create and import files.
.then(() => wait(2000))
.then(() => writeFile('src/funky2.ts', `
@@ -38,7 +43,7 @@ export default function() {
}
`))
// Should trigger a rebuild, this time an error is expected.
- .then(() => waitForAnyProcessOutputToMatch(/webpack: bundle is now VALID/, 5000))
+ .then(() => waitForAnyProcessOutputToMatch(doneRe, 5000))
.then(({ stdout }) => {
if (!/ERROR in .*\/src\/main\.ts \(/.test(stdout)) {
throw new Error('Expected an error but none happened.');
@@ -50,7 +55,7 @@ export default function() {
return value + 'hello';
}
`))
- .then(() => waitForAnyProcessOutputToMatch(/webpack: bundle is now VALID/, 5000))
+ .then(() => waitForAnyProcessOutputToMatch(doneRe, 5000))
.then(({ stdout }) => {
if (/ERROR in .*\/src\/main\.ts \(/.test(stdout)) {
throw new Error('Expected no error but an error was shown.');
diff --git a/tests/e2e/tests/build/rebuild.ts b/tests/e2e/tests/build/rebuild.ts
index 8806534f1706..c2cee3f0b572 100644
--- a/tests/e2e/tests/build/rebuild.ts
+++ b/tests/e2e/tests/build/rebuild.ts
@@ -17,11 +17,14 @@ export default function() {
let oldNumberOfChunks = 0;
const chunkRegExp = /chunk\s+\{/g;
- return silentExecAndWaitForOutputToMatch('ng', ['serve'], /webpack: bundle is now VALID/)
+ return silentExecAndWaitForOutputToMatch('ng', ['serve'],
+ /webpack: bundle is now VALID|webpack: Compiled successfully./)
// Should trigger a rebuild.
.then(() => exec('touch', 'src/main.ts'))
- .then(() => waitForAnyProcessOutputToMatch(/webpack: bundle is now INVALID/, 1000))
- .then(() => waitForAnyProcessOutputToMatch(/webpack: bundle is now VALID/, 5000))
+ .then(() => waitForAnyProcessOutputToMatch(
+ /webpack: bundle is now INVALID|webpack: Compiling.../, 1000))
+ .then(() => waitForAnyProcessOutputToMatch(
+ /webpack: bundle is now VALID|webpack: Compiled successfully./, 5000))
// Count the bundles.
.then(({ stdout }) => {
oldNumberOfChunks = stdout.split(chunkRegExp).length;
@@ -57,8 +60,10 @@ export default function() {
export class AppModule { }
`))
// Should trigger a rebuild with a new bundle.
- .then(() => waitForAnyProcessOutputToMatch(/webpack: bundle is now INVALID/, 1000))
- .then(() => waitForAnyProcessOutputToMatch(/webpack: bundle is now VALID/, 5000))
+ .then(() => waitForAnyProcessOutputToMatch(
+ /webpack: bundle is now INVALID|webpack: Compiling.../, 1000))
+ .then(() => waitForAnyProcessOutputToMatch(
+ /webpack: bundle is now VALID|webpack: Compiled successfully./, 5000))
// Count the bundles.
.then(({ stdout }) => {
let newNumberOfChunks = stdout.split(chunkRegExp).length;
diff --git a/tests/e2e/tests/generate/module/module-routing-child-folder.ts b/tests/e2e/tests/generate/module/module-routing-child-folder.ts
index 0a4a48a35504..2c934df51031 100644
--- a/tests/e2e/tests/generate/module/module-routing-child-folder.ts
+++ b/tests/e2e/tests/generate/module/module-routing-child-folder.ts
@@ -5,7 +5,7 @@ import { expectFileToExist } from '../../../utils/fs';
import { expectToFail } from '../../../utils/utils';
-const Promise = require('angular-cli/ember-cli/lib/ext/promise');
+const Promise = require('@angular/cli/ember-cli/lib/ext/promise');
export default function () {
const root = process.cwd();
diff --git a/tests/e2e/tests/test/test-assets.ts b/tests/e2e/tests/test/test-assets.ts
index 195b05e47c35..9394cfe47a8b 100644
--- a/tests/e2e/tests/test/test-assets.ts
+++ b/tests/e2e/tests/test/test-assets.ts
@@ -39,7 +39,7 @@ export default function () {
app['assets'] = [];
}))
.then(() => expectToFail(() => ng('test', '--single-run'),
- 'Should fail because the assets to serve were not in the angular-cli config'))
+ 'Should fail because the assets to serve were not in the Angular CLI config'))
// Test passing condition (assets are included)
.then(() => updateJsonFile('angular-cli.json', configJson => {
const app = configJson['apps'][0];
diff --git a/tests/e2e/utils/project.ts b/tests/e2e/utils/project.ts
index 5adb061ba38c..c5b2f0608150 100644
--- a/tests/e2e/utils/project.ts
+++ b/tests/e2e/utils/project.ts
@@ -26,7 +26,8 @@ export function updateTsConfig(fn: (json: any) => any | void) {
export function ngServe(...args: string[]) {
return silentExecAndWaitForOutputToMatch('ng',
- ['serve', '--no-progress', ...args], /webpack: bundle is now VALID/);
+ ['serve', '--no-progress', ...args],
+ /webpack: bundle is now VALID|webpack: Compiled successfully./);
}
diff --git a/tests/e2e_runner.ts b/tests/e2e_runner.ts
index 6dded9b0cd44..bde7ac6d4a23 100644
--- a/tests/e2e_runner.ts
+++ b/tests/e2e_runner.ts
@@ -25,7 +25,7 @@ Error.stackTraceLimit = Infinity;
* Here's a short description of those flags:
* --debug If a test fails, block the thread so the temporary directory isn't deleted.
* --noproject Skip creating a project or using one.
- * --nolink Skip linking your local angular-cli directory. Can save a few seconds.
+ * --nolink Skip linking your local @angular/cli directory. Can save a few seconds.
* --ng-sha=SHA Use a specific ng-sha. Similar to nightly but point to a master SHA instead
* of using the latest.
* --nightly Install angular nightly builds over the test project.
diff --git a/tests/helpers/mock-ui.js b/tests/helpers/mock-ui.js
index 07f322998037..67dc9eb87a66 100644
--- a/tests/helpers/mock-ui.js
+++ b/tests/helpers/mock-ui.js
@@ -1,8 +1,8 @@
'use strict';
-var UI = require('angular-cli/ember-cli/lib/ui');
+var UI = require('@angular/cli/ember-cli/lib/ui');
var through = require('through');
-var Promise = require('angular-cli/ember-cli/lib/ext/promise');
+var Promise = require('@angular/cli/ember-cli/lib/ext/promise');
module.exports = MockUI;
function MockUI() {
diff --git a/tests/helpers/ng.js b/tests/helpers/ng.js
index a34be6964bcc..fcce2c5e4ee6 100644
--- a/tests/helpers/ng.js
+++ b/tests/helpers/ng.js
@@ -1,7 +1,7 @@
'use strict';
var MockUI = require('./mock-ui');
-var Cli = require('angular-cli/lib/cli');
+var Cli = require('@angular/cli/lib/cli');
module.exports = function ng(args) {
var cli;
diff --git a/tests/helpers/tmp.js b/tests/helpers/tmp.js
index 733e7a3a8ef4..59302a740837 100644
--- a/tests/helpers/tmp.js
+++ b/tests/helpers/tmp.js
@@ -2,7 +2,7 @@
var fs = require('fs-extra');
var existsSync = require('exists-sync');
-var Promise = require('angular-cli/ember-cli/lib/ext/promise');
+var Promise = require('@angular/cli/ember-cli/lib/ext/promise');
var remove = Promise.denodeify(fs.remove);
var root = process.cwd();
diff --git a/tsconfig.json b/tsconfig.json
index 3d6ce46e553c..25c862729ae8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -24,14 +24,14 @@
"node"
],
"paths": {
- "angular-cli/*": [ "./packages/angular-cli/*" ],
+ "@angular/cli/*": [ "./packages/@angular/cli/*" ],
"@angular-cli/ast-tools": [ "./packages/ast-tools/src" ],
"@angular-cli/base-href-webpack": [ "./packages/base-href-webpack/src" ],
"@ngtools/webpack": [ "./packages/webpack/src" ]
}
},
"exclude": [
- "packages/angular-cli/blueprints/*/files/**/*",
+ "packages/@angular/cli/blueprints/*/files/**/*",
"dist/**/*",
"node_modules/**/*",
"tmp/**/*"
diff --git a/yarn.lock b/yarn.lock
index 015999e094dc..bbdb4a6745a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -76,7 +76,7 @@
version "2.5.41"
resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.5.41.tgz#d5e86161a0af80d52062b310a33ed65b051a0713"
-"@types/lodash@^4.14.43":
+"@types/lodash@4.14.50":
version "4.14.50"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.50.tgz#2227da4d65fafe249bccd59c7b9396e27674c8f7"
@@ -134,7 +134,7 @@
dependencies:
"@types/source-map" "*"
-"@types/webpack@^2.2.1":
+"@types/webpack@^2.2.4":
version "2.2.4"
resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-2.2.4.tgz#05afb4af5b7ece8a4d491030e94c769c7a9bc110"
dependencies:
@@ -221,14 +221,10 @@ ansi-regex@^2.0.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-ansi-styles@^2.1.0, ansi-styles@^2.2.1:
+ansi-styles@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-ansicolors@~0.2.1:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
-
any-promise@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -251,7 +247,7 @@ are-we-there-yet@~1.1.2:
delegates "^1.0.0"
readable-stream "^2.0.0 || ^1.1.13"
-argparse@^1.0.7, argparse@~1.0.2:
+argparse@^1.0.7:
version "1.0.9"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
dependencies:
@@ -506,6 +502,10 @@ brorand@^1.0.1:
version "1.0.6"
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.0.6.tgz#4028706b915f91f7b349a2e0bf3c376039d216e5"
+browser-stdout@1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
+
browserify-aes@^1.0.0, browserify-aes@^1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
@@ -646,13 +646,6 @@ capture-stack-trace@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
-cardinal@^0.5.0:
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-0.5.0.tgz#00d5f661dbd4aabfdf7d41ce48a5a59bca35a291"
- dependencies:
- ansicolors "~0.2.1"
- redeyed "~0.5.0"
-
caseless@~0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
@@ -733,12 +726,6 @@ cli-spinners@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
-cli-table@^0.3.1:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
- dependencies:
- colors "1.0.3"
-
cli-width@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
@@ -813,10 +800,6 @@ colormin@^1.0.5:
css-color-names "0.0.4"
has "^1.0.1"
-colors@1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-
colors@1.1.2, colors@^1.1.2, colors@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
@@ -831,15 +814,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
dependencies:
delayed-stream "~1.0.0"
-commander@0.6.1:
- version "0.6.1"
- resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
-
-commander@2.3.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"
-
-commander@2.9.x, commander@^2.9.0:
+commander@2.9.0, commander@2.9.x, commander@^2.9.0:
version "2.9.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
dependencies:
@@ -1193,7 +1168,7 @@ cssesc@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-"cssnano@>=2.6.1 <4":
+"cssnano@>=2.6.1 <4", cssnano@^3.10.0:
version "3.10.0"
resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
dependencies:
@@ -1608,11 +1583,7 @@ escape-html@~1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-escape-string-regexp@1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -1681,10 +1652,6 @@ espree@^3.1.6:
acorn "^4.0.1"
acorn-jsx "^3.0.0"
-esprima-fb@~12001.1.0-dev-harmony-fb:
- version "12001.1.0-dev-harmony-fb"
- resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz#d84400384ba95ce2678c617ad24a7f40808da915"
-
esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
version "2.7.3"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
@@ -1820,12 +1787,12 @@ extglob@^0.3.1:
dependencies:
is-extglob "^1.0.0"
-extract-text-webpack-plugin@^2.0.0-beta.5:
- version "2.0.0-rc.0"
- resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.0.0-rc.0.tgz#502c7a662efb2285cfe0ffaad640e3d5b248a69b"
+extract-text-webpack-plugin@^2.0.0-rc.1:
+ version "2.0.0-rc.2"
+ resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.0.0-rc.2.tgz#a1d6963b5699031349e92a832a983cccd2c29edf"
dependencies:
async "^2.1.2"
- loader-utils "^0.2.3"
+ loader-utils "^0.2.16"
webpack-sources "^0.1.0"
extsprintf@1.0.2:
@@ -2138,13 +2105,6 @@ glob-parent@^2.0.0:
dependencies:
is-glob "^2.0.0"
-glob@3.2.11:
- version "3.2.11"
- resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
- dependencies:
- inherits "2"
- minimatch "0.3"
-
glob@5.x, glob@~5.0.0:
version "5.0.15"
resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
@@ -2155,6 +2115,17 @@ glob@5.x, glob@~5.0.0:
once "^1.3.0"
path-is-absolute "^1.0.0"
+glob@7.0.5:
+ version "7.0.5"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95"
+ dependencies:
+ fs.realpath "^1.0.0"
+ inflight "^1.0.4"
+ inherits "2"
+ minimatch "^3.0.2"
+ once "^1.3.0"
+ path-is-absolute "^1.0.0"
+
glob@7.0.x:
version "7.0.6"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
@@ -2590,10 +2561,6 @@ is-fullwidth-code-point@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-is-git-url@^0.2.0:
- version "0.2.3"
- resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-0.2.3.tgz#445200d6fbd6da028fb5e01440d9afc93f3ccb64"
-
is-glob@^2.0.0, is-glob@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -2756,13 +2723,6 @@ istanbul@0.4.3, istanbul@0.x.x:
which "^1.1.1"
wordwrap "^1.0.0"
-jade@0.26.3:
- version "0.26.3"
- resolved "https://registry.yarnpkg.com/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c"
- dependencies:
- commander "0.6.1"
- mkdirp "0.3.0"
-
jasmine-core@~2.5.2:
version "2.5.2"
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.5.2.tgz#6f61bd79061e27f43e6f9355e44b3c6cab6ff297"
@@ -2835,7 +2795,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-json3@^3.3.2:
+json3@3.3.2, json3@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
@@ -2943,12 +2903,6 @@ levn@^0.3.0, levn@~0.3.0:
prelude-ls "~1.1.2"
type-check "~0.3.2"
-linkify-it@~1.2.0:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a"
- dependencies:
- uc.micro "^1.0.1"
-
load-json-file@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -2963,7 +2917,7 @@ loader-runner@^2.2.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
-loader-utils@0.2.x, loader-utils@0.x.x, loader-utils@^0.2.14, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.5, loader-utils@^0.2.7, loader-utils@^0.2.9, loader-utils@~0.2.2, loader-utils@~0.2.5:
+loader-utils@0.2.x, loader-utils@0.x.x, loader-utils@^0.2.14, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@^0.2.5, loader-utils@^0.2.7, loader-utils@^0.2.9, loader-utils@~0.2.2, loader-utils@~0.2.5:
version "0.2.16"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
dependencies:
@@ -2972,21 +2926,20 @@ loader-utils@0.2.x, loader-utils@0.x.x, loader-utils@^0.2.14, loader-utils@^0.2.
json5 "^0.5.0"
object-assign "^4.0.1"
-lodash._arraycopy@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1"
-
-lodash._arrayeach@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz#bab156b2a90d3f1bbd5c653403349e5e5933ef9e"
+lodash._baseassign@^3.0.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
+ dependencies:
+ lodash._basecopy "^3.0.0"
+ lodash.keys "^3.0.0"
lodash._basecopy@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-lodash._basefor@^3.0.0:
+lodash._basecreate@^3.0.0:
version "3.0.3"
- resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2"
+ resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
lodash._basetostring@^3.0.0:
version "3.0.1"
@@ -2996,18 +2949,6 @@ lodash._basevalues@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-lodash._bindcallback@^3.0.0:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-
-lodash._createassigner@^3.0.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
- dependencies:
- lodash._bindcallback "^3.0.0"
- lodash._isiterateecall "^3.0.0"
- lodash.restparam "^3.0.0"
-
lodash._getnative@^3.0.0:
version "3.9.1"
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
@@ -3044,6 +2985,14 @@ lodash.clonedeep@^4.3.2:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+lodash.create@3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
+ dependencies:
+ lodash._baseassign "^3.0.0"
+ lodash._basecreate "^3.0.0"
+ lodash._isiterateecall "^3.0.0"
+
lodash.escape@^3.0.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
@@ -3062,18 +3011,6 @@ lodash.isarray@^3.0.0:
version "3.0.4"
resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-lodash.isplainobject@^3.0.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz#9a8238ae16b200432960cd7346512d0123fbf4c5"
- dependencies:
- lodash._basefor "^3.0.0"
- lodash.isarguments "^3.0.0"
- lodash.keysin "^3.0.0"
-
-lodash.istypedarray@^3.0.0:
- version "3.0.6"
- resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62"
-
lodash.keys@^3.0.0:
version "3.1.2"
resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
@@ -3082,33 +3019,10 @@ lodash.keys@^3.0.0:
lodash.isarguments "^3.0.0"
lodash.isarray "^3.0.0"
-lodash.keysin@^3.0.0:
- version "3.0.8"
- resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-3.0.8.tgz#22c4493ebbedb1427962a54b445b2c8a767fb47f"
- dependencies:
- lodash.isarguments "^3.0.0"
- lodash.isarray "^3.0.0"
-
lodash.memoize@^4.1.0:
version "4.1.2"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-lodash.merge@^3.3.2:
- version "3.3.2"
- resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-3.3.2.tgz#0d90d93ed637b1878437bb3e21601260d7afe994"
- dependencies:
- lodash._arraycopy "^3.0.0"
- lodash._arrayeach "^3.0.0"
- lodash._createassigner "^3.0.0"
- lodash._getnative "^3.0.0"
- lodash.isarguments "^3.0.0"
- lodash.isarray "^3.0.0"
- lodash.isplainobject "^3.0.0"
- lodash.istypedarray "^3.0.0"
- lodash.keys "^3.0.0"
- lodash.keysin "^3.0.0"
- lodash.toplainobject "^3.0.0"
-
lodash.mergewith@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
@@ -3151,13 +3065,6 @@ lodash.templatesettings@^4.0.0:
dependencies:
lodash._reinterpolate "~3.0.0"
-lodash.toplainobject@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz#28790ad942d293d78aa663a07ecf7f52ca04198d"
- dependencies:
- lodash._basecopy "^3.0.0"
- lodash.keysin "^3.0.0"
-
lodash.uniq@^4.3.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -3197,10 +3104,6 @@ lowercase-keys@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
-lru-cache@2:
- version "2.7.3"
- resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-
lru-cache@^4.0.1:
version "4.0.2"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
@@ -3230,36 +3133,6 @@ map-stream@~0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
-markdown-it-terminal@0.0.3:
- version "0.0.3"
- resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.0.3.tgz#c77a8533c2170b46d2a907a3c3452d4d7f4aa5db"
- dependencies:
- ansi-styles "^2.1.0"
- cardinal "^0.5.0"
- cli-table "^0.3.1"
- lodash.merge "^3.3.2"
- markdown-it "^4.4.0"
-
-markdown-it@4.3.0:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-4.3.0.tgz#0ee2b0724079d186b3f04b7345ce395ae47cc474"
- dependencies:
- argparse "~1.0.2"
- entities "~1.1.1"
- linkify-it "~1.2.0"
- mdurl "~1.0.0"
- uc.micro "^1.0.0"
-
-markdown-it@^4.4.0:
- version "4.4.0"
- resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-4.4.0.tgz#3df373dbea587a9a7fef3e56311b68908f75c414"
- dependencies:
- argparse "~1.0.2"
- entities "~1.1.1"
- linkify-it "~1.2.0"
- mdurl "~1.0.0"
- uc.micro "^1.0.0"
-
matcher-collection@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.0.4.tgz#2f66ae0869996f29e43d0b62c83dd1d43e581755"
@@ -3272,10 +3145,6 @@ math-expression-evaluator@^1.2.14:
dependencies:
lodash.indexof "^4.0.5"
-mdurl@~1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-
media-typer@0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -3364,13 +3233,6 @@ minimalistic-assert@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
-minimatch@0.3:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
- dependencies:
- lru-cache "2"
- sigmund "~1.0.0"
-
"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@~3.0.2:
version "3.0.3"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
@@ -3391,34 +3253,27 @@ minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-mkdirp@0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
-
mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
dependencies:
minimist "0.0.8"
-mktemp@~0.3.4:
- version "0.3.5"
- resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.3.5.tgz#a1504c706d0d2b198c6a0eb645f7fdaf8181f7de"
-
-mocha@^2.4.5:
- version "2.5.3"
- resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
+mocha@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.2.0.tgz#7dc4f45e5088075171a68896814e6ae9eb7a85e3"
dependencies:
- commander "2.3.0"
+ browser-stdout "1.3.0"
+ commander "2.9.0"
debug "2.2.0"
diff "1.4.0"
- escape-string-regexp "1.0.2"
- glob "3.2.11"
+ escape-string-regexp "1.0.5"
+ glob "7.0.5"
growl "1.9.2"
- jade "0.26.3"
+ json3 "3.3.2"
+ lodash.create "3.1.1"
mkdirp "0.5.1"
- supports-color "1.2.0"
- to-iso-string "0.0.2"
+ supports-color "3.1.2"
mock-fs@^3.12.1:
version "3.12.1"
@@ -4256,14 +4111,6 @@ querystringify@0.0.x:
version "0.0.4"
resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
-quick-temp@0.1.5:
- version "0.1.5"
- resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.5.tgz#0d0d67f0fb6a589a0e142f90985f76cdbaf403f7"
- dependencies:
- mktemp "~0.3.4"
- rimraf "~2.2.6"
- underscore.string "~2.3.3"
-
randomatic@^1.1.3:
version "1.1.6"
resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
@@ -4397,12 +4244,6 @@ redent@^1.0.0:
indent-string "^2.1.0"
strip-indent "^1.0.1"
-redeyed@~0.5.0:
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-0.5.0.tgz#7ab000e60ee3875ac115d29edb32c1403c6c25d1"
- dependencies:
- esprima-fb "~12001.1.0-dev-harmony-fb"
-
reduce-css-calc@^1.2.6:
version "1.3.0"
resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
@@ -4587,7 +4428,7 @@ right-align@^0.1.1:
dependencies:
align-text "^0.1.1"
-rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.3, rimraf@~2.5.1, rimraf@~2.5.4:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.3, rimraf@~2.5.1, rimraf@~2.5.4:
version "2.5.4"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
dependencies:
@@ -4775,10 +4616,6 @@ shelljs@^0.7.0:
interpret "^1.0.0"
rechoir "^0.6.2"
-sigmund@~1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-
signal-exit@^3.0.0:
version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -5077,9 +4914,11 @@ stylus@^0.54.5:
sax "0.5.x"
source-map "0.1.x"
-supports-color@1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
+supports-color@3.1.2:
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
+ dependencies:
+ has-flag "^1.0.0"
supports-color@^0.2.0:
version "0.2.0"
@@ -5202,10 +5041,6 @@ to-arraybuffer@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-to-iso-string@0.0.2:
- version "0.0.2"
- resolved "https://registry.yarnpkg.com/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1"
-
toposort@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.0.tgz#b66cf385a1a8a8e68e45b8259e7f55875e8b06ef"
@@ -5267,15 +5102,6 @@ tsickle@^0.2:
source-map "^0.5.6"
source-map-support "^0.4.2"
-tslint-loader@^3.3.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/tslint-loader/-/tslint-loader-3.3.0.tgz#6e6a50fc82e85ff3d1cb53e23dd24ae9e47d91ea"
- dependencies:
- loader-utils "^0.2.7"
- mkdirp "^0.5.1"
- object-assign "^4.0.1"
- rimraf "^2.4.4"
-
tslint@^4.0.2:
version "4.4.2"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-4.4.2.tgz#b14cb79ae039c72471ab4c2627226b940dda19c6"
@@ -5330,10 +5156,6 @@ typescript@~2.0.3:
version "2.0.10"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.0.10.tgz#ccdd4ed86fd5550a407101a0814012e1b3fac3dd"
-uc.micro@^1.0.0, uc.micro@^1.0.1:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
-
uglify-js@2.7.x, uglify-js@^2.6, uglify-js@^2.7.5:
version "2.7.5"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
@@ -5351,10 +5173,6 @@ uid-number@~0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-underscore.string@~2.3.3:
- version "2.3.3"
- resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.3.3.tgz#71c08bf6b428b1133f37e78fa3a21c82f7329b0d"
-
uniq@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"