Browse Source

Run nx migrate latest

pull/14077/head
Mahmut Gundogdu 3 years ago
parent
commit
f74aa1500d
  1. 40
      npm/ng-packs/angular.json
  2. 3
      npm/ng-packs/apps/dev-app/jest.config.ts
  3. 3
      npm/ng-packs/apps/dev-app/tsconfig.app.json
  4. 3
      npm/ng-packs/apps/dev-app/tsconfig.json
  5. 2
      npm/ng-packs/apps/dev-app/tsconfig.spec.json
  6. 2
      npm/ng-packs/jest.config.ts
  7. 2
      npm/ng-packs/jest.preset.js
  8. 215
      npm/ng-packs/migrations.json
  9. 24
      npm/ng-packs/nx.json
  10. 80
      npm/ng-packs/package.json
  11. 3
      npm/ng-packs/packages/account-core/jest.config.ts
  12. 5
      npm/ng-packs/packages/account-core/tsconfig.json
  13. 4
      npm/ng-packs/packages/account-core/tsconfig.lib.json
  14. 2
      npm/ng-packs/packages/account-core/tsconfig.spec.json
  15. 3
      npm/ng-packs/packages/account/jest.config.ts
  16. 8
      npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.ts
  17. 6
      npm/ng-packs/packages/account/src/lib/components/forgot-password/forgot-password.component.ts
  18. 6
      npm/ng-packs/packages/account/src/lib/components/login/login.component.ts
  19. 4
      npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts
  20. 6
      npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts
  21. 6
      npm/ng-packs/packages/account/src/lib/components/register/register.component.ts
  22. 6
      npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.ts
  23. 5
      npm/ng-packs/packages/account/tsconfig.json
  24. 4
      npm/ng-packs/packages/account/tsconfig.lib.json
  25. 2
      npm/ng-packs/packages/account/tsconfig.spec.json
  26. 3
      npm/ng-packs/packages/components/jest.config.ts
  27. 5
      npm/ng-packs/packages/components/tsconfig.json
  28. 4
      npm/ng-packs/packages/components/tsconfig.lib.json
  29. 2
      npm/ng-packs/packages/components/tsconfig.spec.json
  30. 3
      npm/ng-packs/packages/core/jest.config.ts
  31. 8
      npm/ng-packs/packages/core/src/lib/directives/form-submit.directive.ts
  32. 3
      npm/ng-packs/packages/core/tsconfig.json
  33. 4
      npm/ng-packs/packages/core/tsconfig.lib.json
  34. 2
      npm/ng-packs/packages/core/tsconfig.spec.json
  35. 3
      npm/ng-packs/packages/feature-management/jest.config.ts
  36. 5
      npm/ng-packs/packages/feature-management/tsconfig.json
  37. 4
      npm/ng-packs/packages/feature-management/tsconfig.lib.json
  38. 2
      npm/ng-packs/packages/feature-management/tsconfig.spec.json
  39. 3
      npm/ng-packs/packages/identity/jest.config.ts
  40. 4
      npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts
  41. 10
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
  42. 5
      npm/ng-packs/packages/identity/tsconfig.json
  43. 4
      npm/ng-packs/packages/identity/tsconfig.lib.json
  44. 2
      npm/ng-packs/packages/identity/tsconfig.spec.json
  45. 3
      npm/ng-packs/packages/permission-management/jest.config.ts
  46. 5
      npm/ng-packs/packages/permission-management/tsconfig.json
  47. 4
      npm/ng-packs/packages/permission-management/tsconfig.lib.json
  48. 2
      npm/ng-packs/packages/permission-management/tsconfig.spec.json
  49. 3
      npm/ng-packs/packages/schematics/jest.config.ts
  50. 4
      npm/ng-packs/packages/schematics/tsconfig.json
  51. 8
      npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts
  52. 3
      npm/ng-packs/packages/setting-management/jest.config.ts
  53. 5
      npm/ng-packs/packages/setting-management/tsconfig.json
  54. 4
      npm/ng-packs/packages/setting-management/tsconfig.lib.json
  55. 2
      npm/ng-packs/packages/setting-management/tsconfig.spec.json
  56. 3
      npm/ng-packs/packages/tenant-management/jest.config.ts
  57. 6
      npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
  58. 5
      npm/ng-packs/packages/tenant-management/tsconfig.json
  59. 4
      npm/ng-packs/packages/tenant-management/tsconfig.lib.json
  60. 2
      npm/ng-packs/packages/tenant-management/tsconfig.spec.json
  61. 3
      npm/ng-packs/packages/theme-basic/jest.config.ts
  62. 3
      npm/ng-packs/packages/theme-basic/tsconfig.json
  63. 4
      npm/ng-packs/packages/theme-basic/tsconfig.lib.json
  64. 2
      npm/ng-packs/packages/theme-basic/tsconfig.spec.json
  65. 4
      npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
  66. 10
      npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.ts
  67. 8
      npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/form-props.util.ts
  68. 3
      npm/ng-packs/packages/theme-shared/jest.config.ts
  69. 3
      npm/ng-packs/packages/theme-shared/tsconfig.json
  70. 4
      npm/ng-packs/packages/theme-shared/tsconfig.lib.json
  71. 2
      npm/ng-packs/packages/theme-shared/tsconfig.spec.json

40
npm/ng-packs/angular.json

