diff --git a/client/.eslintrc.js b/client/.eslintrc.js index a9ca06ad..5de6f54c 100644 --- a/client/.eslintrc.js +++ b/client/.eslintrc.js @@ -20,6 +20,7 @@ module.exports = { 'eslint:recommended', 'plugin:@typescript-eslint/eslint-recommended', 'prettier', + 'plugin:cypress/recommended', ], // required to lint *.vue files plugins: ['vue', '@typescript-eslint'], diff --git a/client/package-lock.json b/client/package-lock.json index 1ebaa7ea..0c51a931 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -5984,9 +5984,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001425", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001425.tgz", - "integrity": "sha512-/pzFv0OmNG6W0ym80P3NtapU0QEiDS3VuYAZMGoLLqiC7f6FJFe1MjpQDREGApeenD9wloeytmVDj+JLXPC6qw==", + "version": "1.0.30001486", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001486.tgz", + "integrity": "sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==", "funding": [ { "type": "opencollective", @@ -5995,6 +5995,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -23827,9 +23831,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001425", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001425.tgz", - "integrity": "sha512-/pzFv0OmNG6W0ym80P3NtapU0QEiDS3VuYAZMGoLLqiC7f6FJFe1MjpQDREGApeenD9wloeytmVDj+JLXPC6qw==" + "version": "1.0.30001486", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001486.tgz", + "integrity": "sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==" }, "caseless": { "version": "0.12.0", diff --git a/client/package.json b/client/package.json index 9398f0b7..e7ce3c92 100644 --- a/client/package.json +++ b/client/package.json @@ -110,8 +110,8 @@ "semver": "^5.3.0", "shelljs": "^0.8.5", "survey-knockout": "^1.9.41", - "typescript": "^4.6.4", "ts-loader": "^8.3.0", + "typescript": "^4.6.4", "uploadcare-widget": "^3.6.0", "url-loader": "^4.1.1", "vee-validate": "^4.5.10", diff --git a/client/tsconfig.app.json b/client/tsconfig.app.json new file mode 100644 index 00000000..4a672b84 --- /dev/null +++ b/client/tsconfig.app.json @@ -0,0 +1,17 @@ +{ + "compilerOptions": { + "allowJs": true, + "checkJs": false, + "resolveJsonModule": true, + "lib": ["es2017", "dom"], + "target": "es5", + "module": "es2022", + "strict": true, + "moduleResolution": "node", + "baseUrl": "./src", + "paths": { + "@/*": ["./*"] + } + }, + "exclude": ["./cypress"] +} diff --git a/client/tsconfig.cypress.json b/client/tsconfig.cypress.json new file mode 100644 index 00000000..f42a643e --- /dev/null +++ b/client/tsconfig.cypress.json @@ -0,0 +1,8 @@ +{ + "compilerOptions": { + "lib": ["es5", "dom"], + "target": "es5", + "types": ["cyress", "node"] + }, + "include": ["src/**/*.cy.js"] +} diff --git a/client/tsconfig.json b/client/tsconfig.json index 4a672b84..49b4ea47 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -1,17 +1,11 @@ { - "compilerOptions": { - "allowJs": true, - "checkJs": false, - "resolveJsonModule": true, - "lib": ["es2017", "dom"], - "target": "es5", - "module": "es2022", - "strict": true, - "moduleResolution": "node", - "baseUrl": "./src", - "paths": { - "@/*": ["./*"] + "files": [], + "references": [ + { + "path": "./tsconfig.app.json" + }, + { + "path": "./tsconfig.cypress.json" } - }, - "exclude": ["./cypress"] + ] }