upgrade nx to v13

4 years ago · 8a1ecc1488
8 changed files with 1289 additions and 2032 deletions
--- a/npm/ng-packs/angular.json
+++ b/npm/ng-packs/angular.json
@ -35,9 +35,12 @@
          "builder": "@nrwl/linter:eslint",
          "options": {
            "lintFilePatterns": ["packages/account/src/**/*.ts", "packages/account/src/**/*.html"]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
        }
-      }
+      },
+      "tags": [],
+      "implicitDependencies": ["core", "theme-shared", "account-core"]
    },
    "account-core": {
      "projectType": "library",
@ -76,9 +79,12 @@
              "packages/account-core/src/**/*.ts",
              "packages/account-core/src/**/*.html"
            ]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
        }
-      }
+      },
+      "tags": [],
+      "implicitDependencies": ["core", "theme-shared"]
    },
    "components": {
      "projectType": "library",
@ -117,9 +123,12 @@
              "packages/components/src/**/*.ts",
              "packages/components/src/**/*.html"
            ]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
        }
-      }
+      },
+      "tags": [],
+      "implicitDependencies": ["core", "theme-shared"]
    },
    "core": {
      "projectType": "library",
@ -155,9 +164,11 @@
          "builder": "@nrwl/linter:eslint",
          "options": {
            "lintFilePatterns": ["packages/core/src/**/*.ts", "packages/core/src/**/*.html"]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
        }
-      }
+      },
+      "tags": []
    },
    "dev-app": {
      "projectType": "application",
@ -307,9 +318,12 @@
          "builder": "@nrwl/linter:eslint",
          "options": {
            "lintFilePatterns": ["apps/dev-app-e2e/**/*.{js,ts}"]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
        }
-      }
+      },
+      "tags": [],
+      "implicitDependencies": ["dev-app"]
    },
    "feature-management": {
      "projectType": "library",
@ -348,9 +362,12 @@
              "packages/feature-management/src/**/*.ts",
              "packages/feature-management/src/**/*.html"
            ]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
        }
-      }
+      },
+      "tags": [],
+      "implicitDependencies": ["core", "theme-shared"]
    },
    "identity": {
      "projectType": "library",
@ -386,9 +403,12 @@
          "builder": "@nrwl/linter:eslint",
          "options": {
            "lintFilePatterns": ["packages/identity/src/**/*.ts", "packages/identity/src/**/*.html"]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
        }
-      }
+      },
+      "tags": [],
+      "implicitDependencies": ["core", "theme-shared", "permission-management"]
    },
    "permission-management": {
      "projectType": "library",
@ -427,9 +447,12 @@
              "packages/permission-management/src/**/*.ts",
              "packages/permission-management/src/**/*.html"
            ]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
        }
-      }
+      },
+      "tags": [],
+      "implicitDependencies": ["core", "theme-shared"]
    },
    "schematics": {
      "projectType": "library",
@ -452,9 +475,11 @@
              "packages/schematics/src/**/*.ts",
              "packages/schematics/src/**/*.html"
            ]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
        }
-      }
+      },
+      "tags": []
    },
    "setting-management": {
      "projectType": "library",
@ -493,9 +518,12 @@
              "packages/setting-management/src/**/*.ts",
              "packages/setting-management/src/**/*.html"
            ]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
        }
-      }
+      },
+      "tags": [],
+      "implicitDependencies": ["core", "theme-shared", "components"]
    },
    "tenant-management": {
      "projectType": "library",
@ -534,9 +562,12 @@
              "packages/tenant-management/src/**/*.ts",
              "packages/tenant-management/src/**/*.html"
            ]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
        }
-      }
+      },
+      "tags": [],
+      "implicitDependencies": ["core", "theme-shared", "feature-management"]
    },
    "theme-basic": {
      "projectType": "library",
@ -575,9 +606,12 @@
              "packages/theme-basic/src/**/*.ts",
              "packages/theme-basic/src/**/*.html"
            ]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
        }
