Browse Source

Merge pull request #18934 from abpframework/auto-merge/prerel-8-1/2461

Merge branch dev with prerel-8.1
pull/18938/head
maliming 2 years ago
committed by GitHub
parent
commit
d4f3d31e42
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      npm/ng-packs/.env
  2. 3
      npm/ng-packs/apps/dev-app-e2e/project.json
  3. 5
      npm/ng-packs/apps/dev-app/project.json
  4. 126
      npm/ng-packs/migrations.json
  5. 11
      npm/ng-packs/nx.json
  6. 81
      npm/ng-packs/package.json
  7. 6
      npm/ng-packs/packages/account-core/project.json
  8. 3
      npm/ng-packs/packages/account-core/proxy/ng-package.json
  9. 3
      npm/ng-packs/packages/account/config/ng-package.json
  10. 3
      npm/ng-packs/packages/account/project.json
  11. 3
      npm/ng-packs/packages/components/chart.js/ng-package.json
  12. 3
      npm/ng-packs/packages/components/page/ng-package.json
  13. 8
      npm/ng-packs/packages/components/project.json
  14. 3
      npm/ng-packs/packages/components/tree/ng-package.json
  15. 3
      npm/ng-packs/packages/core/locale/ng-package.json
  16. 3
      npm/ng-packs/packages/core/project.json
  17. 3
      npm/ng-packs/packages/core/testing/ng-package.json
  18. 6
      npm/ng-packs/packages/feature-management/project.json
  19. 3
      npm/ng-packs/packages/feature-management/proxy/ng-package.json
  20. 9
      npm/ng-packs/packages/generators/project.json
  21. 3
      npm/ng-packs/packages/generators/tsconfig.json
  22. 3
      npm/ng-packs/packages/identity/config/ng-package.json
  23. 3
      npm/ng-packs/packages/identity/project.json
  24. 3
      npm/ng-packs/packages/identity/proxy/ng-package.json
  25. 5
      npm/ng-packs/packages/oauth/project.json
  26. 6
      npm/ng-packs/packages/permission-management/project.json
  27. 3
      npm/ng-packs/packages/permission-management/proxy/ng-package.json
  28. 3
      npm/ng-packs/packages/schematics/project.json
  29. 2
      npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/ng-package.json.template
  30. 3
      npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/ng-package.json.template
  31. 3
      npm/ng-packs/packages/setting-management/config/ng-package.json
  32. 8
      npm/ng-packs/packages/setting-management/project.json
  33. 3
      npm/ng-packs/packages/setting-management/proxy/ng-package.json
  34. 3
      npm/ng-packs/packages/tenant-management/config/ng-package.json
  35. 6
      npm/ng-packs/packages/tenant-management/project.json
  36. 3
      npm/ng-packs/packages/tenant-management/proxy/ng-package.json
  37. 6
      npm/ng-packs/packages/theme-basic/project.json
  38. 3
      npm/ng-packs/packages/theme-basic/testing/ng-package.json
  39. 6
      npm/ng-packs/packages/theme-shared/project.json
  40. 3
      npm/ng-packs/packages/theme-shared/testing/ng-package.json
  41. 47
      templates/app-nolayers/angular/package.json
  42. 38
      templates/app/angular/package.json
  43. 42
      templates/module/angular/package.json

4
npm/ng-packs/.env

@ -0,0 +1,4 @@
# Nx 18 enables using plugins to infer targets by default
# This is disabled for existing workspaces to maintain compatibility
# For more info, see: https://nx.dev/concepts/inferred-tasks
NX_ADD_PLUGINS=false

3
npm/ng-packs/apps/dev-app-e2e/project.json

@ -19,9 +19,6 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["apps/dev-app-e2e/**/*.{js,ts}"]
},
"outputs": ["{options.outputFile}"]
}
},

5
npm/ng-packs/apps/dev-app/project.json

