Skip to content

Commit 5e97cd4

Browse files
hanslhansl
committed
build: move angular package scope to angular_devkit
1 parent 2a05b5e commit 5e97cd4

Some content is hidden

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

84 files changed

+71
-74
lines changed

‎lib/bootstrap-local.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
7070
Module._resolveFilename = function (request, parent) {
7171
if (request in packages) {
7272
return packages[request].main;
73-
} else if (request.startsWith('@angular/cli/')) {
74-
// We allow deep imports (for now).
75-
// TODO: move tests to inside @angular/cli package so they don't have to deep import.
76-
const dir = path.dirname(parent.filename);
77-
return path.relative(dir, path.join(__dirname, '../packages', request));
7873
} else {
7974
let match = Object.keys(packages).find(pkgName => request.startsWith(pkgName + '/'));
8075
if (match) {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@angular/devkit",
2+
"name": "@angular-devkit/devkit",
33
"version": "0.0.0",
44
"description": "Software Development Kit for Angular",
55
"bin": {

‎packages/_schematics_cli/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"homepage": "https://github.com/angular/devkit",
3232
"dependencies": {
33-
"@angular/schematics": "0.0.0",
34-
"@angular/schematics-tools": "0.0.0"
33+
"@angular-devkit/schematics": "0.0.0",
34+
"@angular-devkit/schematics-tools": "0.0.0"
3535
}
3636
}

‎packages/_schematics_cli/src/cli.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import {
1414
FileSystemTree,
1515
SchematicEngine,
1616
Tree,
17-
} from '@angular/schematics';
17+
} from '@angular-devkit/schematics';
1818
import {
1919
FileSystemHost,
2020
FileSystemSchematicDesc,
2121
NodeModulesEngineHost
22-
} from '@angular/schematics-tools';
22+
} from '@angular-devkit/schematics-tools';
2323
import {SchemaClassFactory} from '@ngtools/json-schema';
2424

2525
import 'rxjs/add/operator/ignoreElements';

‎packages/_schematics_cli/tsconfig.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
"rootDir": ".",
77
"baseUrl": "",
88
"paths": {
9-
"@angular/schematics": [ "../../dist/@angular/schematics/src/index" ],
10-
"@angular/schematics-tools": [ "../../dist/@angular/schematics-tools/src/index" ]
9+
"@angular-devkit/schematics": [ "../../dist/@angular-devkit/schematics/src/index" ],
10+
"@angular-devkit/schematics-tools": [
11+
"../../dist/@angular-devkit/schematics-tools/src/index"
12+
]
1113
}
1214
}
1315
}

‎packages/angular/schematics_tools/tsconfig.json‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

packages/angular/schematics/BUILD renamed to packages/angular_devkit/schematics/BUILD

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ ts_library(
1414
"src/index.ts",
1515
],
1616
deps = [
17-
"//packages/angular/schematics/src/engine",
18-
"//packages/angular/schematics/src/exception",
19-
"//packages/angular/schematics/src/rules",
20-
"//packages/angular/schematics/src/sink",
21-
"//packages/angular/schematics/src/tree",
22-
"//packages/angular/schematics/src/utility",
17+
"//packages/angular_devkit/schematics/src/engine",
18+
"//packages/angular_devkit/schematics/src/exception",
19+
"//packages/angular_devkit/schematics/src/rules",
20+
"//packages/angular_devkit/schematics/src/sink",
21+
"//packages/angular_devkit/schematics/src/tree",
22+
"//packages/angular_devkit/schematics/src/utility",
2323
],
2424
tsconfig = "//:tsconfig.json",
25-
module_name = "@angular/schematics",
25+
module_name = "@angular-devkit/schematics",
2626
module_root = "src"
2727
)

packages/angular/schematics/README.md renamed to packages/angular_devkit/schematics/README.md

Lines changed: 1 addition & 1 deletion

packages/angular/schematics/package.json renamed to packages/angular_devkit/schematics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@angular/schematics",
2+
"name": "@angular-devkit/schematics",
33
"version": "0.0.0",
44
"description": "Angular Schematics - Library",
55
"main": "src/index.js",

packages/angular/schematics/src/engine/BUILD renamed to packages/angular_devkit/schematics/src/engine/BUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ ts_library(
1515
exclude = ["*_spec.ts"],
1616
),
1717
deps = [
18-
"//packages/angular/schematics/src/exception",
19-
"//packages/angular/schematics/src/tree",
18+
"//packages/angular_devkit/schematics/src/exception",
19+
"//packages/angular_devkit/schematics/src/tree",
2020
# @deps: rxjs
2121
# @typings: node
2222
],
@@ -28,8 +28,8 @@ ts_library(
2828
srcs = glob(["*_spec.ts"]),
2929
deps = [
3030
":engine",
31-
"//packages/angular/schematics/src/exception",
32-
"//packages/angular/schematics/src/tree",
31+
"//packages/angular_devkit/schematics/src/exception",
32+
"//packages/angular_devkit/schematics/src/tree",
3333
# @deps: rxjs
3434
# @typings: jasmine
3535
],

0 commit comments

Comments
 (0)