-      }
+      },
+      "tags": [],
+      "implicitDependencies": ["core", "theme-shared", "account-core"]
    },
    "theme-shared": {
      "projectType": "library",
@ -616,42 +650,12 @@
              "packages/theme-shared/src/**/*.ts",
              "packages/theme-shared/src/**/*.html"
            ]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
        }
-      }
-    }
-  },
-  "cli": {
-    "analytics": false,
-    "defaultCollection": "@nrwl/angular"
-  },
-  "schematics": {
-    "@nrwl/angular": {
-      "application": {
-        "linter": "eslint"
      },
-      "library": {
-        "linter": "eslint"
-      },
-      "storybook-configuration": {
-        "linter": "eslint"
-      }
-    },
-    "@nrwl/angular:application": {
-      "style": "scss",
-      "linter": "eslint",
-      "unitTestRunner": "jest",
-      "e2eTestRunner": "cypress"
-    },
-    "@nrwl/angular:library": {
-      "style": "scss",
-      "linter": "eslint",
-      "unitTestRunner": "jest",
-      "strict": false
-    },
-    "@nrwl/angular:component": {
-      "style": "scss"
+      "tags": [],
+      "implicitDependencies": ["core"]
    }
-  },
-  "defaultProject": "dev-app"
+  }
 }
--- a/npm/ng-packs/apps/dev-app-e2e/src/plugins/index.js
+++ b/npm/ng-packs/apps/dev-app-e2e/src/plugins/index.js
@ -16,7 +16,5 @@ const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor');
 module.exports = (on, config) => {
  // `on` is used to hook into various events Cypress emits
  // `config` is the resolved Cypress config
-
  // Preprocess Typescript file using Nx helper
-  on('file:preprocessor', preprocessTypescript(config));
 };
--- a/npm/ng-packs/migrations.json
+++ b/npm/ng-packs/migrations.json
@ -0,0 +1,60 @@
+{
+  "migrations": [
+    {
+      "version": "13.0.0-beta.1",
+      "description": "Add default base to nx.json if its not currently set",
+      "factory": "./src/migrations/update-13-0-0/set-default-base-if-not-set",
+      "cli": "nx",
+      "package": "@nrwl/workspace",
+      "name": "set-default-base-if-not-set"
+    },
+    {
+      "version": "13.0.0-beta.4",
+      "description": "Move global settings into nx.json, and project specific settings into workspace.json",
+      "cli": "nx",
+      "implementation": "./src/migrations/update-13-0-0/config-locations/config-locations",
+      "package": "@nrwl/workspace",
+      "name": "13-0-0-config-locations"
+    },
+    {
+      "cli": "nx",
+      "version": "12.9.0",
+      "description": "Fixes invalid importPaths for buildable and publishable libs.",
+      "factory": "./src/migrations/update-12-9-0/update-invalid-import-paths",
+      "package": "@nrwl/angular",
+      "name": "update-invalid-import-paths"
+    },
+    {
+      "cli": "nx",
+      "version": "13.0.0-beta.10",
+      "description": "Adds postcss packages needed for Tailwind support if ng-packagr is already installed.",
+      "factory": "./src/migrations/update-13-0-0/add-postcss-packages",
+      "package": "@nrwl/angular",
+      "name": "add-postcss-packages"
+    },
+    {
+      "cli": "nx",
+      "version": "12.8.0-beta.0",
+      "description": "Remove Typescript Preprocessor Plugin",
+      "factory": "./src/migrations/update-12-8-0/remove-typescript-plugin",
+      "package": "@nrwl/cypress",
+      "name": "remove-typescript-plugin"
+    },
+    {
+      "cli": "nx",
+      "version": "12.9.0-beta.0",
+      "description": "Add outputs for caching",
+      "factory": "./src/migrations/update-12-9-0/add-outputs",
+      "package": "@nrwl/linter",
+      "name": "add-outputs"
+    },
+    {
+      "cli": "nx",
+      "version": "12.9.0-beta.0",
+      "description": "Remove ESLint parserOptions.project config if no rules requiring type-checking are in use",
+      "factory": "./src/migrations/update-12-4-0/remove-eslint-project-config-if-no-type-checking-rules",
+      "package": "@nrwl/linter",
+      "name": "remove-eslint-project-config-if-no-type-checking-rules-again"
+    }
+  ]
+}
--- a/npm/ng-packs/nx.json
+++ b/npm/ng-packs/nx.json
@ -30,59 +30,37 @@
    "libsDir": "packages",
    "appsDir": ""
  },