@ -170,10 +170,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["apps/dev-app/src/**/*.ts", "apps/dev-app/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",

126
npm/ng-packs/migrations.json

@ -2,131 +2,83 @@
"migrations": [
{
"cli": "nx",
"version": "17.0.0-beta.1",
"description": "Updates the default cache directory to .nx/cache",
"implementation": "./src/migrations/update-17-0-0/move-cache-directory",
"version": "17.3.0-beta.6",
"description": "Updates the nx wrapper.",
"implementation": "./src/migrations/update-17-3-0/update-nxw",
"package": "nx",
"name": "17.0.0-move-cache-directory"
"name": "17.3.0-update-nx-wrapper"
},
{
"cli": "nx",
"version": "17.0.0-beta.3",
"description": "Use minimal config for tasksRunnerOptions",
"implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options",
"version": "18.0.0-beta.2",
"description": "Updates .env to disabled adding plugins when generating projects in an existing Nx workspace",
"implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
"x-repair-skip": true,
"package": "nx",
"name": "17.0.0-use-minimal-config-for-tasks-runner-options"
"name": "18.0.0-disable-adding-plugins-for-existing-workspaces"
},
{
"version": "17.0.0-rc.1",
"description": "Migration for v17.0.0-rc.1",
"implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope",
"package": "nx",
"name": "rm-default-collection-npm-scope"
},
{
"cli": "nx",
"version": "17.0.2",
"description": "Remove deprecated build options",
"implementation": "./src/migrations/update-17-0-0/remove-deprecated-build-options",
"package": "@nx/js",
"name": "update-17-0-0-remove-deprecated-build-options"
},
{
"version": "17.0.0-beta.7",
"description": "update-17-0-0-rename-to-eslint",
"implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint",
"version": "17.2.0-beta.0",
"description": "Simplify eslintFilePatterns",
"implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns",
"package": "@nx/eslint",
"name": "update-17-0-0-rename-to-eslint"
"name": "simplify-eslint-patterns"
},
{
"version": "17.1.0-beta.1",
"description": "Updates for @typescript-utils/utils v6.9.1+",
"implementation": "./src/migrations/update-17-1-0/update-typescript-eslint",
"version": "17.2.9",
"description": "Move executor options to target defaults",
"implementation": "./src/migrations/update-17-2-9/move-options-to-target-defaults",
"package": "@nx/eslint",
"name": "update-typescript-eslint"
},
{
"version": "17.1.0-beta.2",
"description": "Move jest executor options to nx.json targetDefaults",
"implementation": "./src/migrations/update-17-1-0/move-options-to-target-defaults",
"package": "@nx/jest",
"name": "move-options-to-target-defaults"
},
{
"cli": "nx",
"version": "17.1.0-beta.5",
"requires": {
"@angular/core": ">=17.0.0"
},
"description": "Update the @angular/cli package version to ~17.0.0.",
"factory": "./src/migrations/update-17-1-0/update-angular-cli",
"version": "17.2.0-beta.2",
"description": "Rename '@nx/angular:webpack-dev-server' executor to '@nx/angular:dev-server'",
"factory": "./src/migrations/update-17-2-0/rename-webpack-dev-server",
"package": "@nx/angular",
"name": "update-angular-cli-version-17-0-0"
"name": "rename-webpack-dev-server-executor"
},
{
"cli": "nx",
"version": "17.1.0-beta.5",
"version": "17.3.0-beta.10",
"requires": {
"@angular/core": ">=17.0.0"
"@angular/core": ">=17.1.0"
},
"description": "Rename 'browserTarget' to 'buildTarget'.",
"factory": "./src/migrations/update-17-1-0/browser-target-to-build-target",
"description": "Update the @angular/cli package version to ~17.1.0.",
"factory": "./src/migrations/update-17-3-0/update-angular-cli",
"package": "@nx/angular",
"name": "rename-browser-target-to-build-target"
"name": "update-angular-cli-version-17-1-0"
},
{
"cli": "nx",
"version": "17.1.0-beta.5",
"version": "17.3.0-beta.10",
"requires": {
"@angular/core": ">=17.0.0"
"@angular/core": ">=17.1.0"
},
"description": "Replace usages of '@nguniversal/builders' with '@angular-devkit/build-angular'.",
"factory": "./src/migrations/update-17-1-0/replace-nguniversal-builders",
"description": "Add 'browser-sync' as dev dependency when '@angular-devkit/build-angular:ssr-dev-server' or '@nx/angular:module-federation-dev-ssr' is used.",
"factory": "./src/migrations/update-17-3-0/add-browser-sync-dependency",
"package": "@nx/angular",
"name": "replace-nguniversal-builders"
"name": "add-browser-sync-dependency"
},
{
"cli": "nx",
"version": "17.1.0-beta.5",
"version": "17.3.0-beta.10",
"requires": {
"@angular/core": ">=17.0.0"
"@angular/core": ">=17.1.0"
},
"description": "Replace usages of '@nguniversal/' packages with '@angular/ssr'.",
"factory": "./src/migrations/update-17-1-0/replace-nguniversal-engines",
"description": "Add 'autoprefixer' as dev dependency when '@nx/angular:ng-packagr-lite' or '@nx/angular:package` is used.",
"factory": "./src/migrations/update-17-3-0/add-autoprefixer-dependency",
"package": "@nx/angular",
"name": "replace-nguniversal-engines"
"name": "add-autoprefixer-dependency"
},
{
"cli": "nx",
"version": "17.1.0-beta.5",
"requires": {
"@angular/core": ">=17.0.0"
},
"description": "Replace the deep imports from 'zone.js/dist/zone' and 'zone.js/dist/zone-testing' with 'zone.js' and 'zone.js/testing'.",
"factory": "./src/migrations/update-17-1-0/update-zone-js-deep-import",
"version": "18.0.0-beta.0",
"description": "Add NX_MF_DEV_SERVER_STATIC_REMOTES to inputs for task hashing when '@nx/angular:webpack-browser' is used for Module Federation.",
"factory": "./src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults",
"package": "@nx/angular",
"name": "update-zone-js-deep-import"
},
{
"version": "17.0.0",
"description": "Angular v17 introduces a new control flow syntax that uses the @ and } characters. This migration replaces the existing usages with their corresponding HTML entities.",
"factory": "./migrations/block-template-entities/bundle",
"package": "@angular/core",
"name": "block-template-entities"
},
{
"version": "17.0.0",
"description": "CompilerOption.useJit and CompilerOption.missingTranslation are unused under Ivy. This migration removes their usage",
"factory": "./migrations/compiler-options/bundle",
"package": "@angular/core",
"name": "migration-v17-compiler-options"
},
{
"version": "17.0.0",
"description": "Updates `TransferState`, `makeStateKey`, `StateKey` imports from `@angular/platform-browser` to `@angular/core`.",
"factory": "./migrations/transfer-state/bundle",
"package": "@angular/core",
"name": "migration-transfer-state"
"name": "add-module-federation-env-var-to-target-defaults"
}
]
}

