Skip to content

Commit

Permalink
chore: update typescript (cypress-io#23523)
Browse files Browse the repository at this point in the history
* chore: update typescript

* use String()

Co-authored-by: Lachlan Miller <lachlan.miller.1990@outlook.com>

* use String()

Co-authored-by: Lachlan Miller <lachlan.miller.1990@outlook.com>

* use String()

Co-authored-by: Lachlan Miller <lachlan.miller.1990@outlook.com>

Co-authored-by: Lachlan Miller <lachlan.miller.1990@outlook.com>
  • Loading branch information
ZachJW34 and lmiller1990 authored Aug 24, 2022
1 parent f743a45 commit 7ddcc96
Show file tree
Hide file tree
Showing 20 changed files with 32 additions and 61 deletions.
2 changes: 1 addition & 1 deletion npm/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@angular/platform-browser-dynamic": "^14.0.6",
"@rollup/plugin-node-resolve": "^11.1.1",
"rollup-plugin-typescript2": "^0.29.0",
"typescript": "~4.2.3",
"typescript": "^4.7.4",
"zone.js": "~0.11.4"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion npm/create-cypress-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"mock-fs": "5.1.1",
"shx": "0.3.3",
"snap-shot-it": "7.9.3",
"typescript": "^4.2.3"
"typescript": "^4.7.4"
},
"files": [
"dist",
Expand Down
2 changes: 1 addition & 1 deletion npm/cypress-schematic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@types/node": "^18.0.6",
"chai": "4.2.0",
"mocha": "3.5.3",
"typescript": "~4.2.3"
"typescript": "^4.7.4"
},
"peerDependencies": {
"@angular/cli": ">=14.1.0",
Expand Down
2 changes: 1 addition & 1 deletion npm/mount-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {},
"devDependencies": {
"typescript": "^4.2.3"
"typescript": "^4.7.4"
},
"files": [
"dist"
Expand Down
2 changes: 1 addition & 1 deletion npm/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"rollup": "^2.38.5",
"rollup-plugin-typescript2": "^0.29.0",
"semver": "^7.3.2",
"typescript": "^4.2.3",
"typescript": "^4.7.4",
"vite": "3.0.3",
"vite-plugin-require-transform": "1.0.3"
},
Expand Down
2 changes: 1 addition & 1 deletion npm/react18/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"react-dom": "^16",
"rollup": "^2.38.5",
"rollup-plugin-typescript2": "^0.29.0",
"typescript": "^4.2.3"
"typescript": "^4.7.4"
},
"peerDependencies": {
"@types/react": "^18",
Expand Down
2 changes: 1 addition & 1 deletion npm/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"rollup-plugin-istanbul": "2.0.1",
"rollup-plugin-typescript2": "^0.29.0",
"tailwindcss": "1.1.4",
"typescript": "^4.2.3",
"typescript": "^4.7.4",
"vite": "3.0.3",
"vue": "3.2.31",
"vue-i18n": "9.0.0-rc.6",
Expand Down
2 changes: 1 addition & 1 deletion npm/vue2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@rollup/plugin-replace": "^2.3.1",
"rollup-plugin-typescript2": "^0.29.0",
"tslib": "^2.1.0",
"typescript": "^4.2.3",
"typescript": "^4.7.4",
"vue": "2.6.12"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions npm/webpack-batteries-included-preprocessor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"coffee-loader": "^0.9.0",
"coffeescript": "^1.12.7",
"pnp-webpack-plugin": "^1.7.0",
"ts-loader": "^8.0.2",
"ts-loader": "8.4.0",
"tsconfig-package": "npm:tsconfig@^7.0.0",
"tsconfig-paths-webpack-plugin": "^3.3.0",
"webpack": "^4.44.2"
Expand All @@ -41,7 +41,7 @@
"graphql": "14.0.0",
"mocha": "^8.1.1",
"react": "^16.13.1",
"typescript": "^4.2.3"
"typescript": "^4.7.4"
},
"peerDependencies": {
"@cypress/webpack-preprocessor": "^5.4.4"
Expand Down
4 changes: 2 additions & 2 deletions npm/webpack-preprocessor/examples/use-ts-loader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"types": "tsc --noEmit --lib es2015,dom --types cypress cypress/e2e/*.ts"
},
"devDependencies": {
"ts-loader": "7.0.4",
"typescript": "^4.2.3"
"ts-loader": "8.4.0",
"typescript": "^4.7.4"
},
"license": "ISC",
"keywords": []
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
"through2": "^4.0.2",
"tree-kill": "1.2.2",
"ts-node": "^10.2.1",
"typescript": "^4.4.4",
"typescript": "^4.7.4",
"yarn-deduplicate": "3.1.0"
},
"engines": {
Expand Down
6 changes: 3 additions & 3 deletions packages/driver/src/dom/elements/nativeProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const descriptor = <T extends keyof Window, K extends keyof Window[T]['prototype
const desc = Object.getOwnPropertyDescriptor(window[klass].prototype, prop)

if (desc === undefined) {
throw new Error(`Error, could not get property descriptor for ${klass} ${prop}. This should never happen`)
throw new Error(`Error, could not get property descriptor for ${klass} ${String(prop)}. This should never happen`)
}

return desc
Expand Down Expand Up @@ -238,7 +238,7 @@ export const getNativeProp = function<T, K extends keyof T> (obj: T, prop: K): T
if (!nativeProp) {
const props = _.keys(nativeGetters).join(', ')

throw new Error(`attempted to use a native getter prop called: ${prop}. Available props are: ${props}`)
throw new Error(`attempted to use a native getter prop called: ${String(prop)}. Available props are: ${props}`)
}

let retProp = nativeProp.call(obj, prop)
Expand All @@ -258,7 +258,7 @@ export const setNativeProp = function<T, K extends keyof T> (obj: T, prop: K, va
if (!nativeProp) {
const fns = _.keys(nativeSetters).join(', ')

throw new Error(`attempted to use a native setter prop called: ${prop}. Available props are: ${fns}`)
throw new Error(`attempted to use a native setter prop called: ${String(prop)}. Available props are: ${fns}`)
}

let retProp = nativeProp.call(obj, val)
Expand Down
2 changes: 1 addition & 1 deletion packages/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"rimraf": "3.0.2",
"sinon": "7.3.2",
"sinon-chai": "3.3.0",
"ts-loader": "8.0.13",
"ts-loader": "8.4.0",
"webextension-polyfill": "0.4.0",
"webpack": "4.44.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/launcher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"rimraf": "3.0.2",
"sinon": "^10.0.0",
"sinon-chai": "3.4.0",
"typescript": "^4.2.3"
"typescript": "^4.7.4"
},
"files": [
"index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/network/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"rimraf": "3.0.2",
"sinon": "7.3.1",
"sinon-chai": "3.3.0",
"typescript": "^4.2.3"
"typescript": "^4.7.4"
},
"files": [
"lib"
Expand Down
2 changes: 1 addition & 1 deletion packages/proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"express": "4.17.1",
"rimraf": "3.0.2",
"supertest": "6.0.1",
"typescript": "^4.2.3"
"typescript": "^4.7.4"
},
"files": [
"lib"
Expand Down
6 changes: 2 additions & 4 deletions packages/scaffold-config/src/frameworks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,9 @@ function getBundlerDependency (bundler: WizardBundler['type'], projectPath: stri
}
}

export const WIZARD_MOUNT_MODULES = ['cypress/react', 'cypress/react18', 'cypress/vue', 'cypress/vue2', 'cypress/angular'] as const
export type WizardMountModule = Awaited<ReturnType<typeof WIZARD_FRAMEWORKS[number]['mountModule']>>

export type WizardMountModule = 'cypress/react' | 'cypress/react18' | 'cypress/vue' | 'cypress/vue2' | 'cypress/angular'

const mountModule = (mountModule: WizardMountModule) => (projectPath: string) => Promise.resolve(mountModule)
const mountModule = <T extends string>(mountModule: T) => (projectPath: string) => Promise.resolve(mountModule)

const reactMountModule = async (projectPath: string) => {
const reactPkg = await isDependencyInstalled(dependencies.WIZARD_DEPENDENCY_REACT, projectPath)
Expand Down
2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
"supertest": "4.0.2",
"supertest-session": "4.0.0",
"through2": "2.0.5",
"ts-loader": "7.0.4",
"ts-loader": "8.4.0",
"tsconfig-paths": "3.10.1",
"tslint": "^6.1.3",
"webpack": "^4.44.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"devDependencies": {
"@types/node": "14.14.31",
"rimraf": "3.0.2",
"typescript": "^4.2.3"
"typescript": "^4.7.4"
},
"files": [
"src/*"
Expand Down
43 changes: 8 additions & 35 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -32761,32 +32761,10 @@ tryor@~0.1.2:
resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b"
integrity sha1-gUXkynyv9ArN48z5Rui4u3W0Fys=

ts-loader@7.0.4:
version "7.0.4"
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-7.0.4.tgz#5d9b95227de5afb91fdd9668f8920eb193cfe0cc"
integrity sha512-5du6OQHl+4ZjO4crEyoYUyWSrmmo7bAO+inkaILZ68mvahqrfoa4nn0DRmpQ4ruT4l+cuJCgF0xD7SBIyLeeow==
dependencies:
chalk "^2.3.0"
enhanced-resolve "^4.0.0"
loader-utils "^1.0.2"
micromatch "^4.0.0"
semver "^6.0.0"

ts-loader@8.0.13:
version "8.0.13"
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.13.tgz#2bebeb833570ca46bb9338322a9a29900e988535"
integrity sha512-1o1nO6aqouA23d2nlcMSEyPMAWRhnYUU0EQUJSc60E0TUyBNX792RHFYUN1ZM29vhMUNayrsbj2UVdZwKhXCDA==
dependencies:
chalk "^2.3.0"
enhanced-resolve "^4.0.0"
loader-utils "^1.0.2"
micromatch "^4.0.0"
semver "^6.0.0"

ts-loader@^8.0.2:
version "8.1.0"
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.1.0.tgz#d6292487df279c7cc79b6d3b70bb9d31682b693e"
integrity sha512-YiQipGGAFj2zBfqLhp28yUvPP9jUGqHxRzrGYuc82Z2wM27YIHbElXiaZDc93c3x0mz4zvBmS6q/DgExpdj37A==
ts-loader@8.4.0:
version "8.4.0"
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.4.0.tgz#e845ea0f38d140bdc3d7d60293ca18d12ff2720f"
integrity sha512-6nFY3IZ2//mrPc+ImY3hNWx1vCHyEhl6V+wLmL4CZcm6g1CqX7UKrkc6y0i4FwcfOhxyMPCfaEvh20f4r9GNpw==
dependencies:
chalk "^4.1.0"
enhanced-resolve "^4.0.0"
Expand Down Expand Up @@ -33115,15 +33093,10 @@ typescript-cached-transpile@^0.0.6:
fs-extra "^8.1.0"
tslib "^1.10.0"

typescript@^4.2.3, typescript@^4.4.4:
version "4.4.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c"
integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==

typescript@~4.2.3:
version "4.2.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
typescript@^4.7.4:
version "4.7.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==

ua-parser-js@0.7.24, ua-parser-js@^0.7.18:
version "0.7.24"
Expand Down

0 comments on commit 7ddcc96

Please sign in to comment.