cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: rules_nodejs 0.26.0 & use @npm instead of @ngdeps now that downstream angular build uses angular bundles (#29063)

Browse Source 
* removed /tools/http_server and uses http_server from rules_nodejs
* updated bazel schematics to use angular bundles

PR Close #29063
This commit is contained in:
Greg Magolan
2019-02-20 09:54:42 -08:00
committed by Kara Erickson
parent 2edb87e7f8
commit ea495d958f
222 changed files with 1238 additions and 1300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/compiler-cli/BUILD.bazel
View File

@ -1,7 +1,7 @@
package(default_visibility = ["//visibility:public"])
load("//tools:defaults.bzl", "npm_package", "ts_library")
load("@npm_bazel_typescript//:defs.bzl", "ts_config")
load("@npm_bazel_typescript//:index.bzl", "ts_config")
ts_config(
name = "tsconfig",
@ -30,10 +30,10 @@ ts_library(
"//packages/compiler-cli/src/ngtsc/switch",
"//packages/compiler-cli/src/ngtsc/transform",
"//packages/compiler-cli/src/ngtsc/typecheck",
"@ngdeps//@bazel/typescript",
"@ngdeps//@types",
"@ngdeps//tsickle",
"@ngdeps//typescript",
"@npm//@bazel/typescript",
"@npm//@types",
"@npm//tsickle",
"@npm//typescript",
],
)

34
packages/compiler-cli/integrationtest/BUILD.bazel
View File

@ -7,8 +7,8 @@ nodejs_binary(
name = "ngc_bin",
data = [
"//packages/compiler-cli",
"@ngdeps//chokidar",
"@ngdeps//reflect-metadata",
"@npm//chokidar",
"@npm//reflect-metadata",
],
entry_point = "angular/packages/compiler-cli/src/main.js",
)
@ -17,8 +17,8 @@ nodejs_binary(
name = "ng_xi18n",
data = [
"//packages/compiler-cli",
"@ngdeps//chokidar",
"@ngdeps//reflect-metadata",
"@npm//chokidar",
"@npm//reflect-metadata",
],
entry_point = "angular/packages/compiler-cli/src/extract_i18n.js",
)
@ -29,19 +29,19 @@ nodejs_test(
":ngc_bin",
":ng_xi18n",
"@nodejs//:node",
"@ngdeps//domino",
"@ngdeps//chokidar",
"@ngdeps//source-map-support",
"@ngdeps//shelljs",
"@ngdeps//typescript",
"@ngdeps//reflect-metadata",
"@ngdeps//rxjs",
"@ngdeps//tslib",
"@ngdeps//jasmine/bin:jasmine",
"@ngdeps//zone.js",
"@ngdeps//xhr2",
"@ngdeps//@types/node",
"@ngdeps//@types/jasmine",
"@npm//domino",
"@npm//chokidar",
"@npm//source-map-support",
"@npm//shelljs",
"@npm//typescript",
"@npm//reflect-metadata",
"@npm//rxjs",
"@npm//tslib",
"@npm//jasmine/bin:jasmine",
"@npm//zone.js",
"@npm//xhr2",
"@npm//@types/node",
"@npm//@types/jasmine",
"//packages/animations:npm_package",
"//packages/common:npm_package",
"//packages/compiler:npm_package",

4
packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel
View File

@ -17,7 +17,7 @@ ng_module(
"//packages/platform-browser",
"//packages/platform-server",
"//packages/router",
"@ngdeps//reflect-metadata",
"@ngdeps//rxjs",
"@npm//reflect-metadata",
"@npm//rxjs",
],
)

2
packages/compiler-cli/integrationtest/bazel/injectable_def/lib1/BUILD.bazel
View File

@ -12,6 +12,6 @@ ng_module(
module_name = "lib1_built",
deps = [
"//packages/core",
"@ngdeps//rxjs",
"@npm//rxjs",
],
)

2
packages/compiler-cli/integrationtest/bazel/injectable_def/lib2/BUILD.bazel
View File

@ -13,6 +13,6 @@ ng_module(
deps = [
"//packages/compiler-cli/integrationtest/bazel/injectable_def/lib1",
"//packages/core",
"@ngdeps//rxjs",
"@npm//rxjs",
],
)

2
packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel
View File

@ -13,6 +13,6 @@ ng_module(
tags = ["ivy-only"],
deps = [
"//packages/core",
"@ngdeps//rxjs",
"@npm//rxjs",
],
)

4
packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel
View File

@ -9,7 +9,7 @@ ng_module(
flat_module_out_file = "flat_module_filename",
module_name = "some_npm_module",
ng_xi18n = "//packages/bazel/src/ngc-wrapped:xi18n",
node_modules = "@ngdeps//typescript:typescript__typings",
node_modules = "@npm//typescript:typescript__typings",
tags = [
# Disabled as this test is specific to the flat module indexing of metadata.json files that
# the old ngc compiler does. Ivy has no metadata.json files so this test does not apply.
@ -17,7 +17,7 @@ ng_module(
],
deps = [
"//packages/core",
"@ngdeps//@types",
"@npm//@types",
],
)

2
packages/compiler-cli/integrationtest/test.js
View File

@ -14,7 +14,7 @@ const {runCommand, setupTestDirectory} = require('./test_helpers');
const ngcBin = require.resolve('./ngc_bin');
const xi18nBin = require.resolve('./ng_xi18n');
const nodeBin = require.resolve(`nodejs/bin/node${(os.platform() === 'win32' ? '.cmd' : '')}`);
const jasmineBin = require.resolve('ngdeps/node_modules/jasmine/bin/jasmine.js');
const jasmineBin = require.resolve('npm/node_modules/jasmine/bin/jasmine.js');
// Prepare the test directory before building the integration test output. This ensures that
// the test runs in an hermetic way and works on Windows.

20
packages/compiler-cli/integrationtest/test_helpers.js
View File

@ -36,23 +36,23 @@ const requiredNodeModules = {
'@angular/platform-server':
resolveNpmTreeArtifact('angular/packages/platform-server/npm_package'),
'@angular/router': resolveNpmTreeArtifact('angular/packages/router/npm_package'),
'@types/jasmine': resolveNpmTreeArtifact('ngdeps/node_modules/@types/jasmine'),
'@types/node': resolveNpmTreeArtifact('ngdeps/node_modules/@types/node'),
'@types/jasmine': resolveNpmTreeArtifact('npm/node_modules/@types/jasmine'),
'@types/node': resolveNpmTreeArtifact('npm/node_modules/@types/node'),
// Transitive dependencies which need to be specified because the Angular NPM packages
// depend on these without the Angular NPM packages being part of the Bazel managed deps.
// This means that transitive dependencies need to be manually declared as required.
'tslib': resolveNpmTreeArtifact('ngdeps/node_modules/tslib'),
'domino': resolveNpmTreeArtifact('ngdeps/node_modules/domino'),
'xhr2': resolveNpmTreeArtifact('ngdeps/node_modules/xhr2'),
'tslib': resolveNpmTreeArtifact('npm/node_modules/tslib'),
'domino': resolveNpmTreeArtifact('npm/node_modules/domino'),
'xhr2': resolveNpmTreeArtifact('npm/node_modules/xhr2'),
// Fine grained dependencies which are used by the integration test Angular modules, and
// need to be symlinked so that they can be resolved by NodeJS or NGC.
'reflect-metadata': resolveNpmTreeArtifact('ngdeps/node_modules/reflect-metadata'),
'rxjs': resolveNpmTreeArtifact('ngdeps/node_modules/rxjs'),
'source-map-support': resolveNpmTreeArtifact('ngdeps/node_modules/source-map-support'),
'typescript': resolveNpmTreeArtifact('ngdeps/node_modules/typescript'),
'zone.js': resolveNpmTreeArtifact('ngdeps/node_modules/zone.js'),
'reflect-metadata': resolveNpmTreeArtifact('npm/node_modules/reflect-metadata'),
'rxjs': resolveNpmTreeArtifact('npm/node_modules/rxjs'),
'source-map-support': resolveNpmTreeArtifact('npm/node_modules/source-map-support'),
'typescript': resolveNpmTreeArtifact('npm/node_modules/typescript'),
'zone.js': resolveNpmTreeArtifact('npm/node_modules/zone.js'),
};
/** Sets up the temporary test directory and returns the path to the directory. */

20
packages/compiler-cli/src/ngcc/BUILD.bazel
View File

@ -16,15 +16,15 @@ ts_library(
"//packages/compiler-cli/src/ngtsc/metadata",
"//packages/compiler-cli/src/ngtsc/transform",
"//packages/compiler-cli/src/ngtsc/translator",
"@ngdeps//@types/convert-source-map",
"@ngdeps//@types/node",
"@ngdeps//@types/shelljs",
"@ngdeps//@types/source-map",
"@ngdeps//@types/yargs",
"@ngdeps//canonical-path",
"@ngdeps//dependency-graph",
"@ngdeps//magic-string",
"@ngdeps//source-map",
"@ngdeps//typescript",
"@npm//@types/convert-source-map",
"@npm//@types/node",
"@npm//@types/shelljs",
"@npm//@types/source-map",
"@npm//@types/yargs",
"@npm//canonical-path",
"@npm//dependency-graph",
"@npm//magic-string",
"@npm//source-map",
"@npm//typescript",
],
)

14
packages/compiler-cli/src/ngcc/test/BUILD.bazel
View File

@ -14,11 +14,11 @@ ts_library(
"//packages/compiler-cli/src/ngtsc/metadata",
"//packages/compiler-cli/src/ngtsc/testing",
"//packages/compiler-cli/src/ngtsc/transform",
"@ngdeps//@types/convert-source-map",
"@ngdeps//@types/mock-fs",
"@ngdeps//canonical-path",
"@ngdeps//magic-string",
"@ngdeps//typescript",
"@npm//@types/convert-source-map",
"@npm//@types/mock-fs",
"@npm//canonical-path",
"@npm//magic-string",
"@npm//typescript",
],
)
@ -28,7 +28,7 @@ jasmine_node_test(
deps = [
":test_lib",
"//tools/testing:node_no_angular",
"@ngdeps//canonical-path",
"@ngdeps//convert-source-map",
"@npm//canonical-path",
"@npm//convert-source-map",
],
)

