feat: upgrade to angular v13 (#3062)

BREAKING CHANGE: Formly v6 now requires Angular Version >= 13 fix #3053, fix #3049, fix #2701, fix #2958
ngx-formly · Dec 1, 2021 · 7dbfdec · 7dbfdec
1 parent 43cce72
commit 7dbfdec
Show file tree

Hide file tree

Showing 130 changed files with 19,565 additions and 26,799 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,43 @@
+{
+  "root": true,
+  "ignorePatterns": ["projects/**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts"],
+      "parserOptions": {
+        "project": ["tsconfig.json", "tsconfig.spec.json"],
+        "createDefaultProgram": true
+      },
+      "extends": ["plugin:@angular-eslint/recommended", "plugin:@angular-eslint/template/process-inline-templates"],
+      "rules": {
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "prefix": "formly",
+            "style": "kebab-case",
+            "type": "element"
+          }
+        ],
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "prefix": "formly",
+            "style": "camelCase",
+            "type": "attribute"
+          }
+        ],
+        "@angular-eslint/no-conflicting-lifecycle": ["warn"],
+        "@angular-eslint/no-host-metadata-property": ["warn"],
+        "@angular-eslint/directive-class-suffix": ["off"],
+        "@angular-eslint/component-class-suffix": ["off"]
+      }
+    },
+    {
+      "files": ["*.html"],
+      "extends": ["plugin:@angular-eslint/template/recommended"],
+      "rules": {
+        "@angular-eslint/template/eqeqeq": ["warn"]
+      }
+    }
+  ]
+}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,6 +31,11 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '14'
+        registry-url: 'https://registry.npmjs.org'
+
     - name: Install Dependencies
       run: npm install
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,9 +27,9 @@ jobs:
           ${{ runner.os }}-
 
     # Setup .npmrc file to publish to npm
-    - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v2
       with:
-        node-version: '12.x'
+        node-version: '14'
         registry-url: 'https://registry.npmjs.org'
 
     - name: Install Dependencies

diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,7 @@ speed-measure-plugin*.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage
@@ -43,3 +44,5 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+
+.eslintcache
diff --git a/.husky/.gitignore b/.husky/.gitignore
@@ -0,0 +1 @@
+_
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no -- commitlint --edit ""
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged
diff --git a/.node-version b/.node-version
@@ -0,0 +1 @@
+14.15.5
diff --git a/.prettierignore b/.prettierignore
@@ -5,5 +5,6 @@
 /hooks
 /integration/**/dist
 /src/schematics/
+/.angular/
 **/test.ts
-**/*.md
+**/*.md
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ Formly is a dynamic (JSON powered) form library for Angular that bring unmatched
 
 | Angular version | Formly version         |
 | --------------- | ---------------------- |
-| Angular >= 11   | `@ngx-formly/core@6.x` |
+| Angular >= 13   | `@ngx-formly/core@6.x` |
 | Angular >= 7    | `@ngx-formly/core@5.x` |
 | Angular >= 6    | `@ngx-formly/core@4.x` |
 | Angular >= 5    | `@ngx-formly/core@3.x` |

diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md
@@ -1,6 +1,6 @@
 UPGRADE FROM 5.0 to 6.0
 =======================
-- Formly V6 now requires Angular Version >= 11
+- Formly V6 now requires Angular Version >= 13
 
 @ngx-formly/core
 ----------------

diff --git a/angular.json b/angular.json
@@ -22,10 +22,15 @@
             "main": "demo/src/main.ts",
             "polyfills": "demo/src/polyfills.ts",
             "tsConfig": "demo/tsconfig.app.json",
-            "aot": true,
             "assets": ["demo/src/favicon.ico", "demo/src/assets"],
             "styles": ["demo/src/styles.scss"],
-            "scripts": []
+            "scripts": [],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -55,7 +60,8 @@
                 }
               ]
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -75,10 +81,9 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": ["demo/tsconfig.app.json", "demo/tsconfig.spec.json", "demo/e2e/tsconfig.json"],
-            "exclude": ["**/node_modules/**"]
+            "lintFilePatterns": ["demo/**/*.ts", "demo/**/*.html"]
           }
         }
       }
@@ -93,15 +98,20 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "aot": true,
             "outputPath": "integration/ssr/dist/browser",
             "index": "integration/ssr/src/index.html",
             "main": "integration/ssr/src/main.ts",
             "polyfills": "integration/ssr/src/polyfills.ts",
             "tsConfig": "integration/ssr/tsconfig.app.json",
             "assets": ["integration/ssr/src/favicon.ico", "integration/ssr/src/assets"],
             "styles": ["integration/ssr/src/styles.css"],
