Skip to content

Commit 4f0061c

Browse files
committed
feat(@angular/cli): move angular-cli to @angular/cli
This release is otherwise identical to beta.28.
1 parent 9b56edc commit 4f0061c

File tree

201 files changed

+191
-352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+191
-352
lines changed

.eslintignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ tmp/
44
typings/
55

66
# Ignore all blueprint files. We e2e tests those later on.
7-
packages/angular-cli/blueprints/*/files/
7+
packages/@angular/cli/blueprints/*/files/
88

99
# Ignore ember cli.
10-
packages/angular-cli/ember-cli/
10+
packages/@angular/cli/ember-cli/

CHANGELOG.md

Lines changed: 2 additions & 2 deletions

bin/ng

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'use strict';
33

44
// Provide a title to the process in `ps`
5-
process.title = 'angular-cli';
5+
process.title = '@angular/cli';
66

77
require('../lib/bootstrap-local');
8-
require('../packages/angular-cli/bin/ng');
8+
require('../packages/@angular/cli/bin/ng');

lib/bootstrap-local.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ const oldRequireTs = require.extensions['.ts'];
1515
require.extensions['.ts'] = function(m, filename) {
1616
// If we're in node module, either call the old hook or simply compile the
1717
// file without transpilation. We do not touch node_modules/**.
18-
// We do touch `angular-cli` files anywhere though.
19-
if (!filename.match(/angular-cli/) && filename.match(/node_modules/)) {
18+
// We do touch `Angular CLI` files anywhere though.
19+
if (!filename.match(/@angular\/cli/) && filename.match(/node_modules/)) {
2020
if (oldRequireTs) {
2121
return oldRequireTs(m, filename);
2222
}
@@ -54,9 +54,9 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
5454
Module._load = function (request, parent) {
5555
if (request in packages) {
5656
return oldLoad.call(this, packages[request].main, parent);
57-
} else if (request.startsWith('angular-cli/')) {
57+
} else if (request.startsWith('@angular/cli/')) {
5858
// We allow deep imports (for now).
59-
// TODO: move tests to inside angular-cli package so they don't have to deep import.
59+
// TODO: move tests to inside @angular/cli package so they don't have to deep import.
6060
const dir = path.dirname(parent.filename);
6161
const newRequest = path.relative(dir, path.join(__dirname, '../packages', request));
6262
return oldLoad.call(this, newRequest, parent);

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name": "angular-cli",
3-
"version": "1.0.0-beta.28.3",
2+
"name": "@angular/cli",
3+
"version": "1.0.0-beta.29",
44
"description": "CLI tool for Angular",
5-
"main": "packages/angular-cli/lib/cli/index.js",
5+
"main": "packages/@angular/cli/lib/cli/index.js",
66
"trackingCode": "UA-8594346-19",
77
"bin": {
88
"ng": "./bin/ng"
@@ -112,7 +112,7 @@
112112
},
113113
"ember-addon": {
114114
"paths": [
115-
"./packages/angular-cli/lib/addon"
115+
"./packages/@angular/cli/lib/addon"
116116
]
117117
},
118118
"devDependencies": {

packages/@angular-cli/ast-tools/src/change.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {InsertChange, NodeHost, RemoveChange, ReplaceChange} from './change';
88
import fs = require('fs');
99

1010
let path = require('path');
11-
let Promise = require('angular-cli/ember-cli/lib/ext/promise');
11+
let Promise = require('@angular/cli/ember-cli/lib/ext/promise');
1212

1313
const readFile = Promise.denodeify(fs.readFile);
1414

packages/angular-cli/bin/ng renamed to packages/@angular/cli/bin/ng

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'use strict';
33

44
// Provide a title to the process in `ps`
5-
process.title = 'angular-cli';
5+
process.title = '@angular/cli';
66

77
const CliConfig = require('../models/config').CliConfig;
88
const Version = require('../upgrade/version').Version;
@@ -20,7 +20,7 @@ function _fromPackageJson(cwd) {
2020
cwd = cwd || process.cwd();
2121

2222
do {
23-
const packageJsonPath = path.join(cwd, 'node_modules/angular-cli/package.json');
23+
const packageJsonPath = path.join(cwd, 'node_modules/@angular/cli/package.json');
2424
if (fs.existsSync(packageJsonPath)) {
2525
const content = fs.readFileSync(packageJsonPath, 'utf-8');
2626
if (content) {
@@ -87,7 +87,7 @@ if (require('../package.json')['name'] == 'angular-cli'
8787
}
8888

8989

90-
resolve('angular-cli', { basedir: process.cwd() },
90+
resolve('@angular/cli', { basedir: process.cwd() },
9191
function (error, projectLocalCli) {
9292
var cli;
9393
if (error) {

0 commit comments

Comments
 (0)