fix(typescript): fix few typing conflicts by moving e2e files

The default cypress folder (out of test folder) can fix weird typing conflicts.

skeleton/common/tsconfig.json__if_typescript

@@ -16,15 +16,6 @@
 
     // @if feat.webpack
     "module": "esnext",
-    "skipLibCheck": true,
-    // @endif
-
-    // @if feat.cypress && feat.karma
-    "types": ["jasmine"],
-    // @endif
-
-    // @if feat.cypress && feat.jest && feat['cli-bundler']
-    "types": ["node", "jest"],
     // @endif
 
     // @if feat.protractor && feat.jest
@@ -56,8 +47,7 @@
     // @if feat.plugin
     "dev-app",
     // @endif
-    "test",
-    "types"
+    "test"
   ],
   "atom": {
     "rewriteTsconfig": false

skeleton/cypress/cypress.config.js

@@ -5,12 +5,6 @@ const HOST = CLIOptions.getFlagValue('host') || aureliaConfig.platform.host;
 
 module.exports = {
   config: {
-    baseUrl: `http://${HOST}:${PORT}`,
-    fixturesFolder: 'test/e2e/fixtures',
-    integrationFolder: 'test/e2e/integration',
-    pluginsFile: 'test/e2e/plugins/index.js',
-    screenshotsFolder: 'test/e2e/screenshots',
-    supportFile: 'test/e2e/support/index.js',
-    videosFolder: 'test/e2e/videos'
+    baseUrl: `http://${HOST}:${PORT}`
   }
 };

skeleton/cypress/test/e2e/tsconfig.json__if_typescript → skeleton/cypress/cypress/tsconfig.json__if_typescript

@@ -1,7 +1,8 @@
 {
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "strict": true,
-    "baseUrl": "../../node_modules",
+    "baseUrl": "../node_modules",
     "target": "es5",
     "types": [
       "cypress"

skeleton/protractor/e2e/tsconfig.json__if_typescript

@@ -0,0 +1,15 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "strict": true,
+    "baseUrl": "../node_modules",
+    "target": "es5",
+    "types": [
+      "node",
+      "jasmine"
+    ]
+  },
+  "include": [
+    "**/*.ts"
+  ]
+}

skeleton/protractor/protractor.conf.js

@@ -17,10 +17,10 @@ const config  = {
 
   specs: [
 // @if feat.babel
-    '**/*.e2e.js'
+    'e2e/**/*.e2e.js'
 // @endif
 // @if feat.typescript
-    '**/*.e2e.ts'
+    'e2e/**/*.e2e.ts'
 // @endif
   ],
 

skeleton/scaffold-minimum/test__if_protractor/e2e/demo.e2e.ext → skeleton/scaffold-minimum/e2e__if_protractor/demo.e2e.ext

@@ -1,6 +1,6 @@
 import {PageObjectWelcome} from './welcome.po';
 import {PageObjectSkeleton} from './skeleton.po';
-import {config} from '../../protractor.conf';
+import {config} from '../protractor.conf';
 // @if feat.typescript
 import {browser, element, by, By, $, $$, ExpectedConditions} from 'aurelia-protractor-plugin/protractor';
 // @endif

skeleton/scaffold-navigation/test__if_protractor/e2e/demo.e2e.ext → skeleton/scaffold-navigation/e2e__if_protractor/demo.e2e.ext

@@ -1,6 +1,6 @@
 import {PageObjectWelcome} from './welcome.po';
 import {PageObjectSkeleton} from './skeleton.po';
-import {config} from '../../protractor.conf';
+import {config} from '../protractor.conf';
 // @if feat.typescript
 import {browser, element, by, By, $, $$, ExpectedConditions} from 'aurelia-protractor-plugin/protractor';
 // @endif