From f5020a3f836e1b6037e8aa91618a1889d0e9d625 Mon Sep 17 00:00:00 2001 From: Angular Robot Date: Wed, 30 Aug 2023 07:18:12 +0000 Subject: [PATCH] build: update dependency jasmine to v5 --- package.json | 2 +- .../patches/@bazel+jasmine+5.8.1.patch | 13 +++++++++++++ yarn.lock | 16 ++++++++-------- 3 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 tools/postinstall/patches/@bazel+jasmine+5.8.1.patch diff --git a/package.json b/package.json index a81f1b71ad89..31db00d8b4e8 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ "husky": "8.0.3", "ini": "4.1.1", "inquirer": "8.2.6", - "jasmine": "^4.0.0", + "jasmine": "^5.0.0", "jasmine-core": "~5.1.0", "jasmine-spec-reporter": "~7.0.0", "jquery": "^3.3.1", diff --git a/tools/postinstall/patches/@bazel+jasmine+5.8.1.patch b/tools/postinstall/patches/@bazel+jasmine+5.8.1.patch new file mode 100644 index 000000000000..6a60066ad403 --- /dev/null +++ b/tools/postinstall/patches/@bazel+jasmine+5.8.1.patch @@ -0,0 +1,13 @@ +diff --git a/node_modules/@bazel/jasmine/jasmine_runner.js b/node_modules/@bazel/jasmine/jasmine_runner.js +index 097eb92..bd55c2d 100755 +--- a/node_modules/@bazel/jasmine/jasmine_runner.js ++++ b/node_modules/@bazel/jasmine/jasmine_runner.js +@@ -147,7 +147,7 @@ async function main(args) { + // TODO(6.0): remove support for deprecated versions of Jasmine that use the old API & + // remember to update the `peerDependencies` as well. + // Jasmine versions prior to 4.0.0 should use the old API. +- if (jrunner.coreVersion().charAt(0) !== '4') { ++ if (+jrunner.coreVersion().charAt(0) < 4) { + console.warn(`DEPRECATED: Support for Jasmine versions prior to '4.0.x' is deprecated in '@bazel/jasmine'.`); + + // Old Jasmine API. diff --git a/yarn.lock b/yarn.lock index 2429bf67bc21..38a9773ddfba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7187,7 +7187,7 @@ glob@^6.0.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: +glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.7: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -8141,7 +8141,7 @@ jackspeak@^2.0.3: optionalDependencies: "@pkgjs/parseargs" "^0.11.0" -jasmine-core@^4.1.0, jasmine-core@^4.6.0: +jasmine-core@^4.1.0: version "4.6.0" resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-4.6.0.tgz#6884fc3d5b66bf293e422751eed6d6da217c38f5" integrity sha512-O236+gd0ZXS8YAjFx8xKaJ94/erqUliEkJTDedyE7iHvv4ZVqi+q+8acJxu05/WJDKm512EUNn809In37nWlAQ== @@ -8180,13 +8180,13 @@ jasmine@2.8.0: glob "^7.0.6" jasmine-core "~2.8.0" -jasmine@^4.0.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-4.6.0.tgz#2ecde288da25815c67897bb9b9b91f6709880ce1" - integrity sha512-iq7HQ5M8ydNUspjd9vbFW9Lu+6lQ1QLDIqjl0WysEllF5EJZy8XaUyNlhCJVwOx2YFzqTtARWbS56F/f0PzRFw== +jasmine@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-5.1.0.tgz#a3218fd425ff35aec12f3dc6cf70d8cebbf0042a" + integrity sha512-prmJlC1dbLhti4nE4XAPDWmfJesYO15sjGXVp7Cs7Ym5I9Xtwa/hUHxxJXjnpfLO72+ySttA0Ztf8g/RiVnUKw== dependencies: - glob "^7.1.6" - jasmine-core "^4.6.0" + glob "^10.2.2" + jasmine-core "~5.1.0" jasminewd2@^2.1.0: version "2.2.0"