11
npm/ng-packs/nx.json

@ -48,10 +48,6 @@
"inputs": ["default", "^production"],
"cache": true
},
"lint": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
"cache": true
},
"@nx/jest:jest": {
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
"cache": true,
@ -64,6 +60,10 @@
"codeCoverage": true
}
}
},
"@nx/eslint:lint": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
"cache": true
}
},
"namedInputs": {
@ -77,5 +77,6 @@
"!{projectRoot}/.eslintrc.json"
]
},
"parallel": 3
"parallel": 3,
"nxCloudAccessToken": "NjEzZTliYmMtYmU1MC00ZmI4LWFhOTAtYWY0ZDhiMjhiNzQ0fHJlYWQtd3JpdGU="
}

81
npm/ng-packs/package.json

@ -46,52 +46,57 @@
"devDependencies": {
"@abp/ng.theme.lepton-x": "~3.0.1",
"@abp/utils": "~8.0.2",
"@angular-devkit/build-angular": "~17.0.0",
"@angular-devkit/core": "~17.0.0",
"@angular-devkit/schematics": "~17.0.0",
"@angular-devkit/schematics-cli": "~17.0.0",
"@angular-eslint/eslint-plugin": "~17.0.0",
"@angular-eslint/eslint-plugin-template": "~17.0.0",
"@angular-eslint/template-parser": "~17.0.0",
"@angular/animations": "~17.0.0",
"@angular/cli": "~17.0.0",
"@angular/common": "~17.0.0",
"@angular/compiler": "~17.0.0",
"@angular/compiler-cli": "~17.0.0",
"@angular/core": "~17.0.0",
"@angular/forms": "~17.0.0",
"@angular/language-service": "~17.0.0",
"@angular/localize": "~17.0.0",
"@angular/platform-browser": "~17.0.0",
"@angular/platform-browser-dynamic": "~17.0.0",
"@angular/router": "~17.0.0",
"@angular-devkit/build-angular": "~17.1.0",
"@angular-devkit/core": "~17.1.0",
"@angular-devkit/schematics": "~17.1.0",
"@angular-devkit/schematics-cli": "~17.1.0",
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular-eslint/eslint-plugin-template": "~17.2.0",
"@angular-eslint/template-parser": "~17.2.0",
"@angular/animations": "~17.1.0",
"@angular/cli": "~17.1.0",
"@angular/common": "~17.1.0",
"@angular/compiler": "~17.1.0",
"@angular/compiler-cli": "~17.1.0",
"@angular/core": "~17.1.0",
"@angular/forms": "~17.1.0",
"@angular/language-service": "~17.1.0",
"@angular/localize": "~17.1.0",
"@angular/platform-browser": "~17.1.0",
"@angular/platform-browser-dynamic": "~17.1.0",
"@angular/router": "~17.1.0",
"@fortawesome/fontawesome-free": "^6.0.0",
"@ng-bootstrap/ng-bootstrap": "~16.0.0",
"@ngneat/spectator": "^15.0.0",
"@ngneat/spectator": "^16.0.0",
"@ngx-validate/core": "^0.2.0",
"@nx/angular": "~17.1.0",
"@nx/cypress": "~17.1.0",
"@nx/eslint-plugin": "~17.1.0",
"@nx/jest": "~17.1.0",
"@nx/js": "~17.1.0",
"@nx/workspace": "~17.1.0",
"@nx/angular": "~18.0.0",
"@nx/cypress": "~18.0.0",
"@nx/devkit": "~18.0.0",
"@nx/eslint": "~18.0.0",
"@nx/eslint-plugin": "~18.0.0",
"@nx/jest": "~18.0.0",
"@nx/js": "~18.0.0",
"@nx/plugin": "~18.0.0",
"@nx/workspace": "~18.0.0",
"@popperjs/core": "~2.11.0",
"@schematics/angular": "17.0.0",
"@schematics/angular": "~17.1.0",
"@swc-node/register": "1.6.8",
"@swc/cli": "~0.1.0",
"@swc/core": "1.3.94",
"@swc/helpers": "0.5.3",
"@swimlane/ngx-datatable": "^20.0.0",
"@types/jest": "29.4.4",
"@types/node": "20.2.5",
"@typescript-eslint/eslint-plugin": "6.9.1",
"@typescript-eslint/parser": "6.9.1",
"@types/node": "^20.0.0",
"@typescript-eslint/eslint-plugin": "6.13.2",
"@typescript-eslint/parser": "6.13.2",
"angular-oauth2-oidc": "^15.0.0",
"autoprefixer": "^10.0.0",
"bootstrap": "^5.0.0",
"bootstrap-icons": "^1.0.0",
"chart.js": "^3.0.0",
"cypress": "^7.0.0",
"dotenv": "10.0.0",
"eslint": "8.46.0",
"eslint": "8.48.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-cypress": "^2.10.3",
"got": "^11.0.0",
@ -105,15 +110,15 @@
"just-compare": "^2.0.0",
"lerna": "^4.0.0",
"lint-staged": "^13.0.0",
"ng-packagr": "17.0.0",
"ng-packagr": "~17.1.0",
"ng-zorro-antd": "^17.0.0",
"nx": "~17.1.0",
"nx": "~18.0.0",
"perfect-scrollbar": "^1.0.0",
"postcss": "^8.0.0",
"postcss-import": "14.1.0",
"postcss-preset-env": "7.5.0",
"postcss-url": "10.1.3",
"prettier": "2.7.1",
"prettier": "^3.0.0",
"protractor": "~7.0.0",
"rxjs": "~7.8.0",
"should-quote": "^1.0.0",
@ -122,12 +127,8 @@
"ts-toolbelt": "6.15.4",
"tslib": "^2.0.0",
"tslint": "~6.1.0",
"typescript": "~5.2.0",
"zone.js": "~0.14.0",
"@nx/devkit": "~17.1.0",
"@nx/plugin": "~17.1.0",
"@swc/helpers": "0.5.3",
"@nx/eslint": "~17.1.0"
"typescript": "~5.3.0",
"zone.js": "~0.14.0"
},
"lint-staged": {
"**/*.{js,jsx,ts,tsx,html,css,scss}": [

6
npm/ng-packs/packages/account-core/project.json

@ -30,12 +30,6 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"packages/account-core/src/**/*.ts",
"packages/account-core/src/**/*.html"
]
},
"outputs": ["{options.outputFile}"]
}
},

