Skip to content

Commit c2737dd

Browse files
kormidedgp1130
kormide
authored and
dgp1130
committed
build: use placeholder version for stamping
1 parent 787ebce commit c2737dd

File tree

17 files changed

+48
-50
lines changed

17 files changed

+48
-50
lines changed

‎packages/angular/cli/models/version.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ export class Version {
2222
}
2323
}
2424

25-
// TODO: Convert this to use build-time version stamping once implemented in the build system
25+
// TODO: Convert this to use build-time version stamping after flipping the build script to use bazel
26+
// export const VERSION = new Version('0.0.0-PLACEHOLDER');
2627
export const VERSION = new Version(
2728
(
2829
JSON.parse(readFileSync(resolve(__dirname, '../package.json'), 'utf-8')) as { version: string }

‎packages/angular/cli/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular/cli",
3-
"version": "0.0.0",
3+
"version": "0.0.0-PLACEHOLDER",
44
"description": "CLI tool for Angular",
55
"main": "lib/cli/index.js",
66
"bin": {
@@ -25,10 +25,10 @@
2525
},
2626
"homepage": "https://github.com/angular/angular-cli",
2727
"dependencies": {
28-
"@angular-devkit/architect": "0.0.0",
29-
"@angular-devkit/core": "0.0.0",
30-
"@angular-devkit/schematics": "0.0.0",
31-
"@schematics/angular": "0.0.0",
28+
"@angular-devkit/architect": "0.0.0-PLACEHOLDER",
29+
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
30+
"@angular-devkit/schematics": "0.0.0-PLACEHOLDER",
31+
"@schematics/angular": "0.0.0-PLACEHOLDER",
3232
"@yarnpkg/lockfile": "1.1.0",
3333
"ansi-colors": "4.1.1",
3434
"debug": "4.3.3",
@@ -51,12 +51,12 @@
5151
"ng-update": {
5252
"migrations": "@schematics/angular/migrations/migration-collection.json",
5353
"packageGroup": {
54-
"@angular/cli": "0.0.0",
55-
"@angular-devkit/architect": "0.0.0",
56-
"@angular-devkit/build-angular": "0.0.0",
57-
"@angular-devkit/build-webpack": "0.0.0",
58-
"@angular-devkit/core": "0.0.0",
59-
"@angular-devkit/schematics": "0.0.0"
54+
"@angular/cli": "0.0.0-PLACEHOLDER",
55+
"@angular-devkit/architect": "0.0.0-PLACEHOLDER",
56+
"@angular-devkit/build-angular": "0.0.0-PLACEHOLDER",
57+
"@angular-devkit/build-webpack": "0.0.0-PLACEHOLDER",
58+
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
59+
"@angular-devkit/schematics": "0.0.0-PLACEHOLDER"
6060
}
6161
}
6262
}

‎packages/angular/pwa/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular/pwa",
3-
"version": "0.0.0",
3+
"version": "0.0.0-PLACEHOLDER",
44
"description": "PWA schematics for Angular",
55
"keywords": [
66
"blueprints",
@@ -12,8 +12,8 @@
1212
"save": false
1313
},
1414
"dependencies": {
15-
"@angular-devkit/schematics": "0.0.0",
16-
"@schematics/angular": "0.0.0",
15+
"@angular-devkit/schematics": "0.0.0-PLACEHOLDER",
16+
"@schematics/angular": "0.0.0-PLACEHOLDER",
1717
"parse5-html-rewriting-stream": "6.0.1"
1818
}
1919
}

‎packages/angular_devkit/architect/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "@angular-devkit/architect",
3-
"version": "0.0.0",
3+
"version": "0.0.0-PLACEHOLDER",
44
"description": "Angular Build Facade",
55
"experimental": true,
66
"main": "src/index.js",
77
"typings": "src/index.d.ts",
88
"dependencies": {
9-
"@angular-devkit/core": "0.0.0",
9+
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
1010
"rxjs": "6.6.7"
1111
},
1212
"builders": "./builders/builders.json"

‎packages/angular_devkit/architect_cli/package.json

Lines changed: 3 additions & 3 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",
3+
"version": "0.0.0-PLACEHOLDER",
44
"description": "Angular Architect CLI",
55
"homepage": "https://github.com/angular/angular-cli",
66
"experimental": true,
@@ -14,8 +14,8 @@
1414
"tooling"
1515
],
1616
"dependencies": {
17-
"@angular-devkit/architect": "0.0.0",
18-
"@angular-devkit/core": "0.0.0",
17+
"@angular-devkit/architect": "0.0.0-PLACEHOLDER",
18+
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
1919
"ansi-colors": "4.1.1",
2020
"minimist": "1.2.5",
2121
"progress": "2.0.3",

‎packages/angular_devkit/benchmark/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/benchmark",
3-
"version": "0.0.0",
3+
"version": "0.0.0-PLACEHOLDER",
44
"private": true,
55
"description": "Angular Benchmark",
66
"bin": {
@@ -10,7 +10,7 @@
1010
"benchmark"
1111
],
1212
"dependencies": {
13-
"@angular-devkit/core": "0.0.0",
13+
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
1414
"ansi-colors": "4.1.1",
1515
"minimist": "1.2.5",
1616
"pidusage": "3.0.0",

‎packages/angular_devkit/build_angular/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "@angular-devkit/build-angular",
3-
"version": "0.0.0",
3+
"version": "0.0.0-PLACEHOLDER",
44
"description": "Angular Webpack Build Facade",
55
"main": "src/index.js",
66
"typings": "src/index.d.ts",
77
"builders": "builders.json",
88
"dependencies": {
99
"@ampproject/remapping": "1.0.2",
10-
"@angular-devkit/architect": "0.0.0",
11-
"@angular-devkit/build-webpack": "0.0.0",
12-
"@angular-devkit/core": "0.0.0",
10+
"@angular-devkit/architect": "0.0.0-PLACEHOLDER",
11+
"@angular-devkit/build-webpack": "0.0.0-PLACEHOLDER",
12+
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
1313
"@babel/core": "7.16.7",
1414
"@babel/generator": "7.16.7",
1515
"@babel/helper-annotate-as-pure": "7.16.7",
@@ -20,7 +20,7 @@
2020
"@babel/runtime": "7.16.7",
2121
"@babel/template": "7.16.7",
2222
"@discoveryjs/json-ext": "0.5.6",
23-
"@ngtools/webpack": "0.0.0",
23+
"@ngtools/webpack": "0.0.0-PLACEHOLDER",
2424
"ansi-colors": "4.1.1",
2525
"babel-loader": "8.2.3",
2626
"babel-plugin-istanbul": "6.1.1",

‎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",
3+
"version": "0.0.0-PLACEHOLDER",
44
"description": "Angular Build Optimizer",
55
"experimental": true,
66
"main": "src/index.js",

‎packages/angular_devkit/build_webpack/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"name": "@angular-devkit/build-webpack",
3-
"version": "0.0.0",
3+
"version": "0.0.0-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",
10+
"@angular-devkit/architect": "0.0.0-PLACEHOLDER",
1111
"rxjs": "6.6.7"
1212
},
1313
"devDependencies": {
14-
"@angular-devkit/core": "0.0.0",
14+
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
1515
"node-fetch": "2.6.1",
1616
"webpack": "5.65.0"
1717
},

‎packages/angular_devkit/core/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/core",
3-
"version": "0.0.0",
3+
"version": "0.0.0-PLACEHOLDER",
44
"description": "Angular DevKit - Core Utility Library",
55
"main": "src/index.js",
66
"typings": "src/index.d.ts",

‎packages/angular_devkit/schematics/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/schematics",
3-
"version": "0.0.0",
3+
"version": "0.0.0-PLACEHOLDER",
44
"description": "Angular Schematics - Library",
55
"main": "src/index.js",
66
"typings": "src/index.d.ts",
@@ -13,7 +13,7 @@
1313
"schematics"
1414
],
1515
"dependencies": {
16-
"@angular-devkit/core": "0.0.0",
16+
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
1717
"jsonc-parser": "3.0.0",
1818
"magic-string": "0.25.7",
1919
"ora": "5.4.1",

‎packages/angular_devkit/schematics_cli/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@angular-devkit/schematics-cli",
3-
"version": "0.0.0",
3+
"version": "0.0.0-PLACEHOLDER",
44
"description": "Angular Schematics - CLI",
55
"homepage": "https://github.com/angular/angular-cli",
66
"bin": {
@@ -16,8 +16,8 @@
1616
],
1717
"schematics": "./collection.json",
1818
"dependencies": {
19-
"@angular-devkit/core": "0.0.0",
20-
"@angular-devkit/schematics": "0.0.0",
19+
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
20+
"@angular-devkit/schematics": "0.0.0-PLACEHOLDER",
2121
"ansi-colors": "4.1.1",
2222
"inquirer": "8.2.0",
2323
"minimist": "1.2.5",

‎packages/ngtools/webpack/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ngtools/webpack",
3-
"version": "0.0.0",
3+
"version": "0.0.0-PLACEHOLDER",
44
"description": "Webpack plugin that AoT compiles your Angular components and modules.",
55
"main": "./src/index.js",
66
"typings": "src/index.d.ts",
@@ -27,7 +27,7 @@
2727
"webpack": "^5.30.0"
2828
},
2929
"devDependencies": {
30-
"@angular-devkit/core": "0.0.0",
30+
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
3131
"@angular/compiler": "13.1.1",
3232
"@angular/compiler-cli": "13.1.1",
3333
"typescript": "4.5.4",

‎packages/schematics/angular/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@schematics/angular",
3-
"version": "0.0.0",
3+
"version": "0.0.0-PLACEHOLDER",
44
"description": "Schematics specific to Angular",
55
"homepage": "https://github.com/angular/angular-cli",
66
"keywords": [
@@ -10,8 +10,8 @@
1010
],
1111
"schematics": "./collection.json",
1212
"dependencies": {
13-
"@angular-devkit/core": "0.0.0",
14-
"@angular-devkit/schematics": "0.0.0",
13+
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
14+
"@angular-devkit/schematics": "0.0.0-PLACEHOLDER",
1515
"jsonc-parser": "3.0.0"
1616
}
1717
}

‎scripts/build.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,8 @@ export default async function (
411411
} else {
412412
obj[depName] = `github:${pkg.snapshotRepo}#${pkg.snapshotHash}`;
413413
}
414-
} else if ((obj[depName] as string).match(/\b0\.0\.0\b/)) {
415-
obj[depName] = (obj[depName] as string).replace(/\b0\.0\.0\b/, v);
414+
} else if ((obj[depName] as string).match(/\b0\.0\.0-PLACEHOLDER\b/)) {
415+
obj[depName] = (obj[depName] as string).replace(/\b0\.0\.0-PLACEHOLDER\b/, v);
416416
}
417417
}
418418
}

