@nrwl/angular 15.3.0-beta.12 → 15.3.0-beta.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/package.json +8 -9
- package/plugins/component-testing.js +1 -1
- package/plugins/component-testing.js.map +1 -1
- package/src/generators/add-linting/add-linting.js +8 -0
- package/src/generators/add-linting/add-linting.js.map +1 -1
- package/src/generators/add-linting/angular-v14/add-linting.d.ts +4 -0
- package/src/generators/add-linting/angular-v14/add-linting.js +41 -0
- package/src/generators/add-linting/angular-v14/add-linting.js.map +1 -0
- package/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.d.ts +2 -0
- package/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.js +14 -0
- package/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.js.map +1 -0
- package/src/generators/add-linting/angular-v14/lib/add-project-lint-target.d.ts +3 -0
- package/src/generators/add-linting/angular-v14/lib/add-project-lint-target.js +21 -0
- package/src/generators/add-linting/angular-v14/lib/add-project-lint-target.js.map +1 -0
- package/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.d.ts +78 -0
- package/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.js +111 -0
- package/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.js.map +1 -0
- package/src/generators/add-linting/angular-v14/schema.d.ts +9 -0
- package/src/generators/application/angular-v14/application.d.ts +4 -0
- package/src/generators/application/angular-v14/application.js +98 -0
- package/src/generators/application/angular-v14/application.js.map +1 -0
- package/src/generators/application/angular-v14/files/src/app/app.routes.ts__tpl__ +3 -0
- package/src/generators/application/angular-v14/files/src/favicon.ico +0 -0
- package/src/generators/application/angular-v14/files/tsconfig.editor.json__tpl__ +5 -0
- package/src/generators/application/angular-v14/lib/add-e2e.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/add-e2e.js +58 -0
- package/src/generators/application/angular-v14/lib/add-e2e.js.map +1 -0
- package/src/generators/application/angular-v14/lib/add-linting.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/add-linting.js +23 -0
- package/src/generators/application/angular-v14/lib/add-linting.js.map +1 -0
- package/src/generators/application/angular-v14/lib/add-protractor.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/add-protractor.js +18 -0
- package/src/generators/application/angular-v14/lib/add-protractor.js.map +1 -0
- package/src/generators/application/angular-v14/lib/add-proxy-config.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/add-proxy-config.js +23 -0
- package/src/generators/application/angular-v14/lib/add-proxy-config.js.map +1 -0
- package/src/generators/application/angular-v14/lib/add-unit-test-runner.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/add-unit-test-runner.js +29 -0
- package/src/generators/application/angular-v14/lib/add-unit-test-runner.js.map +1 -0
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js +82 -0
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js.map +1 -0
- package/src/generators/application/angular-v14/lib/create-files.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/create-files.js +12 -0
- package/src/generators/application/angular-v14/lib/create-files.js.map +1 -0
- package/src/generators/application/angular-v14/lib/enable-strict-type-checking.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/enable-strict-type-checking.js +27 -0
- package/src/generators/application/angular-v14/lib/enable-strict-type-checking.js.map +1 -0
- package/src/generators/application/angular-v14/lib/index.d.ts +21 -0
- package/src/generators/application/angular-v14/lib/index.js +25 -0
- package/src/generators/application/angular-v14/lib/index.js.map +1 -0
- package/src/generators/application/angular-v14/lib/normalize-options.d.ts +4 -0
- package/src/generators/application/angular-v14/lib/normalize-options.js +51 -0
- package/src/generators/application/angular-v14/lib/normalize-options.js.map +1 -0
- package/src/generators/application/angular-v14/lib/normalized-schema.d.ts +15 -0
- package/src/generators/application/angular-v14/lib/normalized-schema.js +3 -0
- package/src/generators/application/angular-v14/lib/normalized-schema.js.map +1 -0
- package/src/generators/application/angular-v14/lib/nrwl-home-tpl.d.ts +4 -0
- package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js +802 -0
- package/src/generators/application/angular-v14/lib/nrwl-home-tpl.js.map +1 -0
- package/src/generators/application/angular-v14/lib/remove-scaffolded-e2e.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/remove-scaffolded-e2e.js +23 -0
- package/src/generators/application/angular-v14/lib/remove-scaffolded-e2e.js.map +1 -0
- package/src/generators/application/angular-v14/lib/root-router-config.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/root-router-config.js +16 -0
- package/src/generators/application/angular-v14/lib/root-router-config.js.map +1 -0
- package/src/generators/application/angular-v14/lib/set-app-strict-default.d.ts +2 -0
- package/src/generators/application/angular-v14/lib/set-app-strict-default.js +16 -0
- package/src/generators/application/angular-v14/lib/set-app-strict-default.js.map +1 -0
- package/src/generators/application/angular-v14/lib/set-default-project.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/set-default-project.js +13 -0
- package/src/generators/application/angular-v14/lib/set-default-project.js.map +1 -0
- package/src/generators/application/angular-v14/lib/update-app-component-template.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/update-app-component-template.js +22 -0
- package/src/generators/application/angular-v14/lib/update-app-component-template.js.map +1 -0
- package/src/generators/application/angular-v14/lib/update-component-spec.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/update-component-spec.js +29 -0
- package/src/generators/application/angular-v14/lib/update-component-spec.js.map +1 -0
- package/src/generators/application/angular-v14/lib/update-config-files.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/update-config-files.js +74 -0
- package/src/generators/application/angular-v14/lib/update-config-files.js.map +1 -0
- package/src/generators/application/angular-v14/lib/update-e2e-project.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/update-e2e-project.js +41 -0
- package/src/generators/application/angular-v14/lib/update-e2e-project.js.map +1 -0
- package/src/generators/application/angular-v14/lib/update-editor-tsconfig.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/update-editor-tsconfig.js +27 -0
- package/src/generators/application/angular-v14/lib/update-editor-tsconfig.js.map +1 -0
- package/src/generators/application/angular-v14/lib/update-nx-component-template.d.ts +3 -0
- package/src/generators/application/angular-v14/lib/update-nx-component-template.js +31 -0
- package/src/generators/application/angular-v14/lib/update-nx-component-template.js.map +1 -0
- package/src/generators/application/angular-v14/schema.d.ts +30 -0
- package/src/generators/application/application.d.ts +1 -1
- package/src/generators/application/application.js +33 -25
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/files/tsconfig.editor.json__tpl__ +1 -1
- package/src/generators/application/lib/update-config-files.js +5 -3
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/change-storybook-targets/change-storybook-targets.js +4 -2
- package/src/generators/change-storybook-targets/change-storybook-targets.js.map +1 -1
- package/src/generators/component/angular-v14/component.d.ts +4 -0
- package/src/generators/component/angular-v14/component.js +39 -0
- package/src/generators/component/angular-v14/component.js.map +1 -0
- package/src/generators/component/angular-v14/lib/component.d.ts +3 -0
- package/src/generators/component/angular-v14/lib/component.js +37 -0
- package/src/generators/component/angular-v14/lib/component.js.map +1 -0
- package/src/generators/component/angular-v14/lib/entry-point.d.ts +2 -0
- package/src/generators/component/angular-v14/lib/entry-point.js +17 -0
- package/src/generators/component/angular-v14/lib/entry-point.js.map +1 -0
- package/src/generators/component/angular-v14/lib/module.d.ts +3 -0
- package/src/generators/component/angular-v14/lib/module.js +64 -0
- package/src/generators/component/angular-v14/lib/module.js.map +1 -0
- package/src/generators/component/angular-v14/lib/normalize-options.d.ts +3 -0
- package/src/generators/component/angular-v14/lib/normalize-options.js +27 -0
- package/src/generators/component/angular-v14/lib/normalize-options.js.map +1 -0
- package/src/generators/component/angular-v14/schema.d.ts +26 -0
- package/src/generators/component/component.js +8 -0
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/init/angular-v14/init.js +19 -15
- package/src/generators/init/angular-v14/init.js.map +1 -1
- package/src/generators/init/init.js +19 -15
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/karma/angular-v14/files/karma.conf.js__tmpl__ +44 -0
- package/src/generators/karma/angular-v14/karma.d.ts +4 -0
- package/src/generators/karma/angular-v14/karma.js +57 -0
- package/src/generators/karma/angular-v14/karma.js.map +1 -0
- package/src/generators/karma/angular-v14/schema.d.ts +3 -0
- package/src/generators/karma/karma.d.ts +1 -1
- package/src/generators/karma/karma.js +30 -19
- package/src/generators/karma/karma.js.map +1 -1
- package/src/generators/karma-project/files/common/tsconfig.spec.json +1 -1
- package/src/generators/karma-project/files/workspace-with-root-project/karma.conf.js__tmpl__ +15 -2
- package/src/generators/karma-project/karma-project.js +1 -1
- package/src/generators/karma-project/karma-project.js.map +1 -1
- package/src/generators/karma-project/lib/generate-karma-project-files.js +11 -0
- package/src/generators/karma-project/lib/generate-karma-project-files.js.map +1 -1
- package/src/generators/library/lib/update-project.js +7 -1
- package/src/generators/library/lib/update-project.js.map +1 -1
- package/src/generators/library/lib/update-tsconfig.js +6 -4
- package/src/generators/library/lib/update-tsconfig.js.map +1 -1
- package/src/generators/ng-add/files/root/apps/__dot__gitkeep +0 -0
- package/src/generators/ng-add/migrate-from-angular-cli.js +1 -0
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.d.ts +1 -0
- package/src/generators/ng-add/utilities/workspace.js +10 -1
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/setup-tailwind/angular-v14/files/v2/tailwind.config.js__tmpl__ +18 -0
- package/src/generators/setup-tailwind/angular-v14/files/v3/tailwind.config.js__tmpl__ +14 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config-path-to-project.d.ts +3 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config-path-to-project.js +32 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config-path-to-project.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config.d.ts +3 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config.js +18 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-required-packages.d.ts +2 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-required-packages.js +14 -0
- package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-required-packages.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/lib/detect-tailwind-installed-version.d.ts +2 -0
- package/src/generators/setup-tailwind/angular-v14/lib/detect-tailwind-installed-version.js +21 -0
- package/src/generators/setup-tailwind/angular-v14/lib/detect-tailwind-installed-version.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/lib/index.d.ts +6 -0
- package/src/generators/setup-tailwind/angular-v14/lib/index.js +10 -0
- package/src/generators/setup-tailwind/angular-v14/lib/index.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/lib/normalize-options.d.ts +2 -0
- package/src/generators/setup-tailwind/angular-v14/lib/normalize-options.js +8 -0
- package/src/generators/setup-tailwind/angular-v14/lib/normalize-options.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/lib/update-application-styles.d.ts +3 -0
- package/src/generators/setup-tailwind/angular-v14/lib/update-application-styles.js +54 -0
- package/src/generators/setup-tailwind/angular-v14/lib/update-application-styles.js.map +1 -0
- package/src/generators/setup-tailwind/angular-v14/schema.d.ts +11 -0
- package/src/generators/setup-tailwind/angular-v14/setup-tailwind.d.ts +4 -0
- package/src/generators/setup-tailwind/angular-v14/setup-tailwind.js +33 -0
- package/src/generators/setup-tailwind/angular-v14/setup-tailwind.js.map +1 -0
- package/src/generators/setup-tailwind/setup-tailwind.js +8 -0
- package/src/generators/setup-tailwind/setup-tailwind.js.map +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.d.ts +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +5 -2
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map +1 -1
- package/src/generators/utils/create-ts-config.d.ts +8 -0
- package/src/generators/utils/create-ts-config.js +34 -0
- package/src/generators/utils/create-ts-config.js.map +1 -0
- package/src/migrations/update-12-3-0/update-storybook.js.map +1 -1
- package/src/generators/application/files/tsconfig.json +0 -10
- package/src/generators/library/files/lib/tsconfig.json__tpl__ +0 -14
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
# [15.3.0-beta.
|
|
6
|
+
# [15.3.0-beta.13](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.13) (2022-12-05)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.3.0-beta.
|
|
3
|
+
"version": "15.3.0-beta.13",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
6
6
|
"repository": {
|
|
@@ -68,13 +68,12 @@
|
|
|
68
68
|
"dependencies": {
|
|
69
69
|
"@angular-devkit/schematics": "~15.0.1",
|
|
70
70
|
"@nguniversal/builders": "~15.0.0",
|
|
71
|
-
"@nrwl/cypress": "15.3.0-beta.
|
|
72
|
-
"@nrwl/devkit": "15.3.0-beta.
|
|
73
|
-
"@nrwl/jest": "15.3.0-beta.
|
|
74
|
-
"@nrwl/linter": "15.3.0-beta.
|
|
75
|
-
"@nrwl/
|
|
76
|
-
"@nrwl/
|
|
77
|
-
"@nrwl/workspace": "15.3.0-beta.12",
|
|
71
|
+
"@nrwl/cypress": "15.3.0-beta.13",
|
|
72
|
+
"@nrwl/devkit": "15.3.0-beta.13",
|
|
73
|
+
"@nrwl/jest": "15.3.0-beta.13",
|
|
74
|
+
"@nrwl/linter": "15.3.0-beta.13",
|
|
75
|
+
"@nrwl/webpack": "15.3.0-beta.13",
|
|
76
|
+
"@nrwl/workspace": "15.3.0-beta.13",
|
|
78
77
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
79
78
|
"@schematics/angular": "~15.0.1",
|
|
80
79
|
"chalk": "4.1.0",
|
|
@@ -100,5 +99,5 @@
|
|
|
100
99
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
101
100
|
"typings": "index.d.ts",
|
|
102
101
|
"sideEffects": false,
|
|
103
|
-
"gitHead": "
|
|
102
|
+
"gitHead": "61d7d74378305ba96f9e94707aefeecb438328ca"
|
|
104
103
|
}
|
|
@@ -56,7 +56,7 @@ ${e.stack ? e.stack : e}`);
|
|
|
56
56
|
const buildableProjectConfig = normalizeBuildTargetOptions(buildContext, ctContext, offset);
|
|
57
57
|
return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), {
|
|
58
58
|
// NOTE: cannot use a glob pattern since it will break cypress generated tsconfig.
|
|
59
|
-
specPattern: ['
|
|
59
|
+
specPattern: ['src/**/*.cy.ts', 'src/**/*.cy.js'], devServer: Object.assign(Object.assign({}, {
|
|
60
60
|
framework: 'angular',
|
|
61
61
|
bundler: 'webpack',
|
|
62
62
|
}), { options: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":";;;AAAA,yEAK8C;AAC9C,mEAG4C;AAC5C,yCAYsB;AACtB,2BAAqE;AACrE,+BAA+C;AAG/C;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAgB,wBAAwB,CACtC,YAAoB,EACpB,OAAmC;;IAEnC,IAAI,KAAmB,CAAC;IACxB,IAAI;QACF,KAAK,GAAG,IAAA,+BAAsB,GAAE,CAAC;KAClC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK;QACb,qEAAqE;QACrE;;;EAGJ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CACpB,CAAC;KACH;IAED,MAAM,eAAe,GAAG,IAAA,uCAAsB,EAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACpE,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;IACxE,MAAM,SAAS,GAAG,IAAA,sCAAqB,EACrC,KAAK,EACL,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,IAAI,EACpB,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,KAAI,gBAAgB,EACzC,mBAAmB,CACpB,CAAC;IAEF,MAAM,WAAW,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAElD,IAAI,CAAC,WAAW,CAAC,OAAO,IAAI,CAAC,CAAA,MAAA,MAAA,KAAK,CAAC,KAAK,0CAAG,WAAW,CAAC,OAAO,CAAC,0CAAE,IAAI,CAAA,EAAE;QACrE,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA;oBACZ,WAAW,CAAC,OAAO;0BACb,CAAC,CAAC,CAAA,MAAA,MAAA,KAAK,CAAC,KAAK,0CAAG,WAAW,CAAC,OAAO,CAAC,0CAAE,IAAI,CAAA,EAAE,CAAC,CAAC;KACrE;IAED,MAAM,iBAAiB,GAAG,IAAA,eAAQ,EAAC,sBAAa,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,+BAA+B,GAAG,IAAA,cAAS,EAAC,YAAY,CAAC,CAAC,MAAM,EAAE;QACtE,CAAC,CAAC,IAAA,cAAO,EAAC,iBAAiB,CAAC;QAC5B,CAAC,CAAC,iBAAiB,CAAC;IACtB,MAAM,MAAM,GAAG,IAAA,uBAAc,EAAC,+BAA+B,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG,IAAA,sCAAqB,EACxC,KAAK,EACL,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,EAC7C,WAAW,CAAC,OAAO,EACnB,WAAW,CAAC,MAAM,EAClB,WAAW,CAAC,aAAa,CAC1B,CAAC;IAEF,MAAM,sBAAsB,GAAG,2BAA2B,CACxD,YAAY,EACZ,SAAS,EACT,MAAM,CACP,CAAC;IAEF,uCACK,IAAA,oCAAmB,EAAC,YAAY,CAAC;QACpC,kFAAkF;QAClF,WAAW,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,16 @@ const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-pr
|
|
|
8
8
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
9
9
|
const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
|
|
10
10
|
const create_eslint_configuration_1 = require("./lib/create-eslint-configuration");
|
|
11
|
+
const get_generator_directory_for_ng_version_1 = require("../../utils/get-generator-directory-for-ng-version");
|
|
12
|
+
const path_1 = require("path");
|
|
11
13
|
function addLintingGenerator(tree, options) {
|
|
12
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
|
+
const generatorDirectory = (0, get_generator_directory_for_ng_version_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
|
|
16
|
+
if (generatorDirectory) {
|
|
17
|
+
let previousGenerator = yield Promise.resolve().then(() => require((0, path_1.join)(__dirname, generatorDirectory, 'add-linting')));
|
|
18
|
+
yield previousGenerator.default(tree, options);
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
13
21
|
const tasks = [];
|
|
14
22
|
const rootProject = options.projectRoot === '.' || options.projectRoot === '';
|
|
15
23
|
const lintTask = yield (0, linter_1.lintProjectGenerator)(tree, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,yCAA4D;AAC5D,wFAAuF;AACvF,2FAAqF;AACrF,2FAAqF;AACrF,mFAA4E;
|
|
1
|
+
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,yCAA4D;AAC5D,wFAAuF;AACvF,2FAAqF;AACrF,2FAAqF;AACrF,mFAA4E;AAE5E,+GAAqH;AACrH,+BAA4B;AAE5B,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,MAAM,kBAAkB,GACtB,IAAA,wFAA+C,EAAC,IAAI,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACtB,IAAI,iBAAiB,GAAG,2CACtB,IAAA,WAAI,EAAC,SAAS,EAAE,kBAAkB,EAAE,aAAa,CAAC,EACnD,CAAC;YACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/C,OAAO;SACR;QAED,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC;QAC9E,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aAC5D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE;gBAClB,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;gBACtD,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC;aACzD;YACD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,WAAW;SACzB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,qDAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,CACjD,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,MAAM,WAAW,GAAG,MAAM,IAAA,8DAA4B,EAAC,IAAI,CAAC,CAAC;YAC7D,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AA7CD,kDA6CC;AAED,kBAAe,mBAAmB,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
|
+
import type { AddLintingGeneratorSchema } from './schema';
|
|
3
|
+
export declare function addLintingGenerator(tree: Tree, options: AddLintingGeneratorSchema): Promise<GeneratorCallback>;
|
|
4
|
+
export default addLintingGenerator;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addLintingGenerator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const linter_1 = require("@nrwl/linter");
|
|
7
|
+
const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
|
|
8
|
+
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
9
|
+
const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
|
|
10
|
+
const create_eslint_configuration_1 = require("./lib/create-eslint-configuration");
|
|
11
|
+
function addLintingGenerator(tree, options) {
|
|
12
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
const tasks = [];
|
|
14
|
+
const rootProject = options.projectRoot === '.' || options.projectRoot === '';
|
|
15
|
+
const lintTask = yield (0, linter_1.lintProjectGenerator)(tree, {
|
|
16
|
+
linter: linter_1.Linter.EsLint,
|
|
17
|
+
project: options.projectName,
|
|
18
|
+
tsConfigPaths: [
|
|
19
|
+
(0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
|
|
20
|
+
],
|
|
21
|
+
unitTestRunner: options.unitTestRunner,
|
|
22
|
+
eslintFilePatterns: [
|
|
23
|
+
(0, lint_project_1.mapLintPattern)(options.projectRoot, 'ts', rootProject),
|
|
24
|
+
(0, lint_project_1.mapLintPattern)(options.projectRoot, 'html', rootProject),
|
|
25
|
+
],
|
|
26
|
+
setParserOptionsProject: options.setParserOptionsProject,
|
|
27
|
+
skipFormat: true,
|
|
28
|
+
rootProject: rootProject,
|
|
29
|
+
});
|
|
30
|
+
tasks.push(lintTask);
|
|
31
|
+
(0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintrc.json'), (json) => (0, create_eslint_configuration_1.extendAngularEslintJson)(json, options));
|
|
32
|
+
if (!options.skipPackageJson) {
|
|
33
|
+
const installTask = yield (0, add_angular_eslint_dependencies_1.addAngularEsLintDependencies)(tree);
|
|
34
|
+
tasks.push(installTask);
|
|
35
|
+
}
|
|
36
|
+
return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
exports.addLintingGenerator = addLintingGenerator;
|
|
40
|
+
exports.default = addLintingGenerator;
|
|
41
|
+
//# sourceMappingURL=add-linting.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/angular-v14/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,yCAA4D;AAC5D,wFAAuF;AACvF,2FAAqF;AACrF,2FAAqF;AACrF,mFAA4E;AAG5E,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC;QAC9E,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aAC5D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE;gBAClB,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;gBACtD,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC;aACzD;YACD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,WAAW;SACzB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,qDAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,CACjD,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,MAAM,WAAW,GAAG,MAAM,IAAA,8DAA4B,EAAC,IAAI,CAAC,CAAC;YAC7D,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAnCD,kDAmCC;AAED,kBAAe,mBAAmB,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addAngularEsLintDependencies = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const versions_1 = require("../../../../utils/versions");
|
|
6
|
+
function addAngularEsLintDependencies(tree) {
|
|
7
|
+
return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
8
|
+
'@angular-eslint/eslint-plugin': versions_1.versions.angularV14.angularEslintVersion,
|
|
9
|
+
'@angular-eslint/eslint-plugin-template': versions_1.versions.angularV14.angularEslintVersion,
|
|
10
|
+
'@angular-eslint/template-parser': versions_1.versions.angularV14.angularEslintVersion,
|
|
11
|
+
});
|
|
12
|
+
}
|
|
13
|
+
exports.addAngularEsLintDependencies = addAngularEsLintDependencies;
|
|
14
|
+
//# sourceMappingURL=add-angular-eslint-dependencies.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-angular-eslint-dependencies.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,yDAAsD;AAEtD,SAAgB,4BAA4B,CAAC,IAAU;IACrD,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,+BAA+B,EAAE,mBAAQ,CAAC,UAAU,CAAC,oBAAoB;QACzE,wCAAwC,EACtC,mBAAQ,CAAC,UAAU,CAAC,oBAAoB;QAC1C,iCAAiC,EAC/B,mBAAQ,CAAC,UAAU,CAAC,oBAAoB;KAC3C,CACF,CAAC;AACJ,CAAC;AAZD,oEAYC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addProjectLintTarget = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
|
|
6
|
+
function addProjectLintTarget(tree, options) {
|
|
7
|
+
const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
|
|
8
|
+
const rootProject = options.projectRoot === '.' || options.projectRoot === '';
|
|
9
|
+
project.targets.lint = {
|
|
10
|
+
executor: '@nrwl/linter:eslint',
|
|
11
|
+
options: {
|
|
12
|
+
lintFilePatterns: [
|
|
13
|
+
(0, lint_project_1.mapLintPattern)(options.projectRoot, 'ts', rootProject),
|
|
14
|
+
(0, lint_project_1.mapLintPattern)(options.projectRoot, 'html', rootProject),
|
|
15
|
+
],
|
|
16
|
+
},
|
|
17
|
+
};
|
|
18
|
+
(0, devkit_1.updateProjectConfiguration)(tree, options.projectName, project);
|
|
19
|
+
}
|
|
20
|
+
exports.addProjectLintTarget = addProjectLintTarget;
|
|
21
|
+
//# sourceMappingURL=add-project-lint-target.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-project-lint-target.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/add-linting/angular-v14/lib/add-project-lint-target.ts"],"names":[],"mappings":";;;AACA,yCAGsB;AACtB,wFAAuF;AAGvF,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAAkC;IAElC,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC;IAC9E,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG;QACrB,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE;YACP,gBAAgB,EAAE;gBAChB,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;gBACtD,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC;aACzD;SACF;KACF,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACjE,CAAC;AAhBD,oDAgBC"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import type { Tree } from '@nrwl/devkit';
|
|
2
|
+
import type { Linter } from 'eslint';
|
|
3
|
+
import type { AddLintingGeneratorSchema } from '../schema';
|
|
4
|
+
declare type EslintExtensionSchema = {
|
|
5
|
+
prefix: string;
|
|
6
|
+
};
|
|
7
|
+
export declare const extendAngularEslintJson: (json: Linter.Config, options: EslintExtensionSchema) => {
|
|
8
|
+
overrides: ({
|
|
9
|
+
files: string[];
|
|
10
|
+
extends: string[];
|
|
11
|
+
rules: {
|
|
12
|
+
'@angular-eslint/directive-selector': (string | {
|
|
13
|
+
type: string;
|
|
14
|
+
prefix: string;
|
|
15
|
+
style: string;
|
|
16
|
+
})[];
|
|
17
|
+
'@angular-eslint/component-selector': (string | {
|
|
18
|
+
type: string;
|
|
19
|
+
prefix: string;
|
|
20
|
+
style: string;
|
|
21
|
+
})[];
|
|
22
|
+
};
|
|
23
|
+
excludedFiles?: string | string[];
|
|
24
|
+
$schema?: string;
|
|
25
|
+
env?: {
|
|
26
|
+
[name: string]: boolean;
|
|
27
|
+
};
|
|
28
|
+
globals?: {
|
|
29
|
+
[name: string]: boolean | "readonly" | "readable" | "writable" | "writeable";
|
|
30
|
+
};
|
|
31
|
+
noInlineConfig?: boolean;
|
|
32
|
+
overrides?: Linter.ConfigOverride<Linter.RulesRecord>[];
|
|
33
|
+
parser?: string;
|
|
34
|
+
parserOptions?: Linter.ParserOptions;
|
|
35
|
+
plugins?: string[];
|
|
36
|
+
processor?: string;
|
|
37
|
+
reportUnusedDisableDirectives?: boolean;
|
|
38
|
+
settings?: {
|
|
39
|
+
[name: string]: any;
|
|
40
|
+
};
|
|
41
|
+
} | {
|
|
42
|
+
files: string[];
|
|
43
|
+
extends: string[];
|
|
44
|
+
/**
|
|
45
|
+
* Having an empty rules object present makes it more obvious to the user where they would
|
|
46
|
+
* extend things from if they needed to
|
|
47
|
+
*/
|
|
48
|
+
rules: {
|
|
49
|
+
'@angular-eslint/directive-selector'?: undefined;
|
|
50
|
+
'@angular-eslint/component-selector'?: undefined;
|
|
51
|
+
};
|
|
52
|
+
})[];
|
|
53
|
+
ignorePatterns?: string | string[];
|
|
54
|
+
root?: boolean;
|
|
55
|
+
$schema?: string;
|
|
56
|
+
env?: {
|
|
57
|
+
[name: string]: boolean;
|
|
58
|
+
};
|
|
59
|
+
extends?: string | string[];
|
|
60
|
+
globals?: {
|
|
61
|
+
[name: string]: boolean | "readonly" | "readable" | "writable" | "writeable";
|
|
62
|
+
};
|
|
63
|
+
noInlineConfig?: boolean;
|
|
64
|
+
parser?: string;
|
|
65
|
+
parserOptions?: Linter.ParserOptions;
|
|
66
|
+
plugins?: string[];
|
|
67
|
+
processor?: string;
|
|
68
|
+
reportUnusedDisableDirectives?: boolean;
|
|
69
|
+
settings?: {
|
|
70
|
+
[name: string]: any;
|
|
71
|
+
};
|
|
72
|
+
rules?: Partial<Linter.RulesRecord>;
|
|
73
|
+
};
|
|
74
|
+
/**
|
|
75
|
+
* @deprecated Use {@link extendAngularEslintJson} instead
|
|
76
|
+
*/
|
|
77
|
+
export declare function createEsLintConfiguration(tree: Tree, options: AddLintingGeneratorSchema): void;
|
|
78
|
+
export {};
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createEsLintConfiguration = exports.extendAngularEslintJson = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const strings_1 = require("@nrwl/workspace/src/utils/strings");
|
|
6
|
+
const extendAngularEslintJson = (json, options) => {
|
|
7
|
+
const overrides = [
|
|
8
|
+
Object.assign(Object.assign({}, json.overrides[0]), { files: ['*.ts'], extends: [
|
|
9
|
+
...(json.overrides[0].extends || []),
|
|
10
|
+
'plugin:@nrwl/nx/angular',
|
|
11
|
+
'plugin:@angular-eslint/template/process-inline-templates',
|
|
12
|
+
], rules: {
|
|
13
|
+
'@angular-eslint/directive-selector': [
|
|
14
|
+
'error',
|
|
15
|
+
{
|
|
16
|
+
type: 'attribute',
|
|
17
|
+
prefix: (0, strings_1.camelize)(options.prefix),
|
|
18
|
+
style: 'camelCase',
|
|
19
|
+
},
|
|
20
|
+
],
|
|
21
|
+
'@angular-eslint/component-selector': [
|
|
22
|
+
'error',
|
|
23
|
+
{
|
|
24
|
+
type: 'element',
|
|
25
|
+
prefix: (0, strings_1.dasherize)(options.prefix),
|
|
26
|
+
style: 'kebab-case',
|
|
27
|
+
},
|
|
28
|
+
],
|
|
29
|
+
} }),
|
|
30
|
+
{
|
|
31
|
+
files: ['*.html'],
|
|
32
|
+
extends: ['plugin:@nrwl/nx/angular-template'],
|
|
33
|
+
/**
|
|
34
|
+
* Having an empty rules object present makes it more obvious to the user where they would
|
|
35
|
+
* extend things from if they needed to
|
|
36
|
+
*/
|
|
37
|
+
rules: {},
|
|
38
|
+
},
|
|
39
|
+
];
|
|
40
|
+
return Object.assign(Object.assign({}, json), { overrides });
|
|
41
|
+
};
|
|
42
|
+
exports.extendAngularEslintJson = extendAngularEslintJson;
|
|
43
|
+
/**
|
|
44
|
+
* @deprecated Use {@link extendAngularEslintJson} instead
|
|
45
|
+
*/
|
|
46
|
+
function createEsLintConfiguration(tree, options) {
|
|
47
|
+
const rootConfig = `${(0, devkit_1.offsetFromRoot)(options.projectRoot)}.eslintrc.json`;
|
|
48
|
+
// Include all project files to be linted (since they are turned off in the root eslintrc file).
|
|
49
|
+
const ignorePatterns = ['!**/*'];
|
|
50
|
+
const configJson = {
|
|
51
|
+
extends: [rootConfig],
|
|
52
|
+
ignorePatterns,
|
|
53
|
+
overrides: [
|
|
54
|
+
{
|
|
55
|
+
files: ['*.ts'],
|
|
56
|
+
extends: [
|
|
57
|
+
'plugin:@nrwl/nx/angular',
|
|
58
|
+
'plugin:@angular-eslint/template/process-inline-templates',
|
|
59
|
+
],
|
|
60
|
+
/**
|
|
61
|
+
* NOTE: We no longer set parserOptions.project by default when creating new projects.
|
|
62
|
+
*
|
|
63
|
+
* We have observed that users rarely add rules requiring type-checking to their Nx workspaces, and therefore
|
|
64
|
+
* do not actually need the capabilites which parserOptions.project provides. When specifying parserOptions.project,
|
|
65
|
+
* typescript-eslint needs to create full TypeScript Programs for you. When omitting it, it can perform a simple
|
|
66
|
+
* parse (and AST tranformation) of the source files it encounters during a lint run, which is much faster and much
|
|
67
|
+
* less memory intensive.
|
|
68
|
+
*
|
|
69
|
+
* In the rare case that users attempt to add rules requiring type-checking to their setup later on (and haven't set
|
|
70
|
+
* parserOptions.project), the executor will attempt to look for the particular error typescript-eslint gives you
|
|
71
|
+
* and provide feedback to the user.
|
|
72
|
+
*/
|
|
73
|
+
parserOptions: !options.setParserOptionsProject
|
|
74
|
+
? undefined
|
|
75
|
+
: {
|
|
76
|
+
project: [`${options.projectRoot}/tsconfig.*?.json`],
|
|
77
|
+
},
|
|
78
|
+
rules: {
|
|
79
|
+
'@angular-eslint/directive-selector': [
|
|
80
|
+
'error',
|
|
81
|
+
{
|
|
82
|
+
type: 'attribute',
|
|
83
|
+
prefix: (0, strings_1.camelize)(options.prefix),
|
|
84
|
+
style: 'camelCase',
|
|
85
|
+
},
|
|
86
|
+
],
|
|
87
|
+
'@angular-eslint/component-selector': [
|
|
88
|
+
'error',
|
|
89
|
+
{
|
|
90
|
+
type: 'element',
|
|
91
|
+
prefix: (0, strings_1.dasherize)(options.prefix),
|
|
92
|
+
style: 'kebab-case',
|
|
93
|
+
},
|
|
94
|
+
],
|
|
95
|
+
},
|
|
96
|
+
},
|
|
97
|
+
{
|
|
98
|
+
files: ['*.html'],
|
|
99
|
+
extends: ['plugin:@nrwl/nx/angular-template'],
|
|
100
|
+
/**
|
|
101
|
+
* Having an empty rules object present makes it more obvious to the user where they would
|
|
102
|
+
* extend things from if they needed to
|
|
103
|
+
*/
|
|
104
|
+
rules: {},
|
|
105
|
+
},
|
|
106
|
+
],
|
|
107
|
+
};
|
|
108
|
+
(0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintrc.json'), configJson);
|
|
109
|
+
}
|
|
110
|
+
exports.createEsLintConfiguration = createEsLintConfiguration;
|
|
111
|
+
//# sourceMappingURL=create-eslint-configuration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-eslint-configuration.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/add-linting/angular-v14/lib/create-eslint-configuration.ts"],"names":[],"mappings":";;;AACA,yCAA4E;AAC5E,+DAAwE;AAQjE,MAAM,uBAAuB,GAAG,CACrC,IAAmB,EACnB,OAA8B,EAC9B,EAAE;IACF,MAAM,SAAS,GAAG;wCAEX,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KACpB,KAAK,EAAE,CAAC,MAAM,CAAC,EACf,OAAO,EAAE;gBACP,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC;gBACpC,yBAAyB;gBACzB,0DAA0D;aAC3D,EACD,KAAK,EAAE;gBACL,oCAAoC,EAAE;oBACpC,OAAO;oBACP;wBACE,IAAI,EAAE,WAAW;wBACjB,MAAM,EAAE,IAAA,kBAAQ,EAAC,OAAO,CAAC,MAAM,CAAC;wBAChC,KAAK,EAAE,WAAW;qBACnB;iBACF;gBACD,oCAAoC,EAAE;oBACpC,OAAO;oBACP;wBACE,IAAI,EAAE,SAAS;wBACf,MAAM,EAAE,IAAA,mBAAS,EAAC,OAAO,CAAC,MAAM,CAAC;wBACjC,KAAK,EAAE,YAAY;qBACpB;iBACF;aACF;QAEH;YACE,KAAK,EAAE,CAAC,QAAQ,CAAC;YACjB,OAAO,EAAE,CAAC,kCAAkC,CAAC;YAC7C;;;eAGG;YACH,KAAK,EAAE,EAAE;SACV;KACF,CAAC;IAEF,uCACK,IAAI,KACP,SAAS,IACT;AACJ,CAAC,CAAC;AA/CW,QAAA,uBAAuB,2BA+ClC;AAEF;;GAEG;AACH,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAAkC;IAElC,MAAM,UAAU,GAAG,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC;IAC1E,gGAAgG;IAChG,MAAM,cAAc,GAAG,CAAC,OAAO,CAAC,CAAC;IAEjC,MAAM,UAAU,GAAG;QACjB,OAAO,EAAE,CAAC,UAAU,CAAC;QACrB,cAAc;QACd,SAAS,EAAE;YACT;gBACE,KAAK,EAAE,CAAC,MAAM,CAAC;gBACf,OAAO,EAAE;oBACP,yBAAyB;oBACzB,0DAA0D;iBAC3D;gBACD;;;;;;;;;;;;mBAYG;gBACH,aAAa,EAAE,CAAC,OAAO,CAAC,uBAAuB;oBAC7C,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC;wBACE,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,mBAAmB,CAAC;qBACrD;gBACL,KAAK,EAAE;oBACL,oCAAoC,EAAE;wBACpC,OAAO;wBACP;4BACE,IAAI,EAAE,WAAW;4BACjB,MAAM,EAAE,IAAA,kBAAQ,EAAC,OAAO,CAAC,MAAM,CAAC;4BAChC,KAAK,EAAE,WAAW;yBACnB;qBACF;oBACD,oCAAoC,EAAE;wBACpC,OAAO;wBACP;4BACE,IAAI,EAAE,SAAS;4BACf,MAAM,EAAE,IAAA,mBAAS,EAAC,OAAO,CAAC,MAAM,CAAC;4BACjC,KAAK,EAAE,YAAY;yBACpB;qBACF;iBACF;aACF;YACD;gBACE,KAAK,EAAE,CAAC,QAAQ,CAAC;gBACjB,OAAO,EAAE,CAAC,kCAAkC,CAAC;gBAC7C;;;mBAGG;gBACH,KAAK,EAAE,EAAE;aACV;SACF;KACF,CAAC;IAEF,IAAA,kBAAS,EACP,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,UAAU,CACX,CAAC;AACJ,CAAC;AAxED,8DAwEC"}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.applicationGenerator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
7
|
+
const generators_1 = require("@nrwl/workspace/generators");
|
|
8
|
+
const test_runners_1 = require("../../../utils/test-runners");
|
|
9
|
+
const init_1 = require("../../init/init");
|
|
10
|
+
const setup_tailwind_1 = require("../../setup-tailwind/setup-tailwind");
|
|
11
|
+
const lib_1 = require("./lib");
|
|
12
|
+
function applicationGenerator(host, schema) {
|
|
13
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
|
+
const options = (0, lib_1.normalizeOptions)(host, schema);
|
|
15
|
+
yield (0, init_1.angularInitGenerator)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
|
|
16
|
+
const angularAppSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'application');
|
|
17
|
+
yield angularAppSchematic(host, {
|
|
18
|
+
name: options.name,
|
|
19
|
+
inlineStyle: options.inlineStyle,
|
|
20
|
+
inlineTemplate: options.inlineTemplate,
|
|
21
|
+
prefix: options.prefix,
|
|
22
|
+
skipTests: options.skipTests,
|
|
23
|
+
style: options.style,
|
|
24
|
+
viewEncapsulation: options.viewEncapsulation,
|
|
25
|
+
routing: false,
|
|
26
|
+
skipInstall: true,
|
|
27
|
+
skipPackageJson: options.skipPackageJson,
|
|
28
|
+
});
|
|
29
|
+
if (options.ngCliSchematicAppRoot !== options.appProjectRoot) {
|
|
30
|
+
(0, devkit_1.moveFilesToNewDirectory)(host, options.ngCliSchematicAppRoot, options.appProjectRoot);
|
|
31
|
+
}
|
|
32
|
+
(0, lib_1.createFiles)(host, options);
|
|
33
|
+
(0, lib_1.updateConfigFiles)(host, options);
|
|
34
|
+
(0, lib_1.updateAppComponentTemplate)(host, options);
|
|
35
|
+
// Create the NxWelcomeComponent
|
|
36
|
+
const angularComponentSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
|
|
37
|
+
yield angularComponentSchematic(host, {
|
|
38
|
+
name: 'NxWelcome',
|
|
39
|
+
inlineTemplate: true,
|
|
40
|
+
inlineStyle: true,
|
|
41
|
+
prefix: options.prefix,
|
|
42
|
+
skipTests: true,
|
|
43
|
+
style: options.style,
|
|
44
|
+
flat: true,
|
|
45
|
+
viewEncapsulation: 'None',
|
|
46
|
+
project: options.name,
|
|
47
|
+
standalone: options.standalone,
|
|
48
|
+
});
|
|
49
|
+
(0, lib_1.updateNxComponentTemplate)(host, options);
|
|
50
|
+
if (options.addTailwind) {
|
|
51
|
+
yield (0, setup_tailwind_1.setupTailwindGenerator)(host, {
|
|
52
|
+
project: options.name,
|
|
53
|
+
skipFormat: true,
|
|
54
|
+
skipPackageJson: options.skipPackageJson,
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
if (options.unitTestRunner !== test_runners_1.UnitTestRunner.None) {
|
|
58
|
+
(0, lib_1.updateComponentSpec)(host, options);
|
|
59
|
+
}
|
|
60
|
+
if (options.routing) {
|
|
61
|
+
(0, lib_1.addRouterRootConfiguration)(host, options);
|
|
62
|
+
}
|
|
63
|
+
yield (0, lib_1.addLinting)(host, options);
|
|
64
|
+
yield (0, lib_1.addUnitTestRunner)(host, options);
|
|
65
|
+
yield (0, lib_1.addE2e)(host, options);
|
|
66
|
+
(0, lib_1.updateEditorTsConfig)(host, options);
|
|
67
|
+
if (!options.skipDefaultProject) {
|
|
68
|
+
(0, lib_1.setDefaultProject)(host, options);
|
|
69
|
+
}
|
|
70
|
+
if (options.backendProject) {
|
|
71
|
+
(0, lib_1.addProxyConfig)(host, options);
|
|
72
|
+
}
|
|
73
|
+
if (options.strict) {
|
|
74
|
+
(0, lib_1.enableStrictTypeChecking)(host, options);
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
(0, lib_1.setApplicationStrictDefault)(host, false);
|
|
78
|
+
}
|
|
79
|
+
if (options.standaloneConfig) {
|
|
80
|
+
yield (0, generators_1.convertToNxProjectGenerator)(host, {
|
|
81
|
+
project: options.name,
|
|
82
|
+
all: false,
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
if (options.standalone) {
|
|
86
|
+
(0, lib_1.convertToStandaloneApp)(host, options);
|
|
87
|
+
}
|
|
88
|
+
if (!options.skipFormat) {
|
|
89
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
90
|
+
}
|
|
91
|
+
return () => {
|
|
92
|
+
(0, devkit_1.installPackagesTask)(host);
|
|
93
|
+
};
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
exports.applicationGenerator = applicationGenerator;
|
|
97
|
+
exports.default = applicationGenerator;
|
|
98
|
+
//# sourceMappingURL=application.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/angular-v14/application.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addE2e = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const cypress_1 = require("@nrwl/cypress");
|
|
7
|
+
const test_runners_1 = require("../../../../utils/test-runners");
|
|
8
|
+
const add_protractor_1 = require("./add-protractor");
|
|
9
|
+
const remove_scaffolded_e2e_1 = require("./remove-scaffolded-e2e");
|
|
10
|
+
const update_e2e_project_1 = require("./update-e2e-project");
|
|
11
|
+
const generators_1 = require("@nrwl/workspace/generators");
|
|
12
|
+
const linter_1 = require("@nrwl/linter");
|
|
13
|
+
function addE2e(tree, options) {
|
|
14
|
+
var _a;
|
|
15
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
+
if (options.e2eTestRunner === test_runners_1.E2eTestRunner.Protractor) {
|
|
17
|
+
yield (0, add_protractor_1.addProtractor)(tree, options);
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
(0, remove_scaffolded_e2e_1.removeScaffoldedE2e)(tree, options, options.ngCliSchematicE2ERoot);
|
|
21
|
+
}
|
|
22
|
+
if (options.e2eTestRunner === 'cypress') {
|
|
23
|
+
yield (0, cypress_1.cypressProjectGenerator)(tree, {
|
|
24
|
+
name: options.e2eProjectName,
|
|
25
|
+
directory: options.directory,
|
|
26
|
+
project: options.name,
|
|
27
|
+
linter: options.linter,
|
|
28
|
+
skipFormat: options.skipFormat,
|
|
29
|
+
standaloneConfig: options.standaloneConfig,
|
|
30
|
+
skipPackageJson: options.skipPackageJson,
|
|
31
|
+
rootProject: options.rootProject,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
if (options.e2eTestRunner === test_runners_1.E2eTestRunner.Protractor) {
|
|
35
|
+
(0, update_e2e_project_1.updateE2eProject)(tree, options);
|
|
36
|
+
if ((_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : (0, devkit_1.getWorkspaceLayout)(tree).standaloneAsDefault) {
|
|
37
|
+
yield (0, generators_1.convertToNxProjectGenerator)(tree, {
|
|
38
|
+
project: `${options.e2eProjectName}`,
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
if (options.linter === linter_1.Linter.EsLint) {
|
|
42
|
+
yield (0, linter_1.lintProjectGenerator)(tree, {
|
|
43
|
+
project: options.e2eProjectName,
|
|
44
|
+
linter: options.linter,
|
|
45
|
+
eslintFilePatterns: [
|
|
46
|
+
(0, devkit_1.joinPathFragments)(options.e2eProjectRoot, '**/*.ts'),
|
|
47
|
+
],
|
|
48
|
+
unitTestRunner: options.unitTestRunner,
|
|
49
|
+
skipFormat: true,
|
|
50
|
+
setParserOptionsProject: options.setParserOptionsProject,
|
|
51
|
+
skipPackageJson: options.skipPackageJson,
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
exports.addE2e = addE2e;
|
|
58
|
+
//# sourceMappingURL=add-e2e.js.map
|