3
npm/ng-packs/packages/account-core/proxy/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/account-core/proxy",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

3
npm/ng-packs/packages/account/config/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/account/config",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

3
npm/ng-packs/packages/account/project.json

@ -30,9 +30,6 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["packages/account/src/**/*.ts", "packages/account/src/**/*.html"]
},
"outputs": ["{options.outputFile}"]
}
},

3
npm/ng-packs/packages/components/chart.js/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/components/chart.js",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

3
npm/ng-packs/packages/components/page/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/components/page",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

8
npm/ng-packs/packages/components/project.json

@ -30,14 +30,6 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"packages/components/src/**/*.ts",
"packages/components/src/**/*.html",
"packages/components/extensible/**/*.ts",
"packages/components/extensible/**/*.html"
]
},
"outputs": ["{options.outputFile}"]
}
},

3
npm/ng-packs/packages/components/tree/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/components/tree",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

3
npm/ng-packs/packages/core/locale/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/core/locale",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

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

@ -30,9 +30,6 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["packages/core/src/**/*.ts", "packages/core/src/**/*.html"]
},
"outputs": ["{options.outputFile}"]
}
},

3
npm/ng-packs/packages/core/testing/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/core/testing",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

6
npm/ng-packs/packages/feature-management/project.json

@ -30,12 +30,6 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"packages/feature-management/src/**/*.ts",
"packages/feature-management/src/**/*.html"
]
},
"outputs": ["{options.outputFile}"]
}
},

