Skip to content

Commit cec97fe

Browse files
committed
build: use yarn patching instead of third-party package
1 parent ce850da commit cec97fe

File tree

6 files changed

+99
-117
lines changed

6 files changed

+99
-117
lines changed

tools/postinstall/patches/@angular+bazel+17.0.0-next.1.patch renamed to .yarn/patches/@angular-bazel-https-9848736cf4.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/node_modules/@angular/bazel/src/ng_package/packager.mjs b/node_modules/@angular/bazel/src/ng_package/packager.mjs
2-
index 9454623..d28910a 100755
3-
--- a/node_modules/@angular/bazel/src/ng_package/packager.mjs
4-
+++ b/node_modules/@angular/bazel/src/ng_package/packager.mjs
1+
diff --git a/src/ng_package/packager.mjs b/src/ng_package/packager.mjs
2+
index 5c1f3a2c72e28a90b666c96b2fe9755cdafd5259..47034ceeb0b9ab9c1e9bee50239723a51d2e2e19 100755
3+
--- a/src/ng_package/packager.mjs
4+
+++ b/src/ng_package/packager.mjs
55
@@ -7,7 +7,7 @@
66
*/
77
import * as fs from 'fs';

tools/postinstall/patches/@bazel+concatjs+5.8.1.patch renamed to .yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/node_modules/@bazel/concatjs/internal/build_defs.bzl b/node_modules/@bazel/concatjs/internal/build_defs.bzl
2-
index 9e5cda6..6c45196 100755
3-
--- a/node_modules/@bazel/concatjs/internal/build_defs.bzl
4-
+++ b/node_modules/@bazel/concatjs/internal/build_defs.bzl
1+
diff --git a/internal/build_defs.bzl b/internal/build_defs.bzl
2+
index 9e5cda684f0456b61d1b6c0f9c56ae021594713f..6c45196bda5880531d32618dfca0dee44c035cb9 100755
3+
--- a/internal/build_defs.bzl
4+
+++ b/internal/build_defs.bzl
55
@@ -76,7 +76,7 @@ _TYPESCRIPT_TYPINGS = Label(
66
"//typescript:typescript__typings",
77
)
@@ -11,10 +11,10 @@ index 9e5cda6..6c45196 100755
1111
_TYPESCRIPT_MODULE_KINDS = ["none", "commonjs", "amd", "umd", "system", "es2015", "esnext"]
1212

