refactor(example-app): move application code to src folder

To be more in line with the NX defaults, the application files are moved to the ./src folder.

The tslint-to-eslint migration was failing.
Might have been due to being a flattened project.

Author: arjen.althoff

angular.json

@@ -1,12 +1,21 @@
 {
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
-  "newProjectRoot": "",
+  "cli": {
+    "analytics": false
+  },
+  "defaultProject": "example-app",
+  "schematics": {
+    "@nrwl/angular": {
+      "convert-tslint-to-eslint": {
+        "removeTSLintIfNoMoreTSLintTargets": true
+      }
+    }
+  },
   "projects": {
     "example-app": {
-      "root": "",
-      "sourceRoot": "apps/example-app",
       "projectType": "application",
+      "root": "apps/example-app",
+      "sourceRoot": "apps/example-app/src",
       "prefix": "app",
       "schematics": {},
       "architect": {
@@ -15,16 +24,16 @@
           "options": {
             "aot": true,
             "outputPath": "dist/apps/example-app",
-            "index": "apps/example-app/index.html",
-            "main": "apps/example-app/main.ts",
-            "polyfills": "apps/example-app/polyfills.ts",
-            "tsConfig": "apps/example-app/tsconfig.json",
+            "index": "apps/example-app/src/index.html",
+            "main": "apps/example-app/src/main.ts",
+            "polyfills": "apps/example-app/src/polyfills.ts",
+            "tsConfig": "apps/example-app/tsconfig.app.json",
             "assets": [
-              "apps/example-app/favicon.ico",
-              "apps/example-app/assets"
+              "apps/example-app/src/favicon.ico",
+              "apps/example-app/src/assets"
             ],
             "styles": [
-              "apps/example-app/styles.css"
+              "apps/example-app/src/styles.css"
             ],
             "scripts": []
           },
@@ -38,8 +47,8 @@
               ],
               "fileReplacements": [
                 {
-                  "replace": "apps/example-app/environments/environment.ts",
-                  "with": "apps/example-app/environments/environment.prod.ts"
+                  "replace": "apps/example-app/src/environments/environment.ts",
+                  "with": "apps/example-app/src/environments/environment.prod.ts"
                 }
               ],
               "optimization": true,
@@ -89,7 +98,7 @@
           "builder": "@nrwl/jest:jest",
           "options": {
             "jestConfig": "apps/example-app/jest.config.js",
-            "setupFile": "apps/example-app/test-setup.ts"
+            "setupFile": "apps/example-app/src/test-setup.ts"
           },
           "outputs": [
             "coverage/"
@@ -117,14 +126,12 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@nrwl/linter:eslint",
           "options": {
-            "tsConfig": [
-              "projects/testing-library/tsconfig.lib.json",
-              "projects/testing-library/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "projects/testing-library/src/**/*.ts",
+              "projects/testing-library/src/**/*.html",
+              "projects/testing-library/src/**/*.html"
             ]
           }
         },
@@ -180,14 +187,12 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@nrwl/linter:eslint",
           "options": {
-            "tsConfig": [
-              "projects/jest-utils/tsconfig.lib.json",
-              "projects/jest-utils/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "projects/jest-utils/src/**/*.ts",
+              "projects/jest-utils/src/**/*.html",
+              "projects/jest-utils/src/**/*.html"
             ]
           }
         },
@@ -214,9 +219,5 @@
         }
       }
     }
-  },
-  "defaultProject": "example-app",
-  "cli": {
-    "analytics": false
   }
-}
+}

apps/example-app/.browserslistrc

@@ -0,0 +1,17 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
+Firefox ESR
+not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

apps/example-app/jest.config.js

@@ -5,4 +5,5 @@ module.exports = {
     color: 'blue',
   },
   preset: '../../jest.preset.js',
+  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
 };

apps/example-app/app/app-routing.module.ts renamed to apps/example-app/src/app/app-routing.module.ts

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": [],
+    "allowJs": true
+  },
+  "files": ["src/main.ts", "src/polyfills.ts"]
+}

apps/example-app/app/app.component.css renamed to apps/example-app/src/app/app.component.css

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "include": ["**/*.ts"],
+  "compilerOptions": {
+    "types": ["jest", "node"]
+  }
+}

apps/example-app/app/app.component.html renamed to apps/example-app/src/app/app.component.html

