chore(angular): update project structure to match the cli

Author: DanielHabenicht

Phonebook.Frontend/.gitignore

@@ -1,13 +1,18 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-dist/
+/dist
 /tmp
 /out-tsc
-/src/changelog.md
+# Only exists if Bazel was run
+/bazel-out
 
 # dependencies
-node_modules/
+/node_modules
+
+# profiling files
+chrome-profiler-events.json
+speed-measure-plugin.json
 
 # IDEs and editors
 /.idea
@@ -24,23 +29,28 @@ node_modules/
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+.history/*
 
 # misc
 /.sass-cache
 /connect.lock
 /coverage
 /libpeerconnection.log
 npm-debug.log
+yarn-error.log
 testem.log
 /typings
-yarn-error.log
 key.pem
 cert.pem
 
-# e2e
-/e2e/*.js
-/e2e/*.map
-
 # System Files
 .DS_Store
-Thumbs.db
+Thumbs.db
+
+
+# Custom Settings
+
+/src/changelog.md
+
+## e2e
+/e2e/*.map

Phonebook.Frontend/angular.json

@@ -14,7 +14,7 @@
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
             "polyfills": "src/polyfills.ts",
             "assets": [
               "src/assets",
@@ -79,7 +79,7 @@
             "index": "src/index.html",
             "main": "src/main.ts",
             "showCircularDependencies": true,
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "tsconfig.app.json",
             "polyfills": "src/polyfills.ts",
             "assets": [
               "src/assets",
@@ -112,7 +112,8 @@
                 "replace": "src/environments/environment.ts",
                 "with": "src/environments/environment.prod.ts"
               }
-            ]
+            ],
+            "webWorkerTsConfig": "tsconfig.worker.json"
           },
           "configurations": {
             "en": {
@@ -172,7 +173,7 @@
             "main": "src/test.ts",
             "karmaConfig": "./karma.conf.js",
             "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
+            "tsConfig": "tsconfig.spec.json",
             "scripts": [],
             "sourceMap": false,
             "styles": [
@@ -196,38 +197,22 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json",
+              "tsconfig.worker.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
-        }
-      }
-    },
-    "phonebook-e2e": {
-      "root": "",
-      "sourceRoot": "",
-      "projectType": "application",
-      "architect": {
+        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
-            "protractorConfig": "./protractor.conf.js",
+            "protractorConfig": "e2e/protractor.conf.js",
             "devServerTarget": "phonebook:serve"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "e2e/tsconfig.e2e.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }

Phonebook.Frontend/protractor.conf.js Phonebook.Frontend/e2e/protractor.conf.jsPhonebook.Frontend/protractor.conf.js renamed to Phonebook.Frontend/e2e/protractor.conf.js

@@ -6,9 +6,12 @@ process.env.CHROME_BIN = require('puppeteer').executablePath();
 
 const { SpecReporter } = require('jasmine-spec-reporter');
 
+/**
+ * @type { import("protractor").Config }
+ */
 exports.config = {
   allScriptsTimeout: 11000,
-  specs: ['./e2e/**/*.e2e-spec.ts'],
+  specs: ['./src/e2e/**/*.e2e-spec.ts'],
   capabilities: {
     browserName: 'chrome',
     binary: process.env.CHROME_BIN,
@@ -26,7 +29,7 @@ exports.config = {
   },
   onPrepare() {
     require('ts-node').register({
-      project: 'e2e/tsconfig.e2e.json'
+      project: require('path').join(__dirname, './tsconfig.json')
     });
     jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
   },

Phonebook.Frontend/e2e/app.e2e-spec.ts …onebook.Frontend/e2e/src/app.e2e-spec.tsPhonebook.Frontend/e2e/app.e2e-spec.ts renamed to Phonebook.Frontend/e2e/src/app.e2e-spec.ts Phonebook.Frontend/e2e/app.e2e-spec.ts renamed to Phonebook.Frontend/e2e/src/app.e2e-spec.ts

@@ -2,13 +2,8 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
-    "baseUrl": "./",
     "module": "commonjs",
     "target": "es5",
-    "types": [
-      "jasmine",
-      "jasminewd2",
-      "node"
-    ]
+    "types": ["jasmine", "jasminewd2", "node"]
   }
-}
+}

Phonebook.Frontend/e2e/app.po.ts Phonebook.Frontend/e2e/src/app.po.tsPhonebook.Frontend/e2e/app.po.ts renamed to Phonebook.Frontend/e2e/src/app.po.ts

@@ -1,22 +1,18 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/app",
-    "types": [
-      "node"
-    ],
-    "strict": true,
-    "strictNullChecks": true,
-    "noImplicitAny": false
-  },
-  "angularCompilerOptions": {
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true,
-    "preserveWhitespaces": false,
-    "strictPropertyInitialization": false
-  },
-  "exclude": [
-    "test.ts",
-    "**/*.spec.ts"
-  ]
-}
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/app",
+    "types": [],
+    "strict": true,
+    "strictNullChecks": true,
+    "noImplicitAny": false
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true,
+    "preserveWhitespaces": false,
+    "strictPropertyInitialization": false
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["src/test.ts", "src/**/*.spec.ts", "src/**/*.worker.ts"]
+}

Phonebook.Frontend/e2e/tsconfig.e2e.json Phonebook.Frontend/e2e/tsconfig.jsonPhonebook.Frontend/e2e/tsconfig.e2e.json renamed to Phonebook.Frontend/e2e/tsconfig.json

@@ -2,22 +2,17 @@
   "compileOnSave": false,
   "compilerOptions": {
     "baseUrl": "./",
-    "downlevelIteration": true,
-    "module": "esnext",
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
+    "module": "esnext",
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "importHelpers": true,
     "target": "es2015",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2017",
-      "dom"
-    ],
-    "paths": {}
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2018", "dom"],
+    "downlevelIteration": true
   }
-}
+}

Phonebook.Frontend/src/tsconfig.spec.json

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/spec",
+    "types": ["jasmine", "node"]
+  },
+  "files": ["src/test.ts", "src/polyfills.ts"],
+  "include": ["src/**/*.spec.ts", "src/**/*.d.ts"]
+}