feat: updated to angular 14 (#15)

* build: update dependencies * build: ran nx migrations * build: angular build fixes * build: nest build fixes * build: nx build config fix - added targetDefaults * build: nx build config fix * build: nx build cache fixes * fix: test fix * build: nx build fix * build: angular-calendar jest fix * build: setup-script.sh update - test-setup-script now runs in parallel with tests * build: changed build target structure - "build" target no longer attempts to build children, aside from the "safe" build-base. Projects that need to be built should have build called on them directly. - added "build-all" target to workspace to facilitate building all components first before deploying. * build: ideal build BREAKING CHANGES: - angular 14 - nestjs 9
dereekb · Aug 13, 2022 · 739726e · 739726e
1 parent 9f128b3
commit 739726e
Show file tree

Hide file tree

Showing 63 changed files with 25,937 additions and 12,659 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,7 +10,7 @@ defaults: &defaults
 # https://circleci.com/blog/config-best-practices-dependency-caching/
 
 orbs:
-  nx: nrwl/nx@1.1.3
+  nx: nrwl/nx@1.6.0
   node: circleci/[email protected]
 jobs:
   build:
@@ -21,8 +21,10 @@ jobs:
       - node/install-packages
       # initialize nx
       - nx/set-shas
-      # build content
-      - run: npx nx affected --base=$NX_BASE --target=build --parallel --max-parallel=2
+      # builds everything in the project in order
+      - run: 
+          name: build
+          command: npx nx run workspace:build-all
       # persist builds to workspace
       - persist_to_workspace:
           root: ~/code
@@ -116,8 +118,11 @@ jobs:
           name: run setup-project.sh script
           command: cd setup && ./setup-project.sh myprojectapp myproject myproject 9200 ~/setup-test
       - run:
-          name: replace test project's @dereekb in node_modules with generated packages
+          name: replace test project's @dereekb in node_modules with generated packages (we don't want symlinks)
           command: rm -r ~/setup-test/myproject/node_modules/@dereekb && cp -r dist/packages ~/setup-test/myproject/node_modules/@dereekb
+      - run:
+          name: Try build components
+          command: cd ~/setup-test/myproject && npx nx run-many --target=build-base --projects=myproject-firebase,myproject-components
       - run:
           name: Try build
           command: cd ~/setup-test/myproject && npx -y nx build myproject && npx -y nx build myproject-api
@@ -203,8 +208,6 @@ workflows:
       - test-setup-script:
           requires:
             - build
-            - test-with-node
-            - test-with-node-firebase
       - run-release-and-push-to-main:
           requires:
             - build