@@ -1,14 +1,22 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/app",
-    "types": [],
-    "allowJs": true
-  },
+  "files": [],
+  "include": [],
+  "compilerOptions": {},
   "angularCompilerOptions": {
     "strictInjectionParameters": true,
     "strictInputAccessModifiers": true,
     "strictTemplates": true
   },
-  "files": ["main.ts", "polyfills.ts"]
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    },
+    {
+      "path": "./tsconfig.editor.json"
+    }
+  ]
 }

apps/example-app/app/app.component.ts renamed to apps/example-app/src/app/app.component.ts

@@ -1,9 +1,10 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["node", "jest"]
+    "types": ["jest", "node"]
   },
-  "files": ["test-setup.ts"],
+  "files": ["src/test-setup.ts"],
   "include": ["**/*.spec.ts", "**/*.d.ts"]
 }

apps/example-app/app/app.module.ts renamed to apps/example-app/src/app/app.module.ts

@@ -1,3 +1,3 @@
 module.exports = {
-  projects: ['<rootDir>/', '<rootDir>/projects/testing-library', '<rootDir>/projects/jest-utils'],
+  projects: ['<rootDir>/apps/example-app', '<rootDir>/projects/testing-library', '<rootDir>/projects/jest-utils'],
 };

apps/example-app/app/examples/00-single-component.spec.ts renamed to apps/example-app/src/app/examples/00-single-component.spec.ts

@@ -8,7 +8,6 @@ module.exports = {
   resolver: '@nrwl/jest/plugins/resolver',
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageReporters: ['html'],
-  setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
   snapshotSerializers: [
     'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
     'jest-preset-angular/build/AngularSnapshotSerializer.js',

apps/example-app/app/examples/00-single-component.ts renamed to apps/example-app/src/app/examples/00-single-component.ts

@@ -1,23 +1,18 @@
 {
-  "npmScope": "testing-library",
   "implicitDependencies": {
     "angular.json": "*",
     "package.json": "*",
     "tsconfig.json": "*",
     "tslint.json": "*",
     "nx.json": "*"
   },
+  "npmScope": "testing-library",
   "tasksRunnerOptions": {
     "default": {
       "runner": "@nrwl/nx-cloud",
       "options": {
         "accessToken": "M2Q4YjlkNjMtMzY1NC00ZjkwLTk1ZjgtZjg5Y2VkMzFjM2FifHJlYWQtd3JpdGU=",
-        "cacheableOperations": [
-          "build",
-          "test",
-          "lint",
-          "e2e"
-        ],
+        "cacheableOperations": ["build", "test", "lint", "e2e"],
         "canTrackAnalytics": false,
         "showUsageWarnings": true
       }

apps/example-app/app/examples/01-nested-component.spec.ts renamed to apps/example-app/src/app/examples/01-nested-component.spec.ts

@@ -45,19 +45,29 @@
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "0.1102.8",
+    "@angular-eslint/eslint-plugin": "~2.0.2",
+    "@angular-eslint/eslint-plugin-template": "~2.0.2",
+    "@angular-eslint/template-parser": "~2.0.2",
     "@angular/cli": "11.2.8",
     "@angular/compiler-cli": "11.2.9",
     "@angular/language-service": "11.2.9",
     "@nrwl/cli": "12.0.1",
+    "@nrwl/eslint-plugin-nx": "12.0.1",
     "@nrwl/jest": "12.0.1",
+    "@nrwl/linter": "12.0.1",
     "@nrwl/node": "12.0.1",
     "@nrwl/nx-plugin": "12.0.1",
     "@nrwl/workspace": "12.0.1",
     "@testing-library/jest-dom": "^5.11.0",
     "@types/jest": "~26.0.3",
     "@types/node": "14.14.37",
+    "@typescript-eslint/eslint-plugin": "4.19.0",
+    "@typescript-eslint/parser": "4.19.0",
     "codelyzer": "6.0.1",
     "cpy-cli": "^3.1.1",
+    "eslint": "7.22.0",
+    "eslint-config-prettier": "8.1.0",
+    "eslint-plugin-import": "latest",
     "husky": "^4.2.5",
     "jest": "^26.1.0",
     "jest-preset-angular": "8.3.2",
@@ -70,4 +80,4 @@
     "ts-node": "9.1.1",
     "typescript": "4.1.4"
   }
-}
+}