3
npm/ng-packs/packages/feature-management/proxy/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/feature-management/proxy",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

9
npm/ng-packs/packages/generators/project.json

@ -42,14 +42,7 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
"packages/generators/**/*.ts",
"packages/generators/package.json",
"packages/generators/generators.json"
]
}
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nx/jest:jest",

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

@ -1,7 +1,8 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"module": "commonjs"
"module": "commonjs",
"skipLibCheck": true
},
"files": [],
"include": [],

3
npm/ng-packs/packages/identity/config/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/identity/config",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

3
npm/ng-packs/packages/identity/project.json

@ -30,9 +30,6 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["packages/identity/src/**/*.ts", "packages/identity/src/**/*.html"]
},
"outputs": ["{options.outputFile}"]
}
},

3
npm/ng-packs/packages/identity/proxy/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/identity/proxy",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

5
npm/ng-packs/packages/oauth/project.json

@ -29,10 +29,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["packages/oauth/**/*.ts", "packages/oauth/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
},
"tags": [],

6
npm/ng-packs/packages/permission-management/project.json

@ -30,12 +30,6 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"packages/permission-management/src/**/*.ts",
"packages/permission-management/src/**/*.html"
]
},
"outputs": ["{options.outputFile}"]
}
},

3
npm/ng-packs/packages/permission-management/proxy/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/permission-management/proxy",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