@ -2,6 +2,7 @@
"version": 1,
"projects": {
"account": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "packages/account",
"sourceRoot": "packages/account/src",
@ -27,7 +28,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/packages/account"],
"options": {
"jestConfig": "packages/account/jest.config.js",
"jestConfig": "packages/account/jest.config.ts",
"passWithNoTests": true
}
},
@ -43,6 +44,7 @@
"implicitDependencies": ["core", "theme-shared", "account-core"]
},
"account-core": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "packages/account-core",
"sourceRoot": "packages/account-core/src",
@ -68,7 +70,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/packages/account-core"],
"options": {
"jestConfig": "packages/account-core/jest.config.js",
"jestConfig": "packages/account-core/jest.config.ts",
"passWithNoTests": true
}
},
@ -87,6 +89,7 @@
"implicitDependencies": ["core", "theme-shared"]
},
"components": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "packages/components",
"sourceRoot": "packages/components/src",
@ -112,7 +115,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/packages/components"],
"options": {
"jestConfig": "packages/components/jest.config.js",
"jestConfig": "packages/components/jest.config.ts",
"passWithNoTests": true
}
},
@ -131,6 +134,7 @@
"implicitDependencies": ["core", "theme-shared"]
},
"core": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "packages/core",
"sourceRoot": "packages/core/src",
@ -156,7 +160,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/packages/core"],
"options": {
"jestConfig": "packages/core/jest.config.js",
"jestConfig": "packages/core/jest.config.ts",
"passWithNoTests": true
}
},
@ -171,6 +175,7 @@
"tags": []
},
"dev-app": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"root": "apps/dev-app",
"sourceRoot": "apps/dev-app/src",
@ -290,13 +295,14 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/apps/dev-app"],
"options": {
"jestConfig": "apps/dev-app/jest.config.js",
"jestConfig": "apps/dev-app/jest.config.ts",
"passWithNoTests": true
}
}
}
},
"dev-app-e2e": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"root": "apps/dev-app-e2e",
"sourceRoot": "apps/dev-app-e2e/src",
"projectType": "application",
@ -326,6 +332,7 @@
"implicitDependencies": ["dev-app"]
},
"feature-management": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "packages/feature-management",
"sourceRoot": "packages/feature-management/src",
@ -351,7 +358,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/packages/feature-management"],
"options": {
"jestConfig": "packages/feature-management/jest.config.js",
"jestConfig": "packages/feature-management/jest.config.ts",
"passWithNoTests": true
}
},
@ -370,6 +377,7 @@
"implicitDependencies": ["core", "theme-shared"]
},
"identity": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "packages/identity",
"sourceRoot": "packages/identity/src",
@ -395,7 +403,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/packages/identity"],
"options": {
"jestConfig": "packages/identity/jest.config.js",
"jestConfig": "packages/identity/jest.config.ts",
"passWithNoTests": true
}
},
@ -411,6 +419,7 @@
"implicitDependencies": ["core", "theme-shared", "permission-management"]
},
"permission-management": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "packages/permission-management",
"sourceRoot": "packages/permission-management/src",
@ -436,7 +445,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/packages/permission-management"],
"options": {
"jestConfig": "packages/permission-management/jest.config.js",
"jestConfig": "packages/permission-management/jest.config.ts",
"passWithNoTests": true
}
},
@ -455,6 +464,7 @@
"implicitDependencies": ["core", "theme-shared"]
},
"schematics": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "packages/schematics",
"sourceRoot": "packages/schematics/src",
@ -464,7 +474,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/packages/schematics"],
"options": {
"jestConfig": "packages/schematics/jest.config.js",
"jestConfig": "packages/schematics/jest.config.ts",
"passWithNoTests": true
}
},
@ -482,6 +492,7 @@
"tags": []
},
"setting-management": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "packages/setting-management",
"sourceRoot": "packages/setting-management/src",
@ -507,7 +518,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/packages/setting-management"],
"options": {
"jestConfig": "packages/setting-management/jest.config.js",
"jestConfig": "packages/setting-management/jest.config.ts",
"passWithNoTests": true
}
},
@ -526,6 +537,7 @@
"implicitDependencies": ["core", "theme-shared", "components"]
},
"tenant-management": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "packages/tenant-management",
"sourceRoot": "packages/tenant-management/src",
@ -551,7 +563,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/packages/tenant-management"],
"options": {
"jestConfig": "packages/tenant-management/jest.config.js",
"jestConfig": "packages/tenant-management/jest.config.ts",
"passWithNoTests": true
}
},
@ -570,6 +582,7 @@
"implicitDependencies": ["core", "theme-shared", "feature-management"]
},
"theme-basic": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "packages/theme-basic",
"sourceRoot": "packages/theme-basic/src",
@ -595,7 +608,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/packages/theme-basic"],
"options": {
"jestConfig": "packages/theme-basic/jest.config.js",
"jestConfig": "packages/theme-basic/jest.config.ts",
"passWithNoTests": true
}
},
@ -614,6 +627,7 @@
"implicitDependencies": ["core", "theme-shared", "account-core"]
},
"theme-shared": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"root": "packages/theme-shared",
"sourceRoot": "packages/theme-shared/src",
@ -639,7 +653,7 @@
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/packages/theme-shared"],
"options": {
"jestConfig": "packages/theme-shared/jest.config.js",
"jestConfig": "packages/theme-shared/jest.config.ts",
"passWithNoTests": true
}
},

3
npm/ng-packs/apps/dev-app/jest.config.js → npm/ng-packs/apps/dev-app/jest.config.ts

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'dev-app',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

3
npm/ng-packs/apps/dev-app/tsconfig.app.json

@ -5,5 +5,6 @@
"types": []
},
"files": ["src/main.ts", "src/polyfills.ts"],
"include": ["src/**/*.d.ts"]
"include": ["src/**/*.d.ts"],
"exclude": ["jest.config.ts"]
}

3
npm/ng-packs/apps/dev-app/tsconfig.json

