Skip to content

Commit 4721b27

Browse files
kormidealan-agius4
kormide
authored and
alan-agius4
committed
build: correctly stamp experimental packages in bazel build
1 parent 4280990 commit 4721b27

9 files changed

Lines changed: 22 additions & 12 deletions

File tree

‎packages/angular/cli/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"homepage": "https://github.com/angular/angular-cli",
2727
"dependencies": {
28-
"@angular-devkit/architect": "0.0.0-PLACEHOLDER",
28+
"@angular-devkit/architect": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
2929
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
3030
"@angular-devkit/schematics": "0.0.0-PLACEHOLDER",
3131
"@schematics/angular": "0.0.0-PLACEHOLDER",
@@ -52,9 +52,9 @@
5252
"migrations": "@schematics/angular/migrations/migration-collection.json",
5353
"packageGroup": {
5454
"@angular/cli": "0.0.0-PLACEHOLDER",
55-
"@angular-devkit/architect": "0.0.0-PLACEHOLDER",
55+
"@angular-devkit/architect": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
5656
"@angular-devkit/build-angular": "0.0.0-PLACEHOLDER",
57-
"@angular-devkit/build-webpack": "0.0.0-PLACEHOLDER",
57+
"@angular-devkit/build-webpack": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
5858
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
5959
"@angular-devkit/schematics": "0.0.0-PLACEHOLDER"
6060
}

‎packages/angular_devkit/architect/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular-devkit/architect",
3-
"version": "0.0.0-PLACEHOLDER",
3+
"version": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
44
"description": "Angular Build Facade",
55
"experimental": true,
66
"main": "src/index.js",

‎packages/angular_devkit/architect_cli/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular-devkit/architect-cli",
3-
"version": "0.0.0-PLACEHOLDER",
3+
"version": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
44
"description": "Angular Architect CLI",
55
"homepage": "https://github.com/angular/angular-cli",
66
"experimental": true,
@@ -14,7 +14,7 @@
1414
"tooling"
1515
],
1616
"dependencies": {
17-
"@angular-devkit/architect": "0.0.0-PLACEHOLDER",
17+
"@angular-devkit/architect": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
1818
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
1919
"ansi-colors": "4.1.1",
2020
"minimist": "1.2.5",

‎packages/angular_devkit/build_angular/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"builders": "builders.json",
88
"dependencies": {
99
"@ampproject/remapping": "1.0.2",
10-
"@angular-devkit/architect": "0.0.0-PLACEHOLDER",
11-
"@angular-devkit/build-webpack": "0.0.0-PLACEHOLDER",
10+
"@angular-devkit/architect": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
11+
"@angular-devkit/build-webpack": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
1212
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
1313
"@babel/core": "7.16.10",
1414
"@babel/generator": "7.16.8",

‎packages/angular_devkit/build_optimizer/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular-devkit/build-optimizer",
3-
"version": "0.0.0-PLACEHOLDER",
3+
"version": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
44
"description": "Angular Build Optimizer",
55
"experimental": true,
66
"main": "src/index.js",

‎packages/angular_devkit/build_webpack/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@angular-devkit/build-webpack",
3-
"version": "0.0.0-PLACEHOLDER",
3+
"version": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
44
"description": "Webpack Builder for Architect",
55
"experimental": true,
66
"main": "src/index.js",
77
"typings": "src/index.d.ts",
88
"builders": "builders.json",
99
"dependencies": {
10-
"@angular-devkit/architect": "0.0.0-PLACEHOLDER",
10+
"@angular-devkit/architect": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
1111
"rxjs": "6.6.7"
1212
},
1313
"devDependencies": {

‎scripts/build.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,11 @@ export default async function (
413413
}
414414
} else if ((obj[depName] as string).match(/\b0\.0\.0-PLACEHOLDER\b/)) {
415415
obj[depName] = (obj[depName] as string).replace(/\b0\.0\.0-PLACEHOLDER\b/, v);
416+
} else if ((obj[depName] as string).match(/\b0\.0\.0-EXPERIMENTAL-PLACEHOLDER\b/)) {
417+
obj[depName] = (obj[depName] as string).replace(
418+
/\b0\.0\.0-EXPERIMENTAL-PLACEHOLDER\b/,
419+
v,
420+
);
416421
}
417422
}
418423
}

‎scripts/validate-licenses.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@ const ignoredPackages = [
8181

8282
// Ignore own packages (all MIT)
8383
for (const packageName of Object.keys(packages)) {
84-
ignoredPackages.push(`${packageName}@0.0.0-PLACEHOLDER`);
84+
const version = packages[packageName].experimental
85+
? '0.0.0-EXPERIMENTAL-PLACEHOLDER'
86+
: '0.0.0-PLACEHOLDER';
87+
ignoredPackages.push(`${packageName}@${version}`);
8588
}
8689

8790
// Find all folders directly under a `node_modules` that have a package.json.

‎tools/defaults.bzl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,15 @@ def pkg_npm(name, pkg_deps = [], use_prodmode_output = False, **kwargs):
6868
NPM_PACKAGE_SUBSTITUTIONS = {
6969
# Version of the local package being built, generated via the `--workspace_status_command` flag.
7070
"0.0.0-PLACEHOLDER": "{BUILD_SCM_VERSION}",
71+
"0.0.0-EXPERIMENTAL-PLACEHOLDER": "{BUILD_SCM_EXPERIMENTAL_VERSION}",
7172
"0.0.0-ENGINES-NODE": RELEASE_ENGINES_NODE,
7273
"0.0.0-ENGINES-NPM": RELEASE_ENGINES_NPM,
7374
"0.0.0-ENGINES-YARN": RELEASE_ENGINES_YARN,
7475
}
7576

7677
NO_STAMP_PACKAGE_SUBSTITUTIONS = dict(NPM_PACKAGE_SUBSTITUTIONS, **{
7778
"0.0.0-PLACEHOLDER": "0.0.0",
79+
"0.0.0-EXPERIMENTAL-PLACEHOLDER": "0.0.0",
7880
})
7981

8082
deps = kwargs.pop("deps", [])

0 commit comments

Comments
 (0)