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 (#28871)

Browse Source 
PR Close #28871
This commit is contained in:
Greg Magolan
2019-02-20 09:54:42 -08:00
committed by Andrew Kushnir
parent cd83a43462
commit ea09430039
220 changed files with 660 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,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.
@ -19,7 +19,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

@ -38,23 +38,23 @@ const requiredNodeModules = {
'@angular/router': resolveNpmTreeArtifact('angular/packages/router/npm_package'),
// Note, @bazel/typescript does not appear here because it's not listed as a dependency of
// @angular/compiler-cli
'@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. */