@ -18,7 +18,8 @@
"strict": false,
"noImplicitReturns": false,
"noFallthroughCasesInSwitch": true,
"allowSyntheticDefaultImports": true
"allowSyntheticDefaultImports": true,
"target": "es2020"
},
"angularCompilerOptions": {
"strictInjectionParameters": true,

2
npm/ng-packs/apps/dev-app/tsconfig.spec.json

@ -7,5 +7,5 @@
"esModuleInterop": true
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

2
npm/ng-packs/jest.config.js → npm/ng-packs/jest.config.ts

@ -1,5 +1,5 @@
const { getJestProjects } = require('@nrwl/jest');
module.exports = {
export default {
projects: getJestProjects(),
};

2
npm/ng-packs/jest.preset.js

@ -1,3 +1,3 @@
const nxPreset = require('@nrwl/jest/preset');
const nxPreset = require('@nrwl/jest/preset').default;
module.exports = { ...nxPreset };

215
npm/ng-packs/migrations.json

@ -1,84 +1,217 @@
{
"migrations": [
{
"version": "13.6.0-beta.0",
"description": "Remove old options that are no longer used",
"cli": "nx",
"implementation": "./src/migrations/update-13-6-0/remove-old-task-runner-options",
"package": "@nrwl/workspace",
"name": "13-6-0-remove-old-task-runner-options"
"version": "14.0.6",
"description": "Remove root property from project.json files",
"implementation": "./src/migrations/update-14-0-6/remove-roots",
"package": "nx",
"name": "14-0-6-remove-root"
},
{
"cli": "nx",
"version": "14.2.0-beta.0",
"description": "Add JSON Schema to Nx configuration files",
"implementation": "./src/migrations/update-14-2-0/add-json-schema",
"package": "nx",
"name": "14-2-0-add-json-schema"
},
{
"cli": "nx",
"version": "14.2.0-beta.0",
"description": "Remove default collection from configuration to switch to prompts for collection",
"implementation": "./src/migrations/update-14-2-0/remove-default-collection",
"package": "nx",
"name": "14-2-0-remove-default-collection"
},
{
"version": "13.9.0-beta.0",
"description": "Replace @nrwl/tao with nx",
"cli": "nx",
"implementation": "./src/migrations/update-13-9-0/replace-tao-with-nx",
"version": "14.2.0-beta.5",
"description": "Replace all ./ and ../ in outputs with absolute paths",
"implementation": "./src/migrations/update-14-2-0/replace-all-relative-outputs-with-absolute",
"package": "nx",
"name": "14-2-0-replace-relative-outputs-with-absolute"
},
{
"cli": "nx",
"version": "14.3.4-beta.1",
"description": "Replace targetDependencies with targetDefaults",
"implementation": "./src/migrations/update-14-3-4/create-target-defaults",
"package": "nx",
"name": "14.3.4-create-target-defaults"
},
{
"version": "14.0.0-beta.0",
"description": "Changes the presets in nx.json to come from the nx package",
"cli": "nx",
"implementation": "./src/migrations/update-14-0-0/change-nx-json-presets",
"package": "@nrwl/workspace",
"name": "13-9-0-replace-tao-with-nx"
"name": "14-0-0-change-nx-json-presets"
},
{
"version": "13.10.0-beta.0",
"description": "Update the decorate-angular-cli script to require nx instead of @nrwl/cli",
"version": "14.0.0-beta.0",
"description": "Migrates from @nrwl/workspace:run-script to nx:run-script",
"cli": "nx",
"implementation": "./src/migrations/update-13-10-0/update-decorate-cli",
"implementation": "./src/migrations/update-14-0-0/change-npm-script-executor",
"package": "@nrwl/workspace",
"name": "13-10-0-update-decorate-cli"
"name": "14-0-0-change-npm-script-executor"
},
{
"version": "13.10.0-beta.0",
"description": "Update the tasks runner property to import it from the nx package instead of @nrwl/worksapce",
"version": "14.2.0",
"description": "Explicitly enable sourceAnalysis for all workspaces extending from npm.json or core.json (this was default behavior prior to 14.2)",
"cli": "nx",
"implementation": "./src/migrations/update-13-10-0/update-tasks-runner",
"implementation": "./src/migrations/update-14-2-0/enable-source-analysis",
"package": "@nrwl/workspace",
"name": "13-10-0-update-tasks-runner"
"name": "14-2-0-enable-source-analysis"
},
{
"cli": "nx",
"version": "14.0.0-beta.1",
"description": "Rename mfe.config.js to module-federation.config.js for consistent terminology.",
"factory": "./src/migrations/update-14-0-0/rename-mf-config",
"package": "@nrwl/angular",
"name": "rename-module-federation-config"
},
{
"cli": "nx",
"version": "14.2.0-beta.0",
"description": "Remove 'showCircularDependencies' option from browser and server executors.",
"factory": "./src/migrations/update-14-2-0/remove-show-circular-dependencies-option",
"package": "@nrwl/angular",
"name": "remove-show-circular-dependencies-option"
},
{
"cli": "nx",
"version": "13.4.5-beta.7",
"description": "Remove the default for the invalid 'style' option for the library generator if configured.",
"factory": "./src/migrations/update-13-5-0/remove-library-generator-style-default",
"version": "14.2.0-beta.0",
"description": "Update the @angular/cli package version.",
"factory": "./src/migrations/update-14-2-0/update-angular-cli",
"package": "@nrwl/angular",
"name": "remove-library-generator-style-default"
"name": "update-angular-cli-version"
},
{
"cli": "nx",
"version": "13.5.0-beta.0",
"description": "A lot of changes to how MFEs operate were discovered and merged without appropriate migrations. This should cover migrating existing MFEs to the latest, using ESM and optmized production bundles.",
"factory": "./src/migrations/update-13-5-0/update-mfe-configs",
"version": "14.2.0-beta.0",
"description": "Remove 'package.json' files from library projects secondary entrypoints.",
"factory": "./src/migrations/update-14-2-0/update-libraries-secondary-entrypoints",
"package": "@nrwl/angular",
"name": "fix-incorrect-mfe-setups"
"name": "update-libraries-secondary-entrypoints"
},
{
"cli": "nx",
"version": "13.8.1",
"description": "Angular doesn't attach styles.js to index.html with type=module in dev mode, meaning an error is written to the console. Cypress falls over on this error. Add logic to Cypress e2e projects to ignore this error.",
"factory": "./src/migrations/update-13-8-1/add-cypress-mfe-workaround",
"version": "14.2.0-beta.0",
"description": "Update postinstall script running ngcc to use ES2020 target.",
"factory": "./src/migrations/update-14-2-0/update-ngcc-target",
"package": "@nrwl/angular",
"name": "add-cypress-mfe-workaround"
"name": "update-postinstall-script-ngcc-target"
},
{
"cli": "nx",
"version": "13.8.4",
"description": "Karma coverage is broken since Angular 13 upgarde and the karma config is severely out of date. Bring it up to date fixing the coverage issue.",
"factory": "./src/migrations/update-13-8-4/migrate-karma-conf",
"version": "14.2.0-beta.0",
"description": "Update TypeScript compilation target to 'ES2020'.",
"factory": "./src/migrations/update-14-2-0/update-tsconfig-target",
"package": "@nrwl/angular",
"name": "migrate-karma-config"
"name": "update-tsconfig-target"
},
{
"cli": "nx",
"version": "13.9.0-beta.4",
"description": "Set buildLibsFromSource property to false to not break existing usage.",
"factory": "./src/migrations/update-13-9-0/set-build-libs-from-source",
"version": "14.2.0-beta.6",
"description": "Update `initialNavigation: 'enabled'` to `initialNavigation: 'enabledBlocking'`.",
"factory": "./src/migrations/update-14-2-0/update-router-initial-navigation",
"package": "@nrwl/angular",
"name": "set-build-libs-from-source"
"name": "update-router-initial-navigation"
},
{
"version": "13.4.4-beta.0",
"cli": "nx",
"description": "Create a root babel config file if it doesn't exist and using babel-jest in jest.config.js and add @nrwl/web as needed",
"factory": "./src/migrations/update-13-4-4/add-missing-root-babel-config",
"version": "14.5.0-beta.0",
"description": "Update any references of MFE to MF.",
"factory": "./src/migrations/update-14-5-0/migrate-mfe-to-mf",
"package": "@nrwl/angular",
"name": "migrate-mfe-to-mf"
},
{
"cli": "nx",
"version": "14.5.2-beta.0",
"description": "Update the @angular/cli package version to ~14.1.0.",
"factory": "./src/migrations/update-14-5-2/update-angular-cli",
"package": "@nrwl/angular",
"name": "update-angular-cli-version-14-1-0"
},
{
"version": "14.0.0-beta",
"description": "As of Angular version 13, `entryComponents` are no longer necessary.",
"factory": "./migrations/entry-components/index",
"package": "@angular/core",
"name": "migration-entry-components"
},
{
"version": "14.0.0-beta",
"description": "As of Angular version 14, Forms model classes accept a type parameter, and existing usages must be opted out to preserve backwards-compatibility.",
"factory": "./migrations/typed-forms/index",
"package": "@angular/core",
"name": "migration-v14-typed-forms"
},
{
"version": "14.0.0-beta",
"description": "In Angular version 14, the `pathMatch` property of `Routes` was updated to be a strict union of the two valid options: `'full'|'prefix'`. `Routes` and `Route` variables need an explicit type so TypeScript does not infer the property as the looser `string`.",
"factory": "./migrations/path-match-type/index",
"package": "@angular/core",
"name": "migration-v14-path-match-type"
},
{
"version": "14.0.0-beta.2",
"cli": "nx",
"description": "Update move jest config files to .ts files.",
"factory": "./src/migrations/update-14-0-0/update-jest-config-ext",
"package": "@nrwl/jest",
"name": "add-missing-root-babel-config"
"name": "update-jest-config-extensions"
},
{
"version": "14.1.5-beta.0",
"cli": "nx",
"description": "Update to export default in jest config and revert jest.preset.ts to jest.preset.js",
"factory": "./src/migrations/update-14-1-5/update-exports-jest-config",
"package": "@nrwl/jest",
"name": "update-to-export-default"
},
{
"version": "14.5.5-beta.0",
"cli": "nx",
"description": "Exclude jest.config.ts from tsconfig where missing.",
"factory": "./src/migrations/update-14-0-0/update-jest-config-ext",
"package": "@nrwl/jest",
"name": "exclude-jest-config-from-ts-config"
},
{
"cli": "nx",
"version": "14.1.9-beta.0",
"description": "Adds @swc/core and @swc-node as a dev dep if you are using them",
"factory": "./src/migrations/update-14-1-9/add-swc-deps-if-needed",
"package": "@nrwl/linter",
"name": "add-swc-deps"
},
{
"cli": "nx",
"version": "14.2.3-beta.0",
"description": "Adds @swc/core and @swc-node as a dev dep if you are using them (repeated due to prior mistake)",
"factory": "./src/migrations/update-14-1-9/add-swc-deps-if-needed",
"package": "@nrwl/linter",
"name": "add-swc-deps-again"
},
{
"cli": "nx",
"version": "14.4.4",
"description": "Adds @typescript-eslint/utils as a dev dep",
"factory": "./src/migrations/update-14-4-4/experimental-to-utils-deps",
"package": "@nrwl/linter",
"name": "experimental-to-utils-deps"
},
{
"cli": "nx",
"version": "14.4.4",
"description": "Switch from @typescript-eslint/experimental-utils to @typescript-eslint/utils in all rules and rules.spec files",
"factory": "./src/migrations/update-14-4-4/experimental-to-utils-rules",
"package": "@nrwl/linter",
"name": "experimental-to-utils-rules"
}
]
}

24
npm/ng-packs/nx.json

@ -14,31 +14,17 @@
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": [
"build",
"lint",
"test",
"e2e"
],
"cacheableOperations": ["build", "lint", "test", "e2e"],
"parallel": 3
}
}
},
"targetDependencies": {
"build": [
{
"target": "build",
"projects": "dependencies"
}
]
},
"workspaceLayout": {
"libsDir": "packages",
"appsDir": ""
},
"cli": {
"analytics": false,
"defaultCollection": "@nrwl/angular"
"analytics": false
},
"defaultProject": "dev-app",
"generators": {
@ -67,5 +53,11 @@
"@nrwl/angular:component": {
"style": "scss"
}
},
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"targetDefaults": {
"build": {
"dependsOn": ["^build"]
}
}
}