4
packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
View File

@ -14,7 +14,7 @@ ts_library(
"//packages/compiler-cli/src/ngtsc/metadata",
"//packages/compiler-cli/src/ngtsc/transform",
"//packages/compiler-cli/src/ngtsc/typecheck",
"@ngdeps//@types/node",
"@ngdeps//typescript",
"@npm//@types/node",
"@npm//typescript",
],
)

2
packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel
View File

@ -16,7 +16,7 @@ ts_library(
"//packages/compiler-cli/src/ngtsc/metadata",
"//packages/compiler-cli/src/ngtsc/testing",
"//packages/compiler-cli/src/ngtsc/translator",
"@ngdeps//typescript",
"@npm//typescript",
],
)

2
packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel
View File

@ -9,6 +9,6 @@ ts_library(
]),
deps = [
"//packages/compiler",
"@ngdeps//typescript",
"@npm//typescript",
],
)

2
packages/compiler-cli/src/ngtsc/host/BUILD.bazel
View File

@ -7,5 +7,5 @@ ts_library(
srcs = ["index.ts"] + glob([
"src/**/*.ts",
]),
deps = ["@ngdeps//typescript"],
deps = ["@npm//typescript"],
)

4
packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
View File

@ -12,7 +12,7 @@ ts_library(
"//packages/compiler",
"//packages/compiler-cli/src/ngtsc/host",
"//packages/compiler-cli/src/ngtsc/util",
"@ngdeps//@types/node",
"@ngdeps//typescript",
"@npm//@types/node",
"@npm//typescript",
],
)