-  "projects": {
-    "account-core": {
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared"]
-    },
-    "account": {
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared", "account-core"]
-    },
-    "components": {
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared"]
-    },
-    "core": {
-      "tags": []
-    },
-    "dev-app": {
-      "tags": []
-    },
-    "dev-app-e2e": {
-      "tags": [],
-      "implicitDependencies": ["dev-app"]
-    },
-    "feature-management": {
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared"]
-    },
-    "identity": {
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared", "permission-management"]
-    },
-    "permission-management": {
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared"]
-    },
-    "schematics": {
-      "tags": []
-    },
-    "setting-management": {
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared", "components"]
+  "cli": {
+    "analytics": false,
+    "defaultCollection": "@nrwl/angular"
+  },
+  "defaultProject": "dev-app",
+  "generators": {
+    "@nrwl/angular": {
+      "application": {
+        "linter": "eslint"
+      },
+      "library": {
+        "linter": "eslint"
+      },
+      "storybook-configuration": {
+        "linter": "eslint"
+      }
    },
-    "tenant-management": {
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared", "feature-management"]
+    "@nrwl/angular:application": {
+      "style": "scss",
+      "linter": "eslint",
+      "unitTestRunner": "jest",
+      "e2eTestRunner": "cypress"
    },
-    "theme-basic": {
-      "tags": [],
-      "implicitDependencies": ["core", "theme-shared", "account-core"]
+    "@nrwl/angular:library": {
+      "style": "scss",
+      "linter": "eslint",
+      "unitTestRunner": "jest",
+      "strict": false
    },
-    "theme-shared": {
-      "tags": [],
-      "implicitDependencies": ["core"]
+    "@nrwl/angular:component": {
+      "style": "scss"
    }
  }
 }
--- a/npm/ng-packs/package.json
+++ b/npm/ng-packs/package.json
@ -49,70 +49,75 @@
    "@abp/ng.theme.basic": "~5.0.0-beta.3",
    "@abp/ng.theme.shared": "~5.0.0-beta.3",
    "@abp/utils": "~5.0.0-beta.3",
-    "@angular-devkit/build-angular": "~12.2.0",
+    "@angular-devkit/build-angular": "12.2.13",
    "@angular-devkit/build-ng-packagr": "^0.1002.0",
    "@angular-devkit/schematics-cli": "~12.2.0",
    "@angular-eslint/eslint-plugin": "~12.3.0",
    "@angular-eslint/eslint-plugin-template": "~12.3.0",
    "@angular-eslint/template-parser": "~12.3.0",
-    "@angular/animations": "~12.2.0",
-    "@angular/cli": "~12.2.0",
-    "@angular/common": "~12.2.0",
-    "@angular/compiler": "~12.2.0",
-    "@angular/compiler-cli": "^12.2.0",
-    "@angular/core": "~12.2.0",
-    "@angular/forms": "~12.2.0",
-    "@angular/language-service": "^12.2.0",
-    "@angular/platform-browser": "~12.2.0",
-    "@angular/platform-browser-dynamic": "~12.2.0",
-    "@angular/router": "~12.2.0",
+    "@angular/animations": "12.2.13",
+    "@angular/cli": "12.2.13",
+    "@angular/common": "12.2.13",
+    "@angular/compiler": "12.2.13",
+    "@angular/compiler-cli": "12.2.13",
+    "@angular/core": "12.2.13",
+    "@angular/forms": "12.2.13",
+    "@angular/language-service": "12.2.13",
+    "@angular/platform-browser": "12.2.13",
+    "@angular/platform-browser-dynamic": "12.2.13",
+    "@angular/router": "12.2.13",
    "@fortawesome/fontawesome-free": "^5.15.4",
    "@ng-bootstrap/ng-bootstrap": "^11.0.0-beta.2",
    "@ngneat/spectator": "^8.0.3",
    "@ngx-validate/core": "^0.0.13",
-    "@nrwl/angular": "12.6.5",
-    "@nrwl/cli": "12.6.5",
-    "@nrwl/cypress": "12.6.5",
-    "@nrwl/eslint-plugin-nx": "12.6.5",
-    "@nrwl/jest": "12.6.5",
-    "@nrwl/linter": "12.6.5",
-    "@nrwl/tao": "12.6.5",
-    "@nrwl/workspace": "12.6.5",
+    "@nrwl/angular": "13.1.3",
+    "@nrwl/cli": "13.1.3",
+    "@nrwl/cypress": "13.1.3",
+    "@nrwl/eslint-plugin-nx": "13.1.3",
+    "@nrwl/jest": "13.1.3",
+    "@nrwl/linter": "13.1.3",
+    "@nrwl/tao": "13.1.3",
+    "@nrwl/workspace": "13.1.3",
    "@schematics/angular": "~12.2.0",
    "@swimlane/ngx-datatable": "^19.0.0",
-    "@types/jest": "26.0.24",
+    "@types/jest": "27.0.2",
    "@types/node": "14.14.33",
-    "@typescript-eslint/eslint-plugin": "~4.28.3",
-    "@typescript-eslint/parser": "~4.28.3",
+    "@typescript-eslint/eslint-plugin": "4.33.0",
+    "@typescript-eslint/parser": "4.33.0",
    "angular-oauth2-oidc": "^12.1.0",
    "bootstrap": "^5.1.1",
    "chart.js": "^3.5.1",
    "cypress": "^7.3.0",
-    "dotenv": "~10.0.0",
-    "eslint": "7.22.0",
+    "dotenv": "10.0.0",
+    "eslint": "7.32.0",
    "eslint-config-prettier": "8.1.0",
    "eslint-plugin-cypress": "^2.10.3",
    "got": "^11.5.2",
-    "jest": "27.0.3",
+    "jest": "27.2.3",
    "jest-canvas-mock": "^2.3.1",
-    "jest-preset-angular": "9.0.4",
+    "jest-preset-angular": "10.0.1",
    "jsonc-parser": "^2.3.0",
    "just-clone": "^3.2.1",
    "just-compare": "^1.4.0",
    "lerna": "^4.0.0",
-    "ng-packagr": "^12.2.0",
+    "ng-packagr": "12.2.5",
    "ng-zorro-antd": "^12.0.1",
+    "postcss": "^8.3.9",
+    "postcss-import": "^14.0.2",
+    "postcss-preset-env": "^6.7.0",
+    "postcss-url": "^10.1.1",
    "prettier": "^2.3.1",
    "protractor": "~7.0.0",
    "rxjs": "~6.6.0",
    "should-quote": "^1.0.0",
-    "ts-jest": "27.0.3",
+    "ts-jest": "27.0.5",
    "ts-node": "~9.1.1",
    "ts-toolbelt": "6.15.4",
    "tsickle": "^0.39.1",
    "tslib": "^2.0.0",
    "tslint": "~6.1.0",
-    "typescript": "~4.3.5",
+    "typescript": "4.3.5",
    "zone.js": "~0.11.4"
-  }
+  },
+  "dependencies": {}
 }
--- a/npm/ng-packs/packages/schematics/.eslintrc.json
+++ b/npm/ng-packs/packages/schematics/.eslintrc.json
@ -46,4 +46,4 @@
      "rules": {}
    }
  ]
-}
+}
--- a/npm/ng-packs/tools/tsconfig.tools.json
+++ b/npm/ng-packs/tools/tsconfig.tools.json
@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
  "compilerOptions": {
    "outDir": "../dist/out-tsc/tools",
    "rootDir": ".",
--- a/npm/ng-packs/yarn.lock
+++ b/npm/ng-packs/yarn.lock