80
npm/ng-packs/package.json

@ -41,24 +41,24 @@
"private": true,
"devDependencies": {
"@abp/utils": "~6.0.0-rc.3",
"@angular-devkit/build-angular": "13.3.5",
"@angular-devkit/build-angular": "14.1.3",
"@angular-devkit/build-ng-packagr": "^0.1002.0",
"@angular-devkit/schematics-cli": "~12.2.0",
"@angular-eslint/eslint-plugin": "13.0.1",
"@angular-eslint/eslint-plugin-template": "13.0.1",
"@angular-eslint/template-parser": "13.0.1",
"@angular/animations": "13.3.6",
"@angular/cli": "13.3.5",
"@angular/common": "13.3.6",
"@angular/compiler": "13.3.6",
"@angular/compiler-cli": "13.3.6",
"@angular/core": "13.3.6",
"@angular/forms": "13.3.6",
"@angular/language-service": "13.3.6",
"@angular/localize": "13.3.6",
"@angular/platform-browser": "13.3.6",
"@angular/platform-browser-dynamic": "13.3.6",
"@angular/router": "13.3.6",
"@angular-eslint/eslint-plugin": "14.0.3",
"@angular-eslint/eslint-plugin-template": "14.0.3",
"@angular-eslint/template-parser": "14.0.3",
"@angular/animations": "14.1.3",
"@angular/cli": "~14.1.0",
"@angular/common": "14.1.3",
"@angular/compiler": "14.1.3",
"@angular/compiler-cli": "14.1.3",
"@angular/core": "14.1.3",
"@angular/forms": "14.1.3",
"@angular/language-service": "14.1.3",
"@angular/localize": "14.1.3",
"@angular/platform-browser": "14.1.3",
"@angular/platform-browser-dynamic": "14.1.3",
"@angular/router": "14.1.3",
"@abp/ng.account": "~6.0.0-rc.3",
"@abp/ng.account.core": "~6.0.0-rc.3",
"@abp/ng.core": "~6.0.0-rc.3",
@ -74,55 +74,55 @@
"@ng-bootstrap/ng-bootstrap": "~12.0.0-beta.4",
"@ngneat/spectator": "^10.0.0",
"@ngx-validate/core": "^0.1.2",
"@nrwl/angular": "13.10.3",
"@nrwl/cli": "13.10.3",
"@nrwl/cypress": "13.10.3",
"@nrwl/eslint-plugin-nx": "13.10.3",
"@nrwl/jest": "13.10.3",
"@nrwl/linter": "13.10.3",
"@nrwl/workspace": "13.10.3",
"@schematics/angular": "~12.2.0",
"@nrwl/angular": "14.5.10",
"@nrwl/cli": "14.5.10",
"@nrwl/cypress": "14.5.10",
"@nrwl/eslint-plugin-nx": "14.5.10",
"@nrwl/jest": "14.5.10",
"@nrwl/linter": "14.5.10",
"@nrwl/workspace": "14.5.10",
"@schematics/angular": "14.1.3",
"@swimlane/ngx-datatable": "^20.0.0",
"@types/jest": "27.0.2",
"@types/jest": "27.4.1",
"@types/node": "14.14.33",
"@typescript-eslint/eslint-plugin": "5.18.0",
"@typescript-eslint/parser": "5.18.0",
"@typescript-eslint/eslint-plugin": "5.36.1",
"@typescript-eslint/parser": "5.36.1",
"angular-oauth2-oidc": "^13.0.1",
"bootstrap": "^5.1.1",
"chart.js": "^3.5.1",
"cypress": "^7.3.0",
"dotenv": "10.0.0",
"eslint": "8.12.0",
"eslint": "8.15.0",
"eslint-config-prettier": "8.1.0",
"eslint-plugin-cypress": "^2.10.3",
"got": "^11.5.2",
"jest": "27.2.3",
"jest": "27.5.1",
"jest-canvas-mock": "^2.3.1",
"jest-preset-angular": "11.1.1",
"jest-preset-angular": "11.1.2",
"jsonc-parser": "^2.3.0",
"just-clone": "^3.2.1",
"just-compare": "^1.4.0",
"lerna": "^4.0.0",
"ng-packagr": "13.3.1",
"ng-packagr": "14.1.0",
"ng-zorro-antd": "^13.0.0",
"@popperjs/core": "~2.11.2",
"postcss": "^8.3.9",
"postcss-import": "^14.0.2",
"postcss-preset-env": "^6.7.0",
"postcss-url": "^10.1.1",
"prettier": "2.6.2",
"postcss-import": "14.1.0",
"postcss-preset-env": "7.5.0",
"postcss-url": "10.1.3",
"prettier": "2.7.1",
"protractor": "~7.0.0",
"rxjs": "~6.6.0",
"rxjs": "7.5.6",
"should-quote": "^1.0.0",
"ts-jest": "27.0.5",
"ts-node": "~9.1.1",
"ts-jest": "27.1.4",
"ts-node": "10.9.1",
"ts-toolbelt": "6.15.4",
"tsickle": "^0.39.1",
"tslib": "^2.0.0",
"tslint": "~6.1.0",
"typescript": "4.6.4",
"typescript": "4.7.4",
"zone.js": "0.11.4",
"nx": "13.10.3"
"nx": "14.5.10"
},
"dependencies": {}
}

