Skip to content

Commit 5f2adc3

Browse files
Merge branch 'develop' into release/15.0.0
2 parents fbab363 + cd988bf commit 5f2adc3

File tree

18 files changed

+32
-22
lines changed

18 files changed

+32
-22
lines changed

.circleci/workflows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
version: 2.1
22

3-
chrome-stable-version: &chrome-stable-version "137.0.7151.68"
3+
chrome-stable-version: &chrome-stable-version "137.0.7151.103"
44
chrome-beta-version: &chrome-beta-version "138.0.7204.15"
55
firefox-stable-version: &firefox-stable-version "137.0"
66

77
orbs:
8-
browser-tools: circleci/browser-tools@2.0.0
8+
browser-tools: circleci/browser-tools@2.1.0
99

1010
defaults: &defaults
1111
parallelism: 1

npm/vite-dev-server/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
},
2323
"devDependencies": {
2424
"chai": "^4.3.6",
25+
"cross-env": "7.0.3",
2526
"decache": "^4.6.2",
2627
"dedent": "^0.7.0",
2728
"mocha": "^9.2.2",

npm/webpack-dev-server/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"@types/speed-measure-webpack-plugin": "^1.3.4",
3535
"@types/webpack-bundle-analyzer": "4.7.0",
3636
"chai": "^4.3.6",
37+
"cross-env": "7.0.3",
3738
"dedent": "^0.7.0",
3839
"mocha": "^9.2.2",
3940
"proxyquire": "2.1.3",

packages/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"classnames": "^2.5.1",
5959
"combine-properties": "0.1.0",
6060
"concurrently": "^6.2.0",
61-
"cross-env": "6.0.3",
61+
"cross-env": "7.0.3",
6262
"cypress-plugin-tab": "1.0.5",
6363
"cypress-real-events": "1.14.0",
6464
"dayjs": "^1.9.3",

packages/example/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"test-unit": "echo 'no unit tests'"
1515
},
1616
"devDependencies": {
17-
"cross-env": "6.0.3",
1817
"cypress-example-kitchensink": "5.0.0",
1918
"gh-pages": "5.0.0",
2019
"gulp": "4.0.2",

packages/extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@packages/socket": "0.0.0-development",
2727
"chai": "3.5.0",
2828
"chokidar-cli": "2.1.0",
29-
"cross-env": "6.0.3",
29+
"cross-env": "7.0.3",
3030
"eol": "0.10.0",
3131
"fs-extra": "9.1.0",
3232
"gulp": "4.0.2",

packages/frontend-shared/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"chai-as-promised": "7.1.1",
6969
"chai-subset": "1.6.0",
7070
"combine-properties": "0.1.0",
71-
"cross-env": "6.0.3",
71+
"cross-env": "7.0.3",
7272
"cross-fetch": "^4.1.0",
7373
"cypress-plugin-tab": "1.0.5",
7474
"cypress-real-events": "1.14.0",

packages/https-proxy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@packages/network": "0.0.0-development",
3030
"@packages/ts": "0.0.0-development",
3131
"chai": "3.5.0",
32-
"cross-env": "6.0.3",
32+
"cross-env": "7.0.3",
3333
"mocha": "3.5.3",
3434
"sinon": "1.17.7",
3535
"sinon-as-promised": "4.0.3",

packages/launchpad/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"bluebird": "3.5.3",
5353
"classnames": "^2.5.1",
5454
"concurrently": "^6.2.0",
55-
"cross-env": "6.0.3",
55+
"cross-env": "7.0.3",
5656
"cypress-plugin-tab": "1.0.5",
5757
"cypress-real-events": "1.14.0",
5858
"dedent": "^0.7.0",

packages/reporter/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"@packages/types": "0.0.0-development",
2626
"@packages/web-config": "0.0.0-development",
2727
"classnames": "^2.5.1",
28+
"cross-env": "7.0.3",
2829
"css-element-queries": "1.2.3",
2930
"cypress-multi-reporters": "1.4.0",
3031
"cypress-real-events": "1.14.0",

packages/runner/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"babel-plugin-prismjs": "1.0.2",
3131
"bluebird": "3.5.3",
3232
"common-tags": "1.8.0",
33-
"cross-env": "6.0.3",
33+
"cross-env": "7.0.3",
3434
"lodash": "^4.17.21",
3535
"mobx": "6.13.6",
3636
"react": "18.3.1",

packages/server/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@
180180
"chai-subset": "1.6.0",
181181
"chai-uuid": "1.0.6",
182182
"chrome-har-capturer": "0.14.2",
183-
"cross-env": "6.0.3",
184183
"devtools-protocol": "0.0.1459876",
185184
"esbuild": "^0.15.3",
186185
"eventsource": "2.0.2",

packages/socket/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@packages/types": "0.0.0-development",
3232
"@types/uuid": "8.3.2",
3333
"chai": "3.5.0",
34-
"cross-env": "6.0.3",
34+
"cross-env": "7.0.3",
3535
"devtools-protocol": "0.0.1459876",
3636
"mocha": "3.5.3",
3737
"resolve-pkg": "2.0.0"

system-tests/projects/svelte-webpack-configured/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"dev": "webpack serve"
77
},
88
"devDependencies": {
9+
"cross-env": "7.0.3",
910
"css-loader": "^7.1.2",
1011
"html-webpack-plugin": "^5.6.3",
1112
"mini-css-extract-plugin": "^2.9.2",

system-tests/projects/svelte-webpack-configured/yarn.lock

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -832,9 +832,16 @@ core-util-is@~1.0.0:
832832
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
833833
integrity "sha1-pgQtNjTCsn6TKPg3uWX6yDgI24U= sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
834834

835-
cross-spawn@^7.0.3:
835+
836+
version "7.0.3"
837+
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
838+
integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
839+
dependencies:
840+
cross-spawn "^7.0.1"
841+
842+
cross-spawn@^7.0.1, cross-spawn@^7.0.3:
836843
version "7.0.6"
837-
resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
844+
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
838845
integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
839846
dependencies:
840847
path-key "^3.1.0"

system-tests/projects/svelte-webpack-unconfigured/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"dev": "webpack serve"
77
},
88
"devDependencies": {
9+
"cross-env": "7.0.3",
910
"css-loader": "^7.1.2",
1011
"html-webpack-plugin": "^5.6.3",
1112
"mini-css-extract-plugin": "^2.9.2",

system-tests/projects/svelte-webpack-unconfigured/yarn.lock

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -832,9 +832,16 @@ core-util-is@~1.0.0:
832832
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
833833
integrity "sha1-pgQtNjTCsn6TKPg3uWX6yDgI24U= sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
834834

835-
cross-spawn@^7.0.3:
835+
836+
version "7.0.3"
837+
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
838+
integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
839+
dependencies:
840+
cross-spawn "^7.0.1"
841+
842+
cross-spawn@^7.0.1, cross-spawn@^7.0.3:
836843
version "7.0.6"
837-
resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
844+
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
838845
integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
839846
dependencies:
840847
path-key "^3.1.0"

yarn.lock

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13214,13 +13214,6 @@ cross-dirname@^0.1.0:
1321413214
resolved "https://registry.yarnpkg.com/cross-dirname/-/cross-dirname-0.1.0.tgz#b899599f30a5389f59e78c150e19f957ad16a37c"
1321513215
integrity sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==
1321613216

13217-
13218-
version "6.0.3"
13219-
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
13220-
integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
13221-
dependencies:
13222-
cross-spawn "^7.0.0"
13223-
1322413217
1322513218
version "7.0.3"
1322613219
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"

0 commit comments

Comments
 (0)