Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4d60a71

Browse files
flotwigflotwig
committed
Merge branch 'develop'
2 parents 76ff428 + 61c120d commit 4d60a71

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+329
-265
lines changed

‎circle.yml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,15 +1102,6 @@ jobs:
11021102
path: /tmp/artifacts
11031103
- store-npm-logs
11041104

1105-
run-launcher:
1106-
<<: *defaults
1107-
steps:
1108-
- attach_workspace:
1109-
at: ~/
1110-
- run:
1111-
command: node index.js
1112-
working_directory: packages/launcher
1113-
11141105
npm-webpack-preprocessor:
11151106
<<: *defaults
11161107
steps:
@@ -1846,9 +1837,6 @@ linux-workflow: &linux-workflow
18461837
- ui-components-integration-tests:
18471838
requires:
18481839
- build
1849-
- run-launcher:
1850-
requires:
1851-
- build
18521840

18531841
- npm-webpack-dev-server:
18541842
requires:
@@ -1898,7 +1886,6 @@ linux-workflow: &linux-workflow
18981886
- npm-rollup-dev-server
18991887
# - npm-vite-dev-server
19001888
- npm-webpack-dev-server
1901-
- run-launcher
19021889
- ui-components-integration-tests
19031890
- reporter-integration-tests
19041891
- Linux lint

‎npm/create-cypress-tests/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"mock-fs": "4.13.0",
3838
"shx": "0.3.3",
3939
"snap-shot-it": "7.9.3",
40-
"typescript": "4.0.3"
40+
"typescript": "^4.2.3"
4141
},
4242
"bin": {
4343
"create-cypress-tests": "dist/src/index.js"

‎npm/design-system/package.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,12 @@
5353
"rollup-plugin-postcss-modules": "2.0.2",
5454
"rollup-plugin-typescript2": "^0.29.0",
5555
"sass": "1.32.8",
56-
"typescript": "4.0.3",
57-
"vite": "2.1.3"
56+
"sass-loader": "10.1.1",
57+
"style-loader": "0.23.1",
58+
"svg-url-loader": "3.0.3",
59+
"typescript": "^4.2.3",
60+
"vite": "2.1.3",
61+
"webpack": "4.44.1"
5862
},
5963
"peerDependencies": {
6064
"react": "^=16.x || ^=17.x",

‎npm/react/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"style-loader": "0.23.1",
9191
"styled-components": "5.0.0",
9292
"svg-url-loader": "3.0.3",
93-
"typescript": "4.0.3",
93+
"typescript": "^4.2.3",
9494
"victory": "34.3.6",
9595
"webpack": "4.44.1",
9696
"webpack-cli": "3.3.9"

‎npm/vue/examples/cli-ts/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@vue/cli-plugin-babel": "~4.4.0",
2020
"@vue/cli-plugin-typescript": "~4.4.0",
2121
"@vue/cli-service": "~4.4.0",
22-
"typescript": "~3.9.3",
22+
"typescript": "^4.2.3",
2323
"vue-template-compiler": "^2.6.11"
2424
}
2525
}

‎npm/vue/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
"rollup-plugin-istanbul": "2.0.1",
4040
"rollup-plugin-typescript2": "^0.29.0",
4141
"tailwindcss": "1.1.4",
42-
"typescript": "3.9.6",
42+
"tslib": "^2.1.0",
43+
"typescript": "^4.2.3",
4344
"unfetch": "4.1.0",
4445
"vue": "2.6.12",
4546
"vue-i18n": "8.9.0",

‎npm/webpack-batteries-included-preprocessor/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"graphql": "14.0.0",
4141
"mocha": "^8.1.1",
4242
"react": "^16.13.1",
43-
"typescript": "^3.9.7"
43+
"typescript": "^4.2.3"
4444
},
4545
"peerDependencies": {
4646
"@cypress/webpack-preprocessor": "^5.4.4"

‎npm/webpack-dev-server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"chai": "^4.2.0",
2121
"mocha": "^8.1.3",
2222
"speed-measure-webpack-plugin": "1.4.2",
23-
"typescript": "^3.9.7",
23+
"typescript": "^4.2.3",
2424
"webpack": "^4.44.2",
2525
"webpack-dev-server": "^3.11.0"
2626
},

‎npm/webpack-preprocessor/examples/use-ts-loader/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"ts-loader": "7.0.4",
13-
"typescript": "3.9.2"
13+
"typescript": "^4.2.3"
1414
},
1515
"license": "ISC",
1616
"author": "",

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cypress",
3-
"version": "7.0.0",
3+
"version": "7.0.1",
44
"description": "Cypress.io end to end testing tool",
55
"private": true,
66
"scripts": {
@@ -191,7 +191,7 @@
191191
"terminal-banner": "1.1.0",
192192
"through": "2.3.8",
193193
"ts-node": "8.3.0",
194-
"typescript": "3.7.4"
194+
"typescript": "^4.2.3"
195195
},
196196
"engines": {
197197
"node": ">=14.16.0",

0 commit comments

Comments
 (0)