3
npm/ng-packs/packages/account-core/jest.config.js → npm/ng-packs/packages/account-core/jest.config.ts

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'account-core',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

5
npm/ng-packs/packages/account-core/tsconfig.json

@ -9,5 +9,8 @@
{
"path": "./tsconfig.spec.json"
}
]
],
"compilerOptions": {
"target": "es2020"
}
}

4
npm/ng-packs/packages/account-core/tsconfig.lib.json

@ -2,13 +2,13 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"target": "es2015",
"target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": ["dom", "es2018"]
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}

2
npm/ng-packs/packages/account-core/tsconfig.spec.json

@ -7,5 +7,5 @@
"esModuleInterop": true
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

3
npm/ng-packs/packages/account/jest.config.js → npm/ng-packs/packages/account/jest.config.ts

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'account',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

8
npm/ng-packs/packages/account/src/lib/components/change-password/change-password.component.ts

@ -1,7 +1,7 @@
import { ProfileService } from '@abp/ng.account.core/proxy';
import { getPasswordValidators, ToasterService } from '@abp/ng.theme.shared';
import { Component, Injector, OnInit } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import { comparePasswords, Validation } from '@ngx-validate/core';
import { finalize } from 'rxjs/operators';
import { Account } from '../../models/account';
@ -19,7 +19,7 @@ const PASSWORD_FIELDS = ['newPassword', 'repeatNewPassword'];
export class ChangePasswordComponent
implements OnInit, Account.ChangePasswordComponentInputs, Account.ChangePasswordComponentOutputs
{
form: FormGroup;
form: UntypedFormGroup;
inProgress: boolean;
@ -32,7 +32,7 @@ export class ChangePasswordComponent
};
constructor(
private fb: FormBuilder,
private fb: UntypedFormBuilder,
private injector: Injector,
private toasterService: ToasterService,
private profileService: ProfileService,
@ -86,7 +86,7 @@ export class ChangePasswordComponent
if (this.hideCurrentPassword) {
this.hideCurrentPassword = false;
this.form.addControl('password', new FormControl('', [required]));
this.form.addControl('password', new UntypedFormControl('', [required]));
}
},
error: err => {

6
npm/ng-packs/packages/account/src/lib/components/forgot-password/forgot-password.component.ts

@ -1,6 +1,6 @@
import { AccountService } from '@abp/ng.account.core/proxy';
import { Component } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { finalize } from 'rxjs/operators';
@Component({
@ -8,13 +8,13 @@ import { finalize } from 'rxjs/operators';
templateUrl: 'forgot-password.component.html',
})
export class ForgotPasswordComponent {
form: FormGroup;
form: UntypedFormGroup;
inProgress: boolean;
isEmailSent = false;
constructor(private fb: FormBuilder, private accountService: AccountService) {
constructor(private fb: UntypedFormBuilder, private accountService: AccountService) {
this.form = this.fb.group({
email: ['', [Validators.required, Validators.email]],
});

6
npm/ng-packs/packages/account/src/lib/components/login/login.component.ts

@ -1,7 +1,7 @@
import { AuthService, ConfigStateService } from '@abp/ng.core';
import { ToasterService } from '@abp/ng.theme.shared';
import { Component, Injector, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { throwError } from 'rxjs';
import { catchError, finalize } from 'rxjs/operators';
import { eAccountComponents } from '../../enums/components';
@ -14,7 +14,7 @@ const { maxLength, required } = Validators;
templateUrl: './login.component.html',
})
export class LoginComponent implements OnInit {
form: FormGroup;
form: UntypedFormGroup;
inProgress: boolean;
@ -24,7 +24,7 @@ export class LoginComponent implements OnInit {
constructor(
protected injector: Injector,
protected fb: FormBuilder,
protected fb: UntypedFormBuilder,
protected toasterService: ToasterService,
protected authService: AuthService,
protected configState: ConfigStateService,

4
npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts

@ -4,7 +4,7 @@ import {
FormProp,
EXTENSIBLE_FORM_VIEW_PROVIDER,
} from '@abp/ng.theme.shared/extensions';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
@Component({
selector: 'abp-personal-settings-half-row',
@ -27,7 +27,7 @@ export class PersonalSettingsHalfRowComponent {
public displayName: string;
public name: string;
public id: string;
public formGroup: FormGroup;
public formGroup: UntypedFormGroup;
constructor(@Inject(EXTENSIONS_FORM_PROP) private propData: FormProp) {
this.displayName = propData.displayName;

6
npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings.component.ts

@ -1,7 +1,7 @@
import { ProfileDto, ProfileService } from '@abp/ng.account.core/proxy';
import { ToasterService } from '@abp/ng.theme.shared';
import { Component, Injector, OnInit, ViewEncapsulation } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { finalize } from 'rxjs/operators';
import { Account } from '../../models/account';
import { ManageProfileStateService } from '../../services/manage-profile.state.service';
@ -31,12 +31,12 @@ export class PersonalSettingsComponent
{
selected: ProfileDto;
form: FormGroup;
form: UntypedFormGroup;
inProgress: boolean;
constructor(
private fb: FormBuilder,
private fb: UntypedFormBuilder,
private toasterService: ToasterService,
private profileService: ProfileService,
private manageProfileState: ManageProfileStateService,

6
npm/ng-packs/packages/account/src/lib/components/register/register.component.ts

@ -2,7 +2,7 @@ import { AccountService, RegisterDto } from '@abp/ng.account.core/proxy';
import { AuthService, ConfigStateService } from '@abp/ng.core';
import { getPasswordValidators, ToasterService } from '@abp/ng.theme.shared';
import { Component, Injector, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { throwError } from 'rxjs';
import { catchError, finalize, switchMap } from 'rxjs/operators';
import { eAccountComponents } from '../../enums/components';
@ -15,7 +15,7 @@ const { maxLength, required, email } = Validators;
templateUrl: './register.component.html',
})
export class RegisterComponent implements OnInit {
form: FormGroup;
form: UntypedFormGroup;
inProgress: boolean;
@ -24,7 +24,7 @@ export class RegisterComponent implements OnInit {
authWrapperKey = eAccountComponents.AuthWrapper;
constructor(
protected fb: FormBuilder,
protected fb: UntypedFormBuilder,
protected accountService: AccountService,
protected configState: ConfigStateService,
protected toasterService: ToasterService,

6
npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.ts

@ -1,7 +1,7 @@
import { AccountService } from '@abp/ng.account.core/proxy';
import { getPasswordValidators } from '@abp/ng.theme.shared';
import { Component, Injector, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { comparePasswords, Validation } from '@ngx-validate/core';
import { finalize } from 'rxjs/operators';
@ -13,7 +13,7 @@ const PASSWORD_FIELDS = ['password', 'confirmPassword'];
templateUrl: './reset-password.component.html',
})
export class ResetPasswordComponent implements OnInit {
form: FormGroup;
form: UntypedFormGroup;
inProgress = false;
@ -26,7 +26,7 @@ export class ResetPasswordComponent implements OnInit {
};
constructor(
private fb: FormBuilder,
private fb: UntypedFormBuilder,
private accountService: AccountService,
private route: ActivatedRoute,
private router: Router,

5
npm/ng-packs/packages/account/tsconfig.json

@ -9,5 +9,8 @@
{
"path": "./tsconfig.spec.json"
}
]
],
"compilerOptions": {
"target": "es2020"
}
}

4
npm/ng-packs/packages/account/tsconfig.lib.json

@ -2,13 +2,13 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"target": "es2015",
"target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": ["dom", "es2018"]
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}

2
npm/ng-packs/packages/account/tsconfig.spec.json

@ -7,5 +7,5 @@
"esModuleInterop": true
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

3
npm/ng-packs/packages/components/jest.config.js → npm/ng-packs/packages/components/jest.config.ts

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'components',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

5
npm/ng-packs/packages/components/tsconfig.json

@ -9,5 +9,8 @@
{
"path": "./tsconfig.spec.json"
}
]
],
"compilerOptions": {
"target": "es2020"
}
}

4
npm/ng-packs/packages/components/tsconfig.lib.json

@ -2,13 +2,13 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"target": "es2015",
"target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": ["dom", "es2018"]
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}

2
npm/ng-packs/packages/components/tsconfig.spec.json

@ -7,5 +7,5 @@
"esModuleInterop": true
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

3
npm/ng-packs/packages/core/jest.config.js → npm/ng-packs/packages/core/jest.config.ts

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'core',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

8
npm/ng-packs/packages/core/src/lib/directives/form-submit.directive.ts

@ -8,12 +8,12 @@ import {
Output,
Self,
} from '@angular/core';
import { FormControl, FormGroup, FormGroupDirective } from '@angular/forms';
import { UntypedFormControl, UntypedFormGroup, FormGroupDirective } from '@angular/forms';
import { fromEvent } from 'rxjs';
import { debounceTime, filter } from 'rxjs/operators';
import { SubscriptionService } from '../services/subscription.service';
type Controls = { [key: string]: FormControl } | FormGroup[];
type Controls = { [key: string]: UntypedFormControl } | UntypedFormGroup[];
/**
* @deprecated FormSubmitDirective will be removed in V7.0.0. Use `ngSubmit` instead.
*/
@ -73,7 +73,7 @@ export class FormSubmitDirective implements OnInit {
markAsDirty() {
const { form } = this.formGroupDirective;
setDirty(form.controls as { [key: string]: FormControl });
setDirty(form.controls as { [key: string]: UntypedFormControl });
form.markAsDirty();
this.cdRef.detectChanges();
@ -83,7 +83,7 @@ export class FormSubmitDirective implements OnInit {
function setDirty(controls: Controls) {
if (Array.isArray(controls)) {
controls.forEach(group => {
setDirty(group.controls as { [key: string]: FormControl });
setDirty(group.controls as { [key: string]: UntypedFormControl });
});
return;
}

3
npm/ng-packs/packages/core/tsconfig.json

@ -11,6 +11,7 @@
}
],
"compilerOptions": {
"allowSyntheticDefaultImports": true
"allowSyntheticDefaultImports": true,
"target": "es2020"
}
}

4
npm/ng-packs/packages/core/tsconfig.lib.json

@ -2,13 +2,13 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"target": "es2015",
"target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": ["dom", "es2018"]
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}

2
npm/ng-packs/packages/core/tsconfig.spec.json

@ -7,5 +7,5 @@
"esModuleInterop": true
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

3
npm/ng-packs/packages/feature-management/jest.config.js → npm/ng-packs/packages/feature-management/jest.config.ts

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'feature-management',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

5
npm/ng-packs/packages/feature-management/tsconfig.json

@ -9,5 +9,8 @@
{
"path": "./tsconfig.spec.json"
}
]
],
"compilerOptions": {
"target": "es2020"
}
}

4
npm/ng-packs/packages/feature-management/tsconfig.lib.json

@ -2,13 +2,13 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"target": "es2015",
"target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": ["dom", "es2018"]
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}

2
npm/ng-packs/packages/feature-management/tsconfig.spec.json

@ -7,5 +7,5 @@
"esModuleInterop": true
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

3
npm/ng-packs/packages/identity/jest.config.js → npm/ng-packs/packages/identity/jest.config.ts

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'identity',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

4
npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.ts

@ -8,7 +8,7 @@ import {
generateFormFromProps,
} from '@abp/ng.theme.shared/extensions';
import { Component, Injector, OnInit } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { finalize } from 'rxjs/operators';
import { eIdentityComponents } from '../../enums/components';
@ -26,7 +26,7 @@ import { eIdentityComponents } from '../../enums/components';
export class RolesComponent implements OnInit {
data: PagedResultDto<IdentityRoleDto> = { items: [], totalCount: 0 };
form: FormGroup;
form: UntypedFormGroup;
selected: IdentityRoleDto;

10
npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts

@ -20,7 +20,7 @@ import {
TrackByFunction,
ViewChild,
} from '@angular/core';
import { AbstractControl, FormArray, FormBuilder, FormGroup } from '@angular/forms';
import { AbstractControl, UntypedFormArray, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { finalize, switchMap, tap } from 'rxjs/operators';
import { eIdentityComponents } from '../../enums/components';
@ -41,7 +41,7 @@ export class UsersComponent implements OnInit {
@ViewChild('modalContent', { static: false })
modalContent: TemplateRef<any>;
form: FormGroup;
form: UntypedFormGroup;
selected: IdentityUserDto;
@ -67,8 +67,8 @@ export class UsersComponent implements OnInit {
this.visiblePermissions = event;
};
get roleGroups(): FormGroup[] {
return ((this.form.get('roleNames') as FormArray)?.controls as FormGroup[]) || [];
get roleGroups(): UntypedFormGroup[] {
return ((this.form.get('roleNames') as UntypedFormArray)?.controls as UntypedFormGroup[]) || [];
}
constructor(
@ -76,7 +76,7 @@ export class UsersComponent implements OnInit {
protected confirmationService: ConfirmationService,
protected service: IdentityUserService,
private toasterService: ToasterService,
protected fb: FormBuilder,
protected fb: UntypedFormBuilder,
protected injector: Injector,
) {}

5
npm/ng-packs/packages/identity/tsconfig.json

@ -9,5 +9,8 @@
{
"path": "./tsconfig.spec.json"
}
]
],
"compilerOptions": {
"target": "es2020"
}
}

4
npm/ng-packs/packages/identity/tsconfig.lib.json

@ -2,13 +2,13 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"target": "es2015",
"target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": ["dom", "es2018"]
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}

2
npm/ng-packs/packages/identity/tsconfig.spec.json

@ -7,5 +7,5 @@
"esModuleInterop": true
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

3
npm/ng-packs/packages/permission-management/jest.config.js → npm/ng-packs/packages/permission-management/jest.config.ts

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'permission-management',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

5
npm/ng-packs/packages/permission-management/tsconfig.json

@ -9,5 +9,8 @@
{
"path": "./tsconfig.spec.json"
}
]
],
"compilerOptions": {
"target": "es2020"
}
}

4
npm/ng-packs/packages/permission-management/tsconfig.lib.json

@ -2,13 +2,13 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"target": "es2015",
"target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": ["dom", "es2018"]
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}