3
npm/ng-packs/packages/schematics/project.json

@ -14,9 +14,6 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["packages/schematics/src/**/*.ts", "packages/schematics/src/**/*.html"]
},
"outputs": ["{options.outputFile}"]
}
},

2
npm/ng-packs/packages/schematics/src/commands/create-lib/files-package/__libraryName@kebab__/config/ng-package.json.template

@ -1,5 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"dest": "../../dist/<%= kebab(libraryName) %>/config",
"lib": {
"entryFile": "src/public-api.ts"

3
npm/ng-packs/packages/schematics/src/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/ng-package.json.template

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../dist/<%= kebab(target) %>/<%= kebab(libraryName) %>",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

3
npm/ng-packs/packages/setting-management/config/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/setting-management/config",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

8
npm/ng-packs/packages/setting-management/project.json

@ -30,14 +30,6 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"packages/setting-management/src/**/*.ts",
"packages/setting-management/src/**/*.html",
"packages/setting-management/proxy/**/*.ts",
"packages/setting-management/proxy/**/*.html"
]
},
"outputs": ["{options.outputFile}"]
}
},

3
npm/ng-packs/packages/setting-management/proxy/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/setting-management/proxy",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

3
npm/ng-packs/packages/tenant-management/config/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/tenant-management/config",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

6
npm/ng-packs/packages/tenant-management/project.json

@ -30,12 +30,6 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"packages/tenant-management/src/**/*.ts",
"packages/tenant-management/src/**/*.html"
]
},
"outputs": ["{options.outputFile}"]
}
},

3
npm/ng-packs/packages/tenant-management/proxy/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/tenant-management/proxy",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

6
npm/ng-packs/packages/theme-basic/project.json

@ -30,12 +30,6 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"packages/theme-basic/src/**/*.ts",
"packages/theme-basic/src/**/*.html"
]
},
"outputs": ["{options.outputFile}"]
}
},

3
npm/ng-packs/packages/theme-basic/testing/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/theme-basic/testing",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

6
npm/ng-packs/packages/theme-shared/project.json

@ -30,12 +30,6 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"packages/theme-shared/src/**/*.ts",
"packages/theme-shared/src/**/*.html"
]
},
"outputs": ["{options.outputFile}"]
}
},

3
npm/ng-packs/packages/theme-shared/testing/ng-package.json