-            "scripts": []
+            "scripts": [],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -115,7 +125,6 @@
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
@@ -131,7 +140,8 @@
                 }
               ]
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -144,19 +154,14 @@
             }
           }
         },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": ["integration/ssr/tsconfig.app.json", "integration/ssr/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
-          }
-        },
         "server": {
           "builder": "@angular-devkit/build-angular:server",
           "options": {
             "outputPath": "integration/ssr/dist/server",
             "main": "integration/ssr/server.ts",
-            "tsConfig": "integration/ssr/tsconfig.server.json"
+            "tsConfig": "integration/ssr/tsconfig.server.json",
+            "sourceMap": true,
+            "optimization": false
           },
           "configurations": {
             "production": {
@@ -168,7 +173,8 @@
               ],
               "optimization": true
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve-ssr": {
           "builder": "@nguniversal/builders:ssr-dev-server",
@@ -193,6 +199,12 @@
           "configurations": {
             "production": {}
           }
+        },
+        "lint": {
+          "builder": "@angular-eslint/builder:lint",
+          "options": {
+            "lintFilePatterns": ["integration/ssr/**/*.ts", "integration/ssr/**/*.html"]
+          }
         }
       }
     },
@@ -215,10 +227,9 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": ["src/core/tsconfig.lib.json", "src/core/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
+            "lintFilePatterns": ["src/core/**/*.ts", "src/core/**/*.html"]
           }
         }
       }
@@ -242,10 +253,9 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": ["src/ui/bootstrap/tsconfig.lib.json", "src/ui/bootstrap/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
+            "lintFilePatterns": ["src/ui/bootstrap/**/*.ts", "src/ui/bootstrap/**/*.html"]
           }
         }
       }
@@ -269,10 +279,9 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": ["src/ui/ionic/tsconfig.lib.json", "src/ui/ionic/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
+            "lintFilePatterns": ["src/ui/ionic/**/*.ts", "src/ui/ionic/**/*.html"]
           }
         }
       }
@@ -296,10 +305,9 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": ["src/ui/kendo/tsconfig.lib.json", "src/ui/kendo/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
+            "lintFilePatterns": ["src/ui/kendo/**/*.ts", "src/ui/kendo/**/*.html"]
           }
         }
       }
@@ -323,10 +331,9 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": ["src/ui/material/tsconfig.lib.json", "src/ui/material/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
+            "lintFilePatterns": ["src/ui/material/**/*.ts", "src/ui/material/**/*.html"]
           }
         }
       }
@@ -350,10 +357,9 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": ["src/ui/primeng/tsconfig.lib.json", "src/ui/primeng/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
+            "lintFilePatterns": ["src/ui/primeng/**/*.ts", "src/ui/primeng/**/*.html"]
           }
         }
       }
@@ -377,10 +383,9 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": ["src/ui/ng-zorro-antd/tsconfig.lib.json", "src/ui/ng-zorro-antd/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
+            "lintFilePatterns": ["src/ui/ng-zorro-antd/**/*.ts", "src/ui/ng-zorro-antd/**/*.html"]
           }
         }
       }
@@ -404,10 +409,9 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": ["src/ui/nativescript/tsconfig.lib.json", "src/ui/nativescript/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
+            "lintFilePatterns": ["src/ui/nativescript/**/*.ts", "src/ui/nativescript/**/*.html"]
           }
         }
       }
@@ -416,15 +420,16 @@
   "defaultProject": "app",
   "cli": {
     "analytics": false,
-    "packageManager": "npm"
+    "packageManager": "npm",
+    "defaultCollection": "@angular-eslint/schematics"
   },
   "schematics": {
     "@schematics/angular:component": {
-      "prefix": "demo",
+      "prefix": "formly",
       "style": "scss"
     },
     "@schematics/angular:directive": {
-      "prefix": "demo"
+      "prefix": "formly"
     }
   }
 }
diff --git a/build/build.ts b/build/build.ts
@@ -10,7 +10,11 @@ exec(`mkdir -p ${distDir}`);
 
 PACKAGES.map((name) => {
   // build package
-  exec(name === 'schematics' ? `ts-node --dir build schematics.ts` : `ng build --prod @ngx-formly/${name}`);
+  exec(
+    name === 'schematics'
+      ? `ts-node --dir build schematics.ts`
+      : `ng build --configuration production @ngx-formly/${name}`,
+  );
 
   const pkgDir = `${distDir}/${name}`;
   exec(`cp README.md ${pkgDir}`);

diff --git a/...ots/ssr_spec.ts/Server side rendering -- should render material ui (failed).png b/...ots/ssr_spec.ts/Server side rendering -- should render material ui (failed).png