From 887cf45eaa6f127cc1a3a254cbbe99f362120a8d Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Tue, 26 Apr 2022 17:49:49 +0200 Subject: [PATCH] build: update tsec and drop corresponding postinstall patch (#24837) Updates tsec and drops the corresponding postinstall patch that we added when we updated to Bazel v5. See: google/tsec#25 (cherry picked from commit 3b43c7bd56489f82630489716288a69b77fc626a) --- package.json | 2 +- tools/postinstall/apply-patches.js | 5 +---- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 5fa57d88e95b..ae91edb4c5a1 100644 --- a/package.json +++ b/package.json @@ -210,7 +210,7 @@ "stylelint": "^14.5.0", "terser": "^5.10.0", "ts-node": "^10.4.0", - "tsec": "0.2.1", + "tsec": "0.2.2", "tsickle": "0.39.1", "tslint": "^6.1.3", "tsutils": "^3.21.0", diff --git a/tools/postinstall/apply-patches.js b/tools/postinstall/apply-patches.js index 5b87ebf1a698..9804c2ed642b 100644 --- a/tools/postinstall/apply-patches.js +++ b/tools/postinstall/apply-patches.js @@ -14,7 +14,7 @@ const chalk = require('chalk'); * Version of the post install patch. Needs to be incremented when * existing patches or edits have been modified. */ -const PATCH_VERSION = 15; +const PATCH_VERSION = 16; /** Path to the project directory. */ const projectDir = path.join(__dirname, '../..'); @@ -55,9 +55,6 @@ function applyPatches() { // Switches the devmode output for Angular Bazel to ES2020 target and module. applyPatch(path.join(__dirname, './devmode-es2020-bazel.patch')); - // Workaround until https://github.com/google/tsec/pull/25 is available. - searchAndReplace('@bazel/typescript', '@bazel/concatjs', 'node_modules/tsec/index.bzl'); - // More info in https://github.com/angular/angular/pull/33786 shelljs.rm('-rf', [ 'node_modules/rxjs/add/', diff --git a/yarn.lock b/yarn.lock index 9c43d1179e17..5082f7c08c9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14967,10 +14967,10 @@ ts-node@^10.4.0: v8-compile-cache-lib "^3.0.0" yn "3.1.1" -tsec@0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tsec/-/tsec-0.2.1.tgz#017423174b2be54f26da5cb7591dc7035996086b" - integrity sha512-RP9vhbRbRI9VH4CfOlQvo5W9HdfiPKq0gdiUOWI5oKmLaZKNFN8CsPwBfT5ySmhnKNwmmAS/BtY3WoTfABwwig== +tsec@0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/tsec/-/tsec-0.2.2.tgz#d86d771215fb09a5e226f2b252a1c038c7fa17ca" + integrity sha512-gKm+nnIKcE9xtrJw2cIJFjfuDGK0AvH3r4RayTEIkUvja/s9z9GPFgcSdEaapm6N10KrmWWcLjsHlKmH2tqzMw== dependencies: glob "^7.1.1" minimatch "^3.0.3"