@ -1,6 +1,5 @@
{
"$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
"dest": "../../../dist/packages/theme-shared/testing",
"$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
"lib": {
"entryFile": "src/public-api.ts"
}

47
templates/app-nolayers/angular/package.json

@ -15,37 +15,37 @@
"@abp/ng.account": "~8.0.2",
"@abp/ng.components": "~8.0.2",
"@abp/ng.core": "~8.0.2",
"@abp/ng.oauth": "~8.0.2",
"@abp/ng.identity": "~8.0.2",
"@abp/ng.oauth": "~8.0.2",
"@abp/ng.setting-management": "~8.0.2",
"@abp/ng.tenant-management": "~8.0.2",
"@abp/ng.theme.shared": "~8.0.2",
"@abp/ng.theme.lepton-x": "~3.0.1",
"@angular/animations": "~17.0.0",
"@angular/common": "~17.0.0",
"@angular/compiler": "~17.0.0",
"@angular/core": "~17.0.0",
"@angular/forms": "~17.0.0",
"@angular/localize": "~17.0.0",
"@angular/platform-browser": "~17.0.0",
"@angular/platform-browser-dynamic": "~17.0.0",
"@angular/router": "~17.0.0",
"@abp/ng.theme.shared": "~8.0.2",
"@angular/animations": "~17.1.0",
"@angular/common": "~17.1.0",
"@angular/compiler": "~17.1.0",
"@angular/core": "~17.1.0",
"@angular/forms": "~17.1.0",
"@angular/localize": "~17.1.0",
"@angular/platform-browser": "~17.1.0",
"@angular/platform-browser-dynamic": "~17.1.0",
"@angular/router": "~17.1.0",
"bootstrap-icons": "~1.8.0",
"rxjs": "~7.8.0",
"tslib": "^2.1.0",
"bootstrap-icons": "~1.8.3",
"tslib": "^2.0.0",
"zone.js": "~0.14.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~17.0.0",
"@angular-eslint/builder": "~17.0.0",
"@angular-eslint/eslint-plugin": "~17.0.0",
"@angular-eslint/eslint-plugin-template": "~17.0.0",
"@angular-eslint/schematics": "~17.0.0",
"@angular-eslint/template-parser": "~17.0.0",
"@abp/ng.schematics": "~8.0.2",
"@angular/cli": "~17.0.0",
"@angular/compiler-cli": "~17.0.0",
"@angular/language-service": "~17.0.0",
"@angular-devkit/build-angular": "~17.1.0",
"@angular-eslint/builder": "~17.2.0",
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular-eslint/eslint-plugin-template": "~17.2.0",
"@angular-eslint/schematics": "~17.2.0",
"@angular-eslint/template-parser": "~17.2.0",
"@angular/cli": "~17.1.0",
"@angular/compiler-cli": "~17.1.0",
"@angular/language-service": "~17.1.0",
"@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1",
"@typescript-eslint/eslint-plugin": "6.9.1",
@ -57,7 +57,6 @@
"karma-coverage": "~2.1.0",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.7.0",
"ng-packagr": "~17.0.0",
"typescript": "~5.2.0"
"typescript": "~5.3.0"
}
}

38
templates/app/angular/package.json

@ -21,15 +21,15 @@
"@abp/ng.tenant-management": "~8.0.2",
"@abp/ng.theme.lepton-x": "~3.0.1",
"@abp/ng.theme.shared": "~8.0.2",
"@angular/animations": "~17.0.0",
"@angular/common": "~17.0.0",
"@angular/compiler": "~17.0.0",
"@angular/core": "~17.0.0",
"@angular/forms": "~17.0.0",
"@angular/localize": "~17.0.0",
"@angular/platform-browser": "~17.0.0",
"@angular/platform-browser-dynamic": "~17.0.0",
"@angular/router": "~17.0.0",
"@angular/animations": "~17.1.2",
"@angular/common": "~17.1.2",
"@angular/compiler": "~17.1.2",
"@angular/core": "~17.1.2",
"@angular/forms": "~17.1.2",
"@angular/localize": "~17.1.2",
"@angular/platform-browser": "~17.1.2",
"@angular/platform-browser-dynamic": "~17.1.2",
"@angular/router": "~17.1.2",
"bootstrap-icons": "~1.8.0",
"rxjs": "~7.8.0",
"tslib": "^2.0.0",
@ -37,15 +37,15 @@
},
"devDependencies": {
"@abp/ng.schematics": "~8.0.2",
"@angular-devkit/build-angular": "~17.0.0",
"@angular-eslint/builder": "~17.0.0",
"@angular-eslint/eslint-plugin": "~17.0.0",
"@angular-eslint/eslint-plugin-template": "~17.0.0",
"@angular-eslint/schematics": "~17.0.0",
"@angular-eslint/template-parser": "~17.0.0",
"@angular/cli": "~17.0.0",
"@angular/compiler-cli": "~17.0.0",
"@angular/language-service": "~17.0.0",
"@angular-devkit/build-angular": "~17.1.2",
"@angular-eslint/builder": "~17.2.0",
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular-eslint/eslint-plugin-template": "~17.2.0",
"@angular-eslint/schematics": "~17.2.0",
"@angular-eslint/template-parser": "~17.2.0",
"@angular/cli": "~17.1.2",
"@angular/compiler-cli": "~17.1.2",
"@angular/language-service": "~17.1.2",
"@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1",
"@typescript-eslint/eslint-plugin": "6.9.1",
@ -57,6 +57,6 @@
"karma-coverage": "~2.1.0",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.7.0",
"typescript": "~5.2.0"
"typescript": "~5.3.0"
}
}