2
packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel
View File

@ -14,7 +14,7 @@ ts_library(
"//packages/compiler-cli/src/ngtsc/host",
"//packages/compiler-cli/src/ngtsc/metadata",
"//packages/compiler-cli/src/ngtsc/testing",
"@ngdeps//typescript",
"@npm//typescript",
],
)

4
packages/compiler-cli/src/ngtsc/shims/BUILD.bazel
View File

@ -12,7 +12,7 @@ ts_library(
"//packages/compiler-cli/src/ngtsc/host",
"//packages/compiler-cli/src/ngtsc/metadata",
"//packages/compiler-cli/src/ngtsc/util",
"@ngdeps//@types/node",
"@ngdeps//typescript",
"@npm//@types/node",
"@npm//typescript",
],
)

2
packages/compiler-cli/src/ngtsc/switch/BUILD.bazel
View File

@ -12,6 +12,6 @@ ts_library(
"//packages/compiler-cli/src/ngtsc/host",
"//packages/compiler-cli/src/ngtsc/metadata",
"//packages/compiler-cli/src/ngtsc/util",
"@ngdeps//typescript",
"@npm//typescript",
],
)

2
packages/compiler-cli/src/ngtsc/testing/BUILD.bazel
View File

@ -10,6 +10,6 @@ ts_library(
]),
deps = [
"//packages:types",
"@ngdeps//typescript",
"@npm//typescript",
],
)