‎scripts/validate-licenses.ts

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

8282
// Ignore own packages (all MIT)
8383
for (const packageName of Object.keys(packages)) {
84-
ignoredPackages.push(`${packageName}@0.0.0`);
84+
ignoredPackages.push(`${packageName}@0.0.0-PLACEHOLDER`);
8585
}
8686

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

‎tools/defaults.bzl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,10 @@ def pkg_npm(name, pkg_deps = [], use_prodmode_output = False, **kwargs):
6666

6767
common_substitutions = dict(kwargs.pop("substitutions", {}))
6868
substitutions = dict(common_substitutions, **{
69-
# TODO: Current build script relies on 0.0.0 in package.json; uncomment after replacing build script.
70-
#"0.0.0-PLACEHOLDER": "0.0.0",
69+
"0.0.0-PLACEHOLDER": "0.0.0",
7170
})
7271
stamped_substitutions = dict(common_substitutions, **{
73-
# TODO: Current build script relies on 0.0.0 in package.json; uncomment after replacing build script.
74-
#"0.0.0-PLACEHOLDER": "{BUILD_SCM_VERSION}",
75-
"0.0.0": "{BUILD_SCM_VERSION}",
72+
"0.0.0-PLACEHOLDER": "{BUILD_SCM_VERSION}",
7673
})
7774

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

0 commit comments

Comments
 (0)