2
npm/ng-packs/packages/permission-management/tsconfig.spec.json

@ -7,5 +7,5 @@
"esModuleInterop": true
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

3
npm/ng-packs/packages/schematics/jest.config.js → npm/ng-packs/packages/schematics/jest.config.ts

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'schematics',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

4
npm/ng-packs/packages/schematics/tsconfig.json

@ -16,9 +16,9 @@
"skipLibCheck": true,
"sourceMap": true,
"strictNullChecks": true,
"target": "es2017",
"target": "es2020",
"types": ["jest", "node"]
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist", "src/*/files/**/*", "**/*.spec.ts"]
"exclude": ["node_modules", "dist", "src/*/files/**/*", "**/*.spec.ts", "jest.config.ts"]
}

8
npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts

@ -1,7 +1,7 @@
import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap';
import { collapse, ToasterService } from '@abp/ng.theme.shared';
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { finalize } from 'rxjs/operators';
import { SettingManagementPolicyNames } from '../../enums/policy-names';
import { EmailSettingsService } from '../../proxy/email-settings.service';
@ -13,8 +13,8 @@ import { EmailSettingsDto } from '../../proxy/models';
animations: [collapse],
})
export class EmailSettingGroupComponent implements OnInit {
form!: FormGroup;
emailTestForm: FormGroup;
form!: UntypedFormGroup;
emailTestForm: UntypedFormGroup;
saving = false;
emailingPolicy = SettingManagementPolicyNames.Emailing;
isEmailTestModalOpen = false;
@ -22,7 +22,7 @@ export class EmailSettingGroupComponent implements OnInit {
constructor(
private emailSettingsService: EmailSettingsService,
private fb: FormBuilder,
private fb: UntypedFormBuilder,
private toasterService: ToasterService,
) {}

3
npm/ng-packs/packages/setting-management/jest.config.js → npm/ng-packs/packages/setting-management/jest.config.ts

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'setting-management',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

5
npm/ng-packs/packages/setting-management/tsconfig.json

@ -9,5 +9,8 @@
{
"path": "./tsconfig.spec.json"
}
]
],
"compilerOptions": {
"target": "es2020"
}
}

4
npm/ng-packs/packages/setting-management/tsconfig.lib.json

@ -2,13 +2,13 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"target": "es2015",
"target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": ["dom", "es2018"]
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}

2
npm/ng-packs/packages/setting-management/tsconfig.spec.json

@ -7,5 +7,5 @@
"esModuleInterop": true
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

3
npm/ng-packs/packages/tenant-management/jest.config.js → npm/ng-packs/packages/tenant-management/jest.config.ts

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'tenant-management',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

6
npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts

@ -8,7 +8,7 @@ import {
generateFormFromProps,
} from '@abp/ng.theme.shared/extensions';
import { Component, Injector, OnInit } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
import { finalize } from 'rxjs/operators';
import { eTenantManagementComponents } from '../../enums/components';
@ -28,7 +28,7 @@ export class TenantsComponent implements OnInit {
selected!: TenantDto;
tenantForm!: FormGroup;
tenantForm!: UntypedFormGroup;
isModalVisible!: boolean;
@ -54,7 +54,7 @@ export class TenantsComponent implements OnInit {
private confirmationService: ConfirmationService,
private service: TenantService,
private toasterService: ToasterService,
private fb: FormBuilder,
private fb: UntypedFormBuilder,
) {}
ngOnInit() {

5
npm/ng-packs/packages/tenant-management/tsconfig.json

@ -9,5 +9,8 @@
{
"path": "./tsconfig.spec.json"
}
]
],
"compilerOptions": {
"target": "es2020"
}
}

4
npm/ng-packs/packages/tenant-management/tsconfig.lib.json

@ -2,13 +2,13 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"target": "es2015",
"target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": ["dom", "es2018"]
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}

2
npm/ng-packs/packages/tenant-management/tsconfig.spec.json

@ -7,5 +7,5 @@
"esModuleInterop": true
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

3
npm/ng-packs/packages/theme-basic/jest.config.js → npm/ng-packs/packages/theme-basic/jest.config.ts

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'theme-basic',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

3
npm/ng-packs/packages/theme-basic/tsconfig.json

@ -11,6 +11,7 @@
}
],
"compilerOptions": {
"allowSyntheticDefaultImports": true
"allowSyntheticDefaultImports": true,
"target": "es2020"
}
}

4
npm/ng-packs/packages/theme-basic/tsconfig.lib.json

@ -2,13 +2,13 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"target": "es2015",
"target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": ["dom", "es2018"]
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}

2
npm/ng-packs/packages/theme-basic/tsconfig.spec.json

@ -7,5 +7,5 @@
"esModuleInterop": true
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

4
npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts

@ -16,7 +16,7 @@ import {
} from '@angular/core';
import {
ControlContainer,
FormGroup,
UntypedFormGroup,
FormGroupDirective,
ValidatorFn,
Validators,
@ -68,7 +68,7 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit {
typeaheadModel: any;
private readonly form: FormGroup;
private readonly form: UntypedFormGroup;
disabledFn = (data: PropData) => false;

10
npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form.component.ts

@ -10,7 +10,7 @@ import {
SkipSelf,
ViewChildren,
} from '@angular/core';
import { ControlContainer, FormGroup } from '@angular/forms';
import { ControlContainer, UntypedFormGroup } from '@angular/forms';
import { EXTRA_PROPERTIES_KEY } from '../../constants/extra-properties';
import { FormPropList } from '../../models/form-props';
import { ExtensionsService } from '../../services/extensions.service';
@ -46,12 +46,12 @@ export class ExtensibleFormComponent<R = any> {
propList!: FormPropList<R>;
record!: R;
get form(): FormGroup {
return (this.container ? this.container.control : { controls: {} }) as FormGroup;
get form(): UntypedFormGroup {
return (this.container ? this.container.control : { controls: {} }) as UntypedFormGroup;
}
get extraProperties(): FormGroup {
return (this.form.controls.extraProperties || { controls: {} }) as FormGroup;
get extraProperties(): UntypedFormGroup {
return (this.form.controls.extraProperties || { controls: {} }) as UntypedFormGroup;
}
constructor(

8
npm/ng-packs/packages/theme-shared/extensions/src/lib/utils/form-props.util.ts

@ -1,4 +1,4 @@
import { FormControl, FormGroup } from '@angular/forms';
import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
import { DateTimeAdapter } from '../adapters/date-time.adapter';
import { DateAdapter } from '../adapters/date.adapter';
import { TimeAdapter } from '../adapters/time.adapter';
@ -13,8 +13,8 @@ export function generateFormFromProps<R extends any>(data: PropData<R>) {
const extensions = data.getInjected(ExtensionsService);
const identifier = data.getInjected(EXTENSIONS_IDENTIFIER);
const form = new FormGroup({});
const extraForm = new FormGroup({});
const form = new UntypedFormGroup({});
const extraForm = new UntypedFormGroup({});
form.addControl(EXTRA_PROPERTIES_KEY, extraForm);
const record = data.record || {};
@ -49,7 +49,7 @@ export function generateFormFromProps<R extends any>(data: PropData<R>) {
}
}
const formControl = new FormControl(value, {
const formControl = new UntypedFormControl(value, {
asyncValidators: prop.asyncValidators(data),
validators: prop.validators(data),
});

3
npm/ng-packs/packages/theme-shared/jest.config.js → npm/ng-packs/packages/theme-shared/jest.config.ts

@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'theme-shared',
preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],

3
npm/ng-packs/packages/theme-shared/tsconfig.json

@ -11,6 +11,7 @@
}
],
"compilerOptions": {
"allowSyntheticDefaultImports": true
"allowSyntheticDefaultImports": true,
"target": "es2020"
}
}

4
npm/ng-packs/packages/theme-shared/tsconfig.lib.json

@ -2,13 +2,13 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"target": "es2015",
"target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
"types": [],
"lib": ["dom", "es2018"]
},
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],
"exclude": ["src/test-setup.ts", "**/*.spec.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}

2
npm/ng-packs/packages/theme-shared/tsconfig.spec.json

@ -7,5 +7,5 @@
"esModuleInterop": true
},
"files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.d.ts", "jest.config.ts"]
}

Loading…
Cancel
Save