diff --git a/lib/dependencies.json b/lib/dependencies.json index 75f068e64..be7fbaae1 100644 --- a/lib/dependencies.json +++ b/lib/dependencies.json @@ -32,8 +32,7 @@ "cross-env": "^7.0.0", "cssnano": "^4.1.10", "css-loader": "^3.4.2", - "@cypress/webpack-preprocessor": "^4.1.2", - "cypress": "^4.0.2", + "cypress": "^4.5.0", "debounce": "^1.2.0", "del": "^5.1.0", "duplicate-package-checker-webpack-plugin": "^3.0.0", diff --git a/skeleton/cypress/package.json b/skeleton/cypress/package.json index f221c8e3e..820289616 100644 --- a/skeleton/cypress/package.json +++ b/skeleton/cypress/package.json @@ -4,11 +4,6 @@ "e2e:headless": "au cypress --start --run" }, "devDependencies": { - // @if feat.typescript - "@cypress/webpack-preprocessor": "", - "webpack": "", - "ts-loader": "", - // @endif "cypress": "" } } diff --git a/skeleton/cypress/test/e2e/plugins__if_babel/index.js b/skeleton/cypress/test/e2e/plugins/index.js similarity index 100% rename from skeleton/cypress/test/e2e/plugins__if_babel/index.js rename to skeleton/cypress/test/e2e/plugins/index.js diff --git a/skeleton/cypress/test/e2e/plugins__if_typescript/index.js b/skeleton/cypress/test/e2e/plugins__if_typescript/index.js deleted file mode 100644 index ddea35b09..000000000 --- a/skeleton/cypress/test/e2e/plugins__if_typescript/index.js +++ /dev/null @@ -1,34 +0,0 @@ -// *********************************************************** -// This example plugins/index.js can be used to load plugins -// -// You can change the location of this file or turn off loading -// the plugins file with the 'pluginsFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/plugins-guide -// *********************************************************** - -// This function is called when a project is opened or re-opened (e.g. due to -// the project's config changing) - -const wp = require('@cypress/webpack-preprocessor'); - -module.exports = (on) => { - const options = { - webpackOptions: { - resolve: { - extensions: ['.ts', '.tsx', '.js'] - }, - module: { - rules: [ - { - test: /\.tsx?$/, - loader: 'ts-loader', - options: { transpileOnly: true } - } - ] - } - } - }; - on('file:preprocessor', wp(options)); -}; diff --git a/skeleton/cypress/test/e2e/tsconfig.json__if_typescript b/skeleton/cypress/test/e2e/tsconfig.json__if_typescript index e6d3137f3..b618df09a 100644 --- a/skeleton/cypress/test/e2e/tsconfig.json__if_typescript +++ b/skeleton/cypress/test/e2e/tsconfig.json__if_typescript @@ -1,12 +1,9 @@ { "compilerOptions": { "strict": true, - "baseUrl": "../node_modules", + "module": "commonjs", + "baseUrl": "../../node_modules", "target": "es5", - "lib": [ - "es2015", - "dom" - ], "types": [ "cypress" ]