2
packages/compiler-cli/src/ngtsc/transform/BUILD.bazel
View File

@ -15,6 +15,6 @@ ts_library(
"//packages/compiler-cli/src/ngtsc/translator",
"//packages/compiler-cli/src/ngtsc/typecheck",
"//packages/compiler-cli/src/ngtsc/util",
"@ngdeps//typescript",
"@npm//typescript",
],
)

2
packages/compiler-cli/src/ngtsc/translator/BUILD.bazel
View File

@ -9,6 +9,6 @@ ts_library(
"//packages:types",
"//packages/compiler",
"//packages/compiler-cli/src/ngtsc/util",
"@ngdeps//typescript",
"@npm//typescript",
],
)

2
packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel
View File

@ -11,6 +11,6 @@ ts_library(
"//packages/compiler-cli/src/ngtsc/metadata",
"//packages/compiler-cli/src/ngtsc/translator",
"//packages/compiler-cli/src/ngtsc/util",
"@ngdeps//typescript",
"@npm//typescript",
],
)

2
packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel
View File

@ -14,7 +14,7 @@ ts_library(
"//packages/compiler-cli/src/ngtsc/host",
"//packages/compiler-cli/src/ngtsc/testing",
"//packages/compiler-cli/src/ngtsc/typecheck",
"@ngdeps//typescript",
"@npm//typescript",
],
)

4
packages/compiler-cli/src/ngtsc/util/BUILD.bazel
View File

@ -9,7 +9,7 @@ ts_library(
]),
deps = [
"//packages:types",
"@ngdeps//@types/node",
"@ngdeps//typescript",
"@npm//@types/node",
"@npm//typescript",
],
)

2
packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel
View File

@ -12,7 +12,7 @@ ts_library(
"//packages:types",
"//packages/compiler-cli/src/ngtsc/testing",
"//packages/compiler-cli/src/ngtsc/util",
"@ngdeps//typescript",
"@npm//typescript",
],
)

18
packages/compiler-cli/test/BUILD.bazel
View File

@ -18,7 +18,7 @@ ts_library(
"//packages:types",
"//packages/compiler",
"//packages/compiler-cli",
"@ngdeps//typescript",
"@npm//typescript",
],
)
@ -33,7 +33,7 @@ ts_library(
":test_utils",
"//packages/compiler",
"//packages/compiler-cli",
"@ngdeps//typescript",
"@npm//typescript",
],
)
@ -53,7 +53,7 @@ jasmine_node_test(
"//packages/common:npm_package",
"//packages/core",
"//tools/testing:node",
"@ngdeps//minimist",
"@npm//minimist",
],
)
@ -68,7 +68,7 @@ ts_library(
":test_utils",
"//packages/compiler",
"//packages/compiler-cli",
"@ngdeps//typescript",
"@npm//typescript",
],
)
@ -91,9 +91,9 @@ jasmine_node_test(
":ngc_lib",
"//packages/core",
"//tools/testing:node",
"@ngdeps//minimist",
"@ngdeps//rxjs",
"@ngdeps//tsickle",
"@npm//minimist",
"@npm//rxjs",
"@npm//tsickle",
],
)
@ -109,7 +109,7 @@ ts_library(
"//packages/compiler",
"//packages/compiler-cli",
"//packages/private/testing",
"@ngdeps//typescript",
"@npm//typescript",
],
)
@ -138,7 +138,7 @@ ts_library(
":test_utils",
"//packages/compiler",
"//packages/compiler-cli",
"@ngdeps//typescript",
"@npm//typescript",
],
)