diff --git a/apps/demo-api/project.json b/apps/demo-api/project.json
@@ -1,9 +1,11 @@
 {
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/demo-api/src",
   "projectType": "application",
   "targets": {
     "build": {
       "executor": "@nrwl/workspace:run-commands",
+      "outputs": ["dist/apps/demo-api"],
       "options": {
         "command": "npx nx run demo-api:build-base",
         "color": true
@@ -12,12 +14,6 @@
     "build-base": {
       "executor": "@nrwl/node:webpack",
       "outputs": ["{options.outputPath}"],
-      "dependsOn": [
-        {
-          "target": "build",
-          "projects": "dependencies"
-        }
-      ],
       "options": {
         "outputPath": "dist/apps/demo-api",
         "main": "apps/demo-api/src/main.ts",
@@ -101,12 +97,6 @@
     },
     "ci-deploy": {
       "executor": "@nrwl/workspace:run-commands",
-      "dependsOn": [
-        {
-          "target": "build",
-          "projects": "self"
-        }
-      ],
       "options": {
         "commands": [
           {

diff --git a/apps/demo-e2e/project.json b/apps/demo-e2e/project.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/demo-e2e/src",
   "projectType": "application",
   "targets": {

diff --git a/apps/demo/project.json b/apps/demo/project.json
@@ -1,10 +1,12 @@
 {
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "apps/demo/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@nrwl/workspace:run-commands",
+      "outputs": ["dist/apps/demo"],
       "options": {
         "command": "npx nx run demo:build-base",
         "color": true
@@ -13,12 +15,6 @@
     "build-base": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
-      "dependsOn": [
-        {
-          "target": "build",
-          "projects": "dependencies"
-        }
-      ],
       "options": {
         "outputPath": "dist/apps/demo",
         "index": "apps/demo/src/index.html",
@@ -36,7 +32,7 @@
             "output": "assets/dbx-firebase"
           }
         ],
-        "allowedCommonJsDependencies": ["validator", "date-fns-tz"],
+        "allowedCommonJsDependencies": ["lodash", "make-error", "validator", "date-fns-tz"],
         "stylePreprocessorOptions": {
           "includePaths": ["packages"]
         },
@@ -114,24 +110,12 @@
     },
     "deploy": {
       "executor": "@nrwl/workspace:run-commands",
-      "dependsOn": [
-        {
-          "target": "build",
-          "projects": "self"
-        }
-      ],
       "options": {
         "command": "npx firebase --project=default deploy --only hosting"
       }
     },
     "ci-deploy": {
       "executor": "@nrwl/workspace:run-commands",
-      "dependsOn": [
-        {
-          "target": "build",
-          "projects": "self"
-        }
-      ],
       "options": {
         "command": "npx firebase --project=default deploy --only hosting --token \"$FIREBASE_TOKEN\""
       }

diff --git a/apps/demo/tsconfig.app.json b/apps/demo/tsconfig.app.json
@@ -2,11 +2,8 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    /* 
-      Add jest types to avoid angular compiler issues when importing from util.
-    */
     "types": ["segment-analytics", "jest"],
-    "target": "ES2017"
+    "target": "es2020"
   },
   "files": ["src/main.ts", "src/polyfills.ts"],
   "include": ["src/**/*.d.ts"],

diff --git a/apps/demo/tsconfig.json b/apps/demo/tsconfig.json
@@ -19,7 +19,8 @@
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
     "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "target": "es2020"
   },
   "angularCompilerOptions": {
     "strictInjectionParameters": true,

diff --git a/components/demo-components/package.json b/components/demo-components/package.json
@@ -2,8 +2,8 @@
   "name": "@dereekb/demo-components",
   "version": "8.15.2",
   "peerDependencies": {
-    "@angular/common": "^13.3.0",
-    "@angular/core": "^13.3.0"
+    "@angular/common": "^14.0.0",
+    "@angular/core": "^14.0.0"
   },
   "dependencies": {
     "tslib": "^2.3.0"

diff --git a/components/demo-components/project.json b/components/demo-components/project.json
@@ -1,10 +1,12 @@
 {
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "library",
   "sourceRoot": "components/demo-components/src",
   "prefix": "demo",
   "targets": {
     "build": {
       "executor": "@nrwl/workspace:run-commands",
+      "outputs": ["dist/components/demo-components"],
       "options": {
         "command": "npx nx run demo-components:build-base",
         "color": true

diff --git a/components/demo-components/tsconfig.json b/components/demo-components/tsconfig.json
@@ -19,7 +19,8 @@
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
     "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "target": "es2020"
   },
   "angularCompilerOptions": {
     "strictInjectionParameters": true,

diff --git a/components/demo-firebase/project.json b/components/demo-firebase/project.json
@@ -1,9 +1,11 @@
 {
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "components/demo-firebase/src",
   "projectType": "library",
   "targets": {
     "build": {
       "executor": "@nrwl/workspace:run-commands",
+      "outputs": ["dist/components/demo-firebase"],
       "options": {
         "command": "npx nx run demo-firebase:build-base",
         "color": true

diff --git a/jest.resolver.js b/jest.resolver.js
@@ -50,6 +50,13 @@ module.exports = (path, options) => {
         // console.log('>>>', pkg.name)
         delete pkg['exports'];
         delete pkg['module'];
+      } else if (pkg.name === 'angular-calendar') {
+        // TEMPORARY: remove if/when https://github.com/mattlewis92/angular-calendar/pull/1599 is accepted
+        pkg['exports']['./date-adapters/date-fns'] = {
+          main: './date-adapters/date-fns/index.js',
+          types: './date-adapters/date-fns/index.d.ts',
+          default: './date-adapters/date-fns/index.js'
+        };
       }
 
       return pkg;