42
templates/module/angular/package.json

@ -6,6 +6,7 @@
"start": "ng serve dev-app --open",
"build": "ng build my-project-name --configuration production",
"build:app": "npm run symlink:copy -- --no-watch && ng build dev-app --configuration production",
"symlink:copy": "npm run build && symlink dist --angular --packages @my-company-name/my-project-name --configuration production",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
@ -21,30 +22,30 @@
"@abp/ng.tenant-management": "~8.0.2",
"@abp/ng.theme.basic": "~8.0.2",
"@abp/ng.theme.shared": "~8.0.2",
"@angular/animations": "~17.0.0",
"@angular/common": "~17.0.0",
"@angular/compiler": "~17.0.0",
"@angular/core": "~17.0.0",
"@angular/forms": "~17.0.0",
"@angular/localize": "~17.0.0",
"@angular/platform-browser": "~17.0.0",
"@angular/platform-browser-dynamic": "~17.0.0",
"@angular/router": "~17.0.0",
"@angular/animations": "~17.1.0",
"@angular/common": "~17.1.0",
"@angular/compiler": "~17.1.0",
"@angular/core": "~17.1.0",
"@angular/forms": "~17.1.0",
"@angular/localize": "~17.1.0",
"@angular/platform-browser": "~17.1.0",
"@angular/platform-browser-dynamic": "~17.1.0",
"@angular/router": "~17.1.0",
"rxjs": "~7.8.0",
"tslib": "^2.1.0",
"zone.js": "~0.14.0"
},
"devDependencies": {
"@abp/ng.schematics": "~8.0.2",
"@angular-devkit/build-angular": "~17.0.0",
"@angular-eslint/builder": "~17.0.0",
"@angular-eslint/eslint-plugin": "~17.0.0",
"@angular-eslint/eslint-plugin-template": "~17.0.0",
"@angular-eslint/schematics": "~17.0.0",
"@angular-eslint/template-parser": "~17.0.0",
"@angular/cli": "~17.0.0",
"@angular/compiler-cli": "~17.0.0",
"@angular/language-service": "~17.0.0",
"@angular-devkit/build-angular": "~17.1.0",
"@angular-eslint/builder": "~17.2.0",
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular-eslint/eslint-plugin-template": "~17.2.0",
"@angular-eslint/schematics": "~17.2.0",
"@angular-eslint/template-parser": "~17.2.0",
"@angular/cli": "~17.1.0",
"@angular/compiler-cli": "~17.1.0",
"@angular/language-service": "~17.1.0",
"@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1",
"@typescript-eslint/eslint-plugin": "6.9.1",
@ -56,7 +57,8 @@
"karma-coverage": "~2.1.0",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.7.0",
"ng-packagr": "^17.0.0",
"typescript": "~5.2.0"
"ng-packagr": "~17.1.0",
"symlink": "^2.0.0",
"typescript": "~5.3.0"
}
}

Loading…
Cancel
Save