2
packages/compiler-cli/test/compliance/BUILD.bazel
View File

@ -11,7 +11,7 @@ ts_library(
"//packages/compiler",
"//packages/compiler-cli",
"//packages/compiler/test:test_utils",
"@ngdeps//typescript",
"@npm//typescript",
],
)

8
packages/compiler-cli/test/diagnostics/BUILD.bazel
View File

@ -12,7 +12,7 @@ ts_library(
"//packages/compiler-cli",
"//packages/compiler-cli/test:test_utils",
"//packages/core",
"@ngdeps//typescript",
"@npm//typescript",
],
)
@ -25,7 +25,7 @@ ts_library(
":mocks",
"//packages/compiler-cli",
"//packages/compiler-cli/test:test_utils",
"@ngdeps//typescript",
"@npm//typescript",
],
)
@ -60,7 +60,7 @@ ts_library(
"//packages/compiler-cli",
"//packages/compiler-cli/test:test_utils",
"//packages/language-service",
"@ngdeps//typescript",
"@npm//typescript",
],
)
@ -96,7 +96,7 @@ ts_library(
"//packages/compiler-cli/test:test_utils",
"//packages/compiler/test:test_utils",
"//packages/language-service",
"@ngdeps//typescript",
"@npm//typescript",
],
)

2
packages/compiler-cli/test/metadata/BUILD.bazel
View File

@ -10,7 +10,7 @@ ts_library(
"//packages/compiler-cli",
"//packages/compiler-cli/test:test_utils",
"//packages/core",
"@ngdeps//typescript",
"@npm//typescript",
],
)

12
packages/compiler-cli/test/ngcc/BUILD.bazel
View File

@ -10,7 +10,7 @@ ts_library(
deps = [
"//packages/compiler-cli/src/ngcc",
"//packages/compiler-cli/test:test_utils",
"@ngdeps//@types/mock-fs",
"@npm//@types/mock-fs",
],
)
@ -24,10 +24,10 @@ jasmine_node_test(
deps = [
":ngcc_lib",
"//tools/testing:node_no_angular",
"@ngdeps//@types/mock-fs",
"@ngdeps//canonical-path",
"@ngdeps//convert-source-map",
"@ngdeps//shelljs",
"@ngdeps//yargs",
"@npm//@types/mock-fs",
"@npm//canonical-path",
"@npm//convert-source-map",
"@npm//shelljs",
"@npm//yargs",
],
)

4
packages/compiler-cli/test/ngtsc/BUILD.bazel
View File

@ -8,7 +8,7 @@ ts_library(
"//packages/compiler",
"//packages/compiler-cli",
"//packages/compiler-cli/test:test_utils",
"@ngdeps//typescript",
"@npm//typescript",
],
)
@ -21,6 +21,6 @@ jasmine_node_test(
deps = [
":ngtsc_lib",
"//tools/testing:node_no_angular",
"@ngdeps//minimist",
"@npm//minimist",
],
)

2
packages/compiler-cli/test/test_support.ts
View File

@ -117,7 +117,7 @@ export function setupBazelTo(tmpDirPath: string) {
({pkgPath, name}) => { fs.symlinkSync(pkgPath, path.join(angularDirectory, name), 'dir'); });
// Link typescript
const typeScriptSource = resolveNpmTreeArtifact('ngdeps/node_modules/typescript');
const typeScriptSource = resolveNpmTreeArtifact('npm/node_modules/typescript');
const typescriptDest = path.join(nodeModulesPath, 'typescript');
fs.symlinkSync(typeScriptSource, typescriptDest, 'dir');

4
packages/compiler-cli/test/transformers/BUILD.bazel
View File

@ -12,7 +12,7 @@ ts_library(
"//packages/compiler/test:test_utils",
"//packages/core",
"//packages/platform-browser",
"@ngdeps//typescript",
"@npm//typescript",
],
)
@ -34,6 +34,6 @@ jasmine_node_test(
":test_lib",
"//packages/core",
"//tools/testing:node",
"@ngdeps//source-map",
"@npm//source-map",
],
)