1313
_DEVMODE_TARGET_DEFAULT = "es2015"
14-
diff --git a/node_modules/@bazel/concatjs/internal/common/tsconfig.bzl b/node_modules/@bazel/concatjs/internal/common/tsconfig.bzl
15-
index b01c999..ec3e4cc 100755
16-
--- a/node_modules/@bazel/concatjs/internal/common/tsconfig.bzl
17-
+++ b/node_modules/@bazel/concatjs/internal/common/tsconfig.bzl
14+
diff --git a/internal/common/tsconfig.bzl b/internal/common/tsconfig.bzl
15+
index b01c999f5e02b388f51a508b0b608cf69db9b664..ec3e4ccb321fa230546e34c1c2ea87f7457fa108 100755
16+
--- a/internal/common/tsconfig.bzl
17+
+++ b/internal/common/tsconfig.bzl
1818
@@ -278,11 +278,6 @@ def create_tsconfig(
1919
"declarationDir": "/".join([workspace_path, outdir_path]),
2020
"stripInternal": True,

tools/postinstall/patches/@bazel+jasmine+5.8.1.patch renamed to .yarn/patches/@bazel-jasmine-npm-5.8.1-3370fee155.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/node_modules/@bazel/jasmine/jasmine_runner.js b/node_modules/@bazel/jasmine/jasmine_runner.js
2-
index 097eb92..bd55c2d 100755
3-
--- a/node_modules/@bazel/jasmine/jasmine_runner.js
4-
+++ b/node_modules/@bazel/jasmine/jasmine_runner.js
1+
diff --git a/jasmine_runner.js b/jasmine_runner.js
2+
index 097eb920357f5f02e5b6592e0e4be27c0b4bf25d..bd55c2dad833b32a9e644fed8c7d6b626cd01128 100755
3+
--- a/jasmine_runner.js
4+
+++ b/jasmine_runner.js
55
@@ -147,7 +147,7 @@ async function main(args) {
66
// TODO(6.0): remove support for deprecated versions of Jasmine that use the old API &
77
// remember to update the `peerDependencies` as well.

WORKSPACE

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,11 @@ load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install")
111111
yarn_install(
112112
name = "npm",
113113
data = [
114+
"//:.yarn/patches/@angular-bazel-https-9848736cf4.patch",
115+
"//:.yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch",
116+
"//:.yarn/patches/@bazel-jasmine-npm-5.8.1-3370fee155.patch",
114117
"//:.yarn/releases/yarn-4.2.2.cjs",
115118
"//:.yarnrc.yml",
116-
"//:tools/postinstall/patches/@angular+bazel+17.0.0-next.1.patch",
117-
"//:tools/postinstall/patches/@bazel+concatjs+5.8.1.patch",
118119
],
119120
# Currently disabled due to:
120121
# 1. Missing Windows support currently.

package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"lint": "eslint --cache --max-warnings=0 \"**/*.@(ts|mts|cts)\"",
1919
"templates": "yarn admin templates",
2020
"validate": "yarn admin validate",
21-
"postinstall": "yarn webdriver-update && yarn husky && patch-package --patch-dir tools/postinstall/patches",
21+
"postinstall": "yarn webdriver-update && yarn husky",
2222
"//webdriver-update-README": "ChromeDriver version must match Puppeteer Chromium version, see https://github.com/GoogleChrome/puppeteer/releases http://chromedriver.chromium.org/downloads",
2323
"webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 106.0.5249.21",
2424
"public-api:check": "node goldens/public-api/manage.js test",
@@ -53,7 +53,7 @@
5353
"devDependencies": {
5454
"@ampproject/remapping": "2.3.0",
5555
"@angular/animations": "18.1.0-next.1",
56-
"@angular/bazel": "https://github.com/angular/bazel-builds.git#71bd2e043e076365effdb6076f33b2d8d6bd6d02",
56+
"@angular/bazel": "patch:@angular/bazel@https%3A//github.com/angular/bazel-builds.git%23commit=71bd2e043e076365effdb6076f33b2d8d6bd6d02#~/.yarn/patches/@angular-bazel-https-9848736cf4.patch",
5757
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#5e30807f0fc6f1f00b2ac9186bd5f704b72e6ea6",
5858
"@angular/cdk": "18.0.2",
5959
"@angular/common": "18.1.0-next.1",
@@ -80,9 +80,9 @@
8080
"@babel/runtime": "7.24.7",
8181
"@bazel/bazelisk": "1.19.0",
8282
"@bazel/buildifier": "7.1.2",
83-
"@bazel/concatjs": "5.8.1",
83+
"@bazel/concatjs": "patch:@bazel/concatjs@npm%3A5.8.1#~/.yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch",
8484
"@bazel/esbuild": "5.8.1",
85-
"@bazel/jasmine": "5.8.1",
85+
"@bazel/jasmine": "patch:@bazel/jasmine@npm%3A5.8.1#~/.yarn/patches/@bazel-jasmine-npm-5.8.1-3370fee155.patch",
8686
"@discoveryjs/json-ext": "0.5.7",
8787
"@inquirer/confirm": "3.1.9",
8888
"@inquirer/prompts": "5.0.5",
@@ -170,7 +170,6 @@
170170
"ora": "5.4.1",
171171
"pacote": "18.0.6",
172172
"parse5-html-rewriting-stream": "7.0.0",
173-
"patch-package": "^7.0.1",
174173
"picomatch": "4.0.2",
175174
"piscina": "4.5.1",
176175
"postcss": "8.4.38",
@@ -210,5 +209,8 @@
210209
"yargs": "17.7.2",
211210
"yargs-parser": "21.1.1",
212211
"zone.js": "^0.14.0"
212+
},
213+
"resolutions": {
214+
"@bazel/concatjs@npm:5.8.1": "patch:@bazel/concatjs@npm%3A5.8.1#~/.yarn/patches/@bazel-concatjs-npm-5.8.1-1bf81df846.patch"
213215
}
214216
}

0 commit comments

Comments
 (0)