From 9c4f7070ebd100805df0bd613cafd37711fcd89e Mon Sep 17 00:00:00 2001 From: Doug Parker Date: Tue, 28 Feb 2023 23:26:48 -0800 Subject: [PATCH] Pins Jasmine version. Refs #33. The actual version of Jasmine used comes from `jasmine_repositories()`, not `package.json`. `@aspect_rules_jasmine` runs its own `npm install` under the hood to get the specific version of Jasmine. This commit drops the `jasmine` dependency in `package.json`, which is actually unused. It also bumps the `@types/jasmine` dependency to the current latest. Unfortunately `jasmine` and `@types/jasmine` don't directly correlate, so we can't forcibly align the versions there. --- WORKSPACE.bazel | 5 ++++- package.json | 3 +-- pnpm-lock.yaml | 22 ++++------------------ 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index b46ee6b1..f2c32344 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -73,7 +73,10 @@ load("@aspect_rules_jasmine//jasmine:dependencies.bzl", "rules_jasmine_dependenc rules_jasmine_dependencies() load("@aspect_rules_jasmine//jasmine:repositories.bzl", "jasmine_repositories") -jasmine_repositories(name = "jasmine") +jasmine_repositories( + name = "jasmine", + jasmine_version = "v4.3.0", +) load("@jasmine//:npm_repositories.bzl", jasmine_npm_repositories = "npm_repositories") jasmine_npm_repositories() diff --git a/package.json b/package.json index f164146f..729d48ff 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@bazel/bazelisk": "latest", "@bazel/buildifier": "latest", "@bazel/ibazel": "latest", - "@types/jasmine": "^3.6.2", + "@types/jasmine": "^4.3.1", "@types/node": "^14.14.13", "@types/yargs": "^15.0.11", "@typescript-eslint/eslint-plugin": "^4.29.3", @@ -54,7 +54,6 @@ "eslint": "^7.32.0", "http-status-codes": "^2.1.4", "husky": "^7.0.2", - "jasmine": "^4.3.0", "tree-kill": "^1.2.2", "typescript": "4.9.5", "webdriverio": "^7.20.9" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index abb882d9..0bd05903 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,7 +5,7 @@ specifiers: '@bazel/buildifier': latest '@bazel/ibazel': latest '@rollup/plugin-node-resolve': ^11.0.1 - '@types/jasmine': ^3.6.2 + '@types/jasmine': ^4.3.1 '@types/markdown-it': ^12.0.1 '@types/node': ^14.14.13 '@types/yargs': ^15.0.11 @@ -15,7 +15,6 @@ specifiers: http-server: ^14.1.1 http-status-codes: ^2.1.4 husky: ^7.0.2 - jasmine: ^4.3.0 lightningcss: ^1.19.0 markdown-it: ^12.0.4 node-html-parser: ^6.1.5 @@ -39,7 +38,7 @@ devDependencies: '@bazel/bazelisk': 0.0.0-PLACEHOLDER '@bazel/buildifier': 6.0.1 '@bazel/ibazel': 0.16.2 - '@types/jasmine': 3.6.2 + '@types/jasmine': 4.3.1 '@types/node': 14.14.13 '@types/yargs': 15.0.11 '@typescript-eslint/eslint-plugin': 4.29.3_dzyj2wrwgfvphckagzu66b7f7q @@ -47,7 +46,6 @@ devDependencies: eslint: 7.32.0 http-status-codes: 2.1.4 husky: 7.0.2 - jasmine: 4.3.0 tree-kill: 1.2.2 typescript: 4.9.5 webdriverio: 7.20.9_typescript@4.9.5 @@ -206,8 +204,8 @@ packages: resolution: {integrity: sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==} dev: true - /@types/jasmine/3.6.2: - resolution: {integrity: sha512-AzfesNFLvOs6Q1mHzIsVJXSeUnqVh4ZHG8ngygKJfbkcSLwzrBVm/LKa+mR8KrOfnWtUL47112gde1MC0IXqpQ==} + /@types/jasmine/4.3.1: + resolution: {integrity: sha512-Vu8l+UGcshYmV1VWwULgnV/2RDbBaO6i2Ptx7nd//oJPIZGhoI1YLST4VKagD2Pq/Bc2/7zvtvhM7F3p4SN7kQ==} dev: true /@types/json-schema/7.0.9: @@ -1570,18 +1568,6 @@ packages: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} dev: true - /jasmine-core/4.3.0: - resolution: {integrity: sha512-qybtBUesniQdW6n+QIHMng2vDOHscIC/dEXjW+JzO9+LoAZMb03RCUC5xFOv/btSKPm1xL42fn+RjlU4oB42Lg==} - dev: true - - /jasmine/4.3.0: - resolution: {integrity: sha512-ieBmwkd8L1DXnvSnxx7tecXgA0JDgMXPAwBcqM4lLPedJeI9hTHuWifPynTC+dLe4Y+GkSPSlbqqrmYIgGzYUw==} - hasBin: true - dependencies: - glob: 7.1.6 - jasmine-core: 4.3.0 - dev: true - /js-tokens/4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} dev: true