feat(jasmine): make jasmine a peerDep

BREAKING CHANGE jasmine and jasmine-core are now peerDeps of @bazel/jasmine please add them to your project with: yarn add -D jasmine jasmine-core
bazel-contrib · Jun 18, 2020 · e6890fc · e6890fc
1 parent 7d070ff
commit e6890fc
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 33 deletions.
diff --git a/e2e/bazel_managed_deps/package.json b/e2e/bazel_managed_deps/package.json
@@ -2,6 +2,7 @@
   "description": "runtime dependencies for bazel_managed_deps example",
   "devDependencies": {
     "@bazel/jasmine": "^1.6.0",
+    "jasmine": "^3.5.0",
     "typescript": "^3.0.1"
   },
   "scripts": {

diff --git a/e2e/bazel_managed_deps/yarn.lock b/e2e/bazel_managed_deps/yarn.lock
@@ -291,7 +291,7 @@ jasmine-reporters@~2.3.2:
     mkdirp "^0.5.1"
     xmldom "^0.1.22"
 
-jasmine@~3.5.0:
+jasmine@^3.5.0, jasmine@~3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.5.0.tgz#7101eabfd043a1fc82ac24e0ab6ec56081357f9e"
   integrity sha512-DYypSryORqzsGoMazemIHUfMkXM7I7easFaxAvNM3Mr6Xz3Fy36TupTrAOxZWN8MVKEU5xECv22J4tUQf3uBzQ==

diff --git a/e2e/jasmine/package.json b/e2e/jasmine/package.json
@@ -5,11 +5,10 @@
     "zone.js": "0.8.29"
   },
   "//": "Include an incompatible jasmine as a devDependency to verify that jasmine_node_test works regardless",
-  "devDependencies": {
-    "jasmine": "2.99.0",
-    "jasmine-core": "2.5.2"
-  },
   "scripts": {
     "test": "bazel test ..."
+  },
+  "devDependencies": {
+    "jasmine": "2.99.0"
   }
 }
diff --git a/e2e/jasmine/yarn.lock b/e2e/jasmine/yarn.lock
@@ -166,10 +166,10 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
-glob@^7.0.6:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+glob@^7.0.6, glob@^7.1.4:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -190,18 +190,6 @@ glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.4:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 graceful-fs@^4.1.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
@@ -295,11 +283,6 @@ istanbul-reports@^1.3.0:
   dependencies:
     handlebars "^4.0.3"
 
-jasmine-core@2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.5.2.tgz#6f61bd79061e27f43e6f9355e44b3c6cab6ff297"
-  integrity sha1-b2G9eQYeJ/Q+b5NV5Es8bKtv8pc=
-
 jasmine-core@~2.99.0:
   version "2.99.1"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"

diff --git a/e2e/typescript/package.json b/e2e/typescript/package.json
@@ -5,6 +5,7 @@
     "@types/jasmine": "2.8.2",
     "@types/node": "7.0.18",
     "date-fns": "^1.30.1",
+    "jasmine": "^3.5.0",
     "source-map-support": "^0.5.10",
     "typescript": "3.1.x"
   },

diff --git a/e2e/typescript/yarn.lock b/e2e/typescript/yarn.lock
@@ -384,7 +384,7 @@ jasmine-reporters@~2.3.2:
     mkdirp "^0.5.1"
     xmldom "^0.1.22"
 
-jasmine@~3.5.0:
+jasmine@^3.5.0, jasmine@~3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.5.0.tgz#7101eabfd043a1fc82ac24e0ab6ec56081357f9e"
   integrity sha512-DYypSryORqzsGoMazemIHUfMkXM7I7easFaxAvNM3Mr6Xz3Fy36TupTrAOxZWN8MVKEU5xECv22J4tUQf3uBzQ==

diff --git a/examples/kotlin/package.json b/examples/kotlin/package.json
@@ -7,6 +7,7 @@
         "@bazel/terser": "^1.6.0",
         "domino": "^2.1.3",
         "http-server": "^0.11.1",
+        "jasmine": "^3.5.0",
         "kotlin": "^1.3.41",
         "kotlinx-html-js": "^0.6.4",
         "rollup": "1.20.3",

diff --git a/examples/nestjs/package.json b/examples/nestjs/package.json
@@ -10,6 +10,7 @@
     "@types/jasmine": "^3.5.0",
     "@types/superagent": "^4.1.4",
     "@types/supertest": "^2.0.8",
+    "jasmine": "^3.5.0",
     "minimist": "1.2.0",
     "reflect-metadata": "0.1.13",
     "rxjs": "6.5.2",

diff --git a/examples/nestjs/yarn.lock b/examples/nestjs/yarn.lock
@@ -870,7 +870,7 @@ jasmine-reporters@~2.3.2:
     mkdirp "^0.5.1"
     xmldom "^0.1.22"
 
-jasmine@~3.5.0:
+jasmine@^3.5.0, jasmine@~3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.5.0.tgz#7101eabfd043a1fc82ac24e0ab6ec56081357f9e"
   integrity sha512-DYypSryORqzsGoMazemIHUfMkXM7I7easFaxAvNM3Mr6Xz3Fy36TupTrAOxZWN8MVKEU5xECv22J4tUQf3uBzQ==

diff --git a/examples/parcel/package-lock.json b/examples/parcel/package-lock.json
diff --git a/examples/vendored_node/package.json b/examples/vendored_node/package.json
@@ -1,7 +1,8 @@
 {
   "private": true,
   "devDependencies": {
-    "@bazel/jasmine": "^1.6.0"
+    "@bazel/jasmine": "^1.6.0",
+    "jasmine": "^3.5.0"
   },
   "scripts": {
     "test": "bazel test ..."

diff --git a/examples/vendored_node_and_yarn/package.json b/examples/vendored_node_and_yarn/package.json
@@ -1,7 +1,8 @@
 {
   "private": true,
   "devDependencies": {
-    "@bazel/jasmine": "^1.6.0"
+    "@bazel/jasmine": "^1.6.0",
+    "jasmine": "^3.5.0"
   },
   "scripts": {
     "test": "bazel test ..."

diff --git a/examples/vendored_node_and_yarn/yarn.lock b/examples/vendored_node_and_yarn/yarn.lock
@@ -291,7 +291,7 @@ jasmine-reporters@~2.3.2:
     mkdirp "^0.5.1"
     xmldom "^0.1.22"
 
-jasmine@~3.5.0:
+jasmine@^3.5.0, jasmine@~3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.5.0.tgz#7101eabfd043a1fc82ac24e0ab6ec56081357f9e"
   integrity sha512-DYypSryORqzsGoMazemIHUfMkXM7I7easFaxAvNM3Mr6Xz3Fy36TupTrAOxZWN8MVKEU5xECv22J4tUQf3uBzQ==

diff --git a/packages/jasmine/package.json b/packages/jasmine/package.json
@@ -17,11 +17,16 @@
     ],
     "main": "index.js",
     "dependencies": {
-        "jasmine": "~3.5.0",
-        "jasmine-core": "~3.5.0",
         "jasmine-reporters": "~2.3.2",
         "c8": "~7.1.0"
     },
+    "//1": "jasmine depends on jasmine-core, however since we require() it we need it hoisted to the top",
+    "//2": "so we include jasmine-core explicitly as a peerDep",
+    "//3": "version 2.99.0 is the lower bound only because that's what our e2e/jasmine test verifies",
+    "peerDependencies": {
+        "jasmine": ">=2.99.0",
+        "jasmine-core": ">=2.99.0"
+    },
     "scripts": {
         "postinstall": "node npm_version_check.js"
     }