@nrwl/angular 15.3.0-beta.12 → 15.3.0-beta.13

package/src/generators/karma/angular-v14/karma.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma/angular-v14/karma.ts"],"names":[],"mappings":";;;AACA,yCAOsB;AACtB,sDAAmD;AAGnD,SAAS,aAAa,CAAC,IAAU;;;IAC/B,MAAM,sBAAsB,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEhE,MAAM,iBAAiB,GAAG,MAAA,sBAAsB,CAAC,WAAW,0CAAE,UAAU,CAAC;IACzE,IAAI,iBAAiB,EAAE;QACrB,iBAAiB,CAAC,IAAI;QACpB,6CAA6C;QAC7C,gCAAgC;QAChC,4BAA4B;QAC5B,mCAAmC;QACnC,uBAAuB;QACvB,8BAA8B,CAC/B,CAAC;QACF,iBAAiB;QACjB,sBAAsB,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CACxD,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAC3B,CAAC;KACH;IAED,0FAA0F;IAC1F,MAAA,sBAAsB,CAAC,cAAc,oCAArC,sBAAsB,CAAC,cAAc,GAAK,EAAE,EAAC;IAC7C,YAAA,sBAAsB,CAAC,cAAc,EAAC,IAAI,uCAAJ,IAAI,GAAK,EAAE,EAAC;IAClD,YAAA,sBAAsB,CAAC,cAAc,CAAC,IAAI,EAAC,MAAM,uCAAN,MAAM,GAAK;QACpD,SAAS;QACT,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;KAC/C,EAAC;IACF,sBAAsB,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CACpD,+BAA+B,CAChC,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;AAC7D,CAAC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAEnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE;YAC9D,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,aAAa,CAAC,IAAI,CAAC,CAAC;KACrB;IAED,IAAI,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;QACnE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IAED,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,KAAK,EAAE,mBAAQ,CAAC,UAAU,CAAC,YAAY;QACvC,uBAAuB,EAAE,mBAAQ,CAAC,UAAU,CAAC,0BAA0B;QACvE,gBAAgB,EAAE,mBAAQ,CAAC,UAAU,CAAC,oBAAoB;QAC1D,eAAe,EAAE,mBAAQ,CAAC,UAAU,CAAC,mBAAmB;QACxD,6BAA6B,EAC3B,mBAAQ,CAAC,UAAU,CAAC,+BAA+B;QACrD,cAAc,EAAE,mBAAQ,CAAC,UAAU,CAAC,kBAAkB;QACtD,uBAAuB,EAAE,mBAAQ,CAAC,UAAU,CAAC,0BAA0B;QACvE,gBAAgB,EAAE,mBAAQ,CAAC,UAAU,CAAC,mBAAmB;QACzD,aAAa,EAAE,mBAAQ,CAAC,UAAU,CAAC,gBAAgB;KACpD,CACF,CAAC;AACJ,CAAC;AA/BD,wCA+BC;AAED,kBAAe,cAAc,CAAC"}

package/src/generators/karma/angular-v14/schema.d.ts

@@ -0,0 +1,3 @@
+export interface GeneratorOptions {
+  skipPackageJson?: boolean;
+}

package/src/generators/karma/karma.d.ts

@@ -1,4 +1,4 @@
 import type { Tree } from '@nrwl/devkit';
 import { GeneratorOptions } from './schema';
-export declare function karmaGenerator(tree: Tree, options: GeneratorOptions): import("@nrwl/devkit").GeneratorCallback;
+export declare function karmaGenerator(tree: Tree, options: GeneratorOptions): Promise<import("@nrwl/devkit").GeneratorCallback>;
 export default karmaGenerator;

package/src/generators/karma/karma.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.karmaGenerator = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const versions_1 = require("../../utils/versions");
+const get_generator_directory_for_ng_version_1 = require("../../utils/get-generator-directory-for-ng-version");
+const path_1 = require("path");
 function addTestInputs(tree) {
     var _a, _b, _c, _d;
     var _e, _f;
@@ -30,26 +33,34 @@ function addTestInputs(tree) {
     (0, devkit_1.updateWorkspaceConfiguration)(tree, workspaceConfiguration);
 }
 function karmaGenerator(tree, options) {
-    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
-    if (!tree.exists('karma.conf.js')) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), '.', {
-            tmpl: '',
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const generatorDirectory = (0, get_generator_directory_for_ng_version_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
+        if (generatorDirectory) {
+            let previousGenerator = yield Promise.resolve().then(() => require((0, path_1.join)(__dirname, generatorDirectory, 'karma')));
+            yield previousGenerator.default(tree, options);
+            return;
+        }
+        const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+        if (!tree.exists('karma.conf.js')) {
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), '.', {
+                tmpl: '',
+            });
+            addTestInputs(tree);
+        }
+        if (options.skipPackageJson || packageJson.devDependencies['karma']) {
+            return () => { };
+        }
+        return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            karma: versions_1.karmaVersion,
+            'karma-chrome-launcher': versions_1.karmaChromeLauncherVersion,
+            'karma-coverage': versions_1.karmaCoverageVersion,
+            'karma-jasmine': versions_1.karmaJasmineVersion,
+            'karma-jasmine-html-reporter': versions_1.karmaJasmineHtmlReporterVersion,
+            'jasmine-core': versions_1.jasmineCoreVersion,
+            'jasmine-spec-reporter': versions_1.jasmineSpecReporterVersion,
+            '@types/jasmine': versions_1.typesJasmineVersion,
+            '@types/node': versions_1.typesNodeVersion,
         });
-        addTestInputs(tree);
-    }
-    if (options.skipPackageJson || packageJson.devDependencies['karma']) {
-        return () => { };
-    }
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-        karma: versions_1.karmaVersion,
-        'karma-chrome-launcher': versions_1.karmaChromeLauncherVersion,
-        'karma-coverage': versions_1.karmaCoverageVersion,
-        'karma-jasmine': versions_1.karmaJasmineVersion,
-        'karma-jasmine-html-reporter': versions_1.karmaJasmineHtmlReporterVersion,
-        'jasmine-core': versions_1.jasmineCoreVersion,
-        'jasmine-spec-reporter': versions_1.jasmineSpecReporterVersion,
-        '@types/jasmine': versions_1.typesJasmineVersion,
-        '@types/node': versions_1.typesNodeVersion,
     });
 }
 exports.karmaGenerator = karmaGenerator;

package/src/generators/karma/karma.js.map

@@ -1 +1 @@
-{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;AACA,yCAOsB;AACtB,mDAU8B;AAG9B,SAAS,aAAa,CAAC,IAAU;;;IAC/B,MAAM,sBAAsB,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEhE,MAAM,iBAAiB,GAAG,MAAA,sBAAsB,CAAC,WAAW,0CAAE,UAAU,CAAC;IACzE,IAAI,iBAAiB,EAAE;QACrB,iBAAiB,CAAC,IAAI;QACpB,6CAA6C;QAC7C,gCAAgC;QAChC,4BAA4B;QAC5B,mCAAmC;QACnC,uBAAuB;QACvB,8BAA8B,CAC/B,CAAC;QACF,iBAAiB;QACjB,sBAAsB,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CACxD,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAC3B,CAAC;KACH;IAED,0FAA0F;IAC1F,MAAA,sBAAsB,CAAC,cAAc,oCAArC,sBAAsB,CAAC,cAAc,GAAK,EAAE,EAAC;IAC7C,YAAA,sBAAsB,CAAC,cAAc,EAAC,IAAI,uCAAJ,IAAI,GAAK,EAAE,EAAC;IAClD,YAAA,sBAAsB,CAAC,cAAc,CAAC,IAAI,EAAC,MAAM,uCAAN,MAAM,GAAK;QACpD,SAAS;QACT,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;KAC/C,EAAC;IACF,sBAAsB,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CACpD,+BAA+B,CAChC,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;AAC7D,CAAC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAEnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE;YAC9D,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,aAAa,CAAC,IAAI,CAAC,CAAC;KACrB;IAED,IAAI,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;QACnE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IAED,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,KAAK,EAAE,uBAAY;QACnB,uBAAuB,EAAE,qCAA0B;QACnD,gBAAgB,EAAE,+BAAoB;QACtC,eAAe,EAAE,8BAAmB;QACpC,6BAA6B,EAAE,0CAA+B;QAC9D,cAAc,EAAE,6BAAkB;QAClC,uBAAuB,EAAE,qCAA0B;QACnD,gBAAgB,EAAE,8BAAmB;QACrC,aAAa,EAAE,2BAAgB;KAChC,CACF,CAAC;AACJ,CAAC;AA9BD,wCA8BC;AAED,kBAAe,cAAc,CAAC"}
+{"version":3,"file":"karma.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma/karma.ts"],"names":[],"mappings":";;;;AACA,yCAOsB;AACtB,mDAU8B;AAE9B,+GAAqH;AACrH,+BAA4B;AAE5B,SAAS,aAAa,CAAC,IAAU;;;IAC/B,MAAM,sBAAsB,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEhE,MAAM,iBAAiB,GAAG,MAAA,sBAAsB,CAAC,WAAW,0CAAE,UAAU,CAAC;IACzE,IAAI,iBAAiB,EAAE;QACrB,iBAAiB,CAAC,IAAI;QACpB,6CAA6C;QAC7C,gCAAgC;QAChC,4BAA4B;QAC5B,mCAAmC;QACnC,uBAAuB;QACvB,8BAA8B,CAC/B,CAAC;QACF,iBAAiB;QACjB,sBAAsB,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CACxD,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAC3B,CAAC;KACH;IAED,0FAA0F;IAC1F,MAAA,sBAAsB,CAAC,cAAc,oCAArC,sBAAsB,CAAC,cAAc,GAAK,EAAE,EAAC;IAC7C,YAAA,sBAAsB,CAAC,cAAc,EAAC,IAAI,uCAAJ,IAAI,GAAK,EAAE,EAAC;IAClD,YAAA,sBAAsB,CAAC,cAAc,CAAC,IAAI,EAAC,MAAM,uCAAN,MAAM,GAAK;QACpD,SAAS;QACT,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;KAC/C,EAAC;IACF,sBAAsB,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CACpD,+BAA+B,CAChC,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;AAC7D,CAAC;AAED,SAAsB,cAAc,CAAC,IAAU,EAAE,OAAyB;;QACxE,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,OAAO,CAAC,EAC7C,CAAC;YACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/C,OAAO;SACR;QACD,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YACjC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE;gBAC9D,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YAEH,aAAa,CAAC,IAAI,CAAC,CAAC;SACrB;QAED,IAAI,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;YACnE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;YACE,KAAK,EAAE,uBAAY;YACnB,uBAAuB,EAAE,qCAA0B;YACnD,gBAAgB,EAAE,+BAAoB;YACtC,eAAe,EAAE,8BAAmB;YACpC,6BAA6B,EAAE,0CAA+B;YAC9D,cAAc,EAAE,6BAAkB;YAClC,uBAAuB,EAAE,qCAA0B;YACnD,gBAAgB,EAAE,8BAAmB;YACrC,aAAa,EAAE,2BAAgB;SAChC,CACF,CAAC;IACJ,CAAC;CAAA;AAvCD,wCAuCC;AAED,kBAAe,cAAc,CAAC"}

package/src/generators/karma-project/files/common/tsconfig.spec.json

@@ -4,5 +4,5 @@
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": ["jasmine", "node"]
   },
-  "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
+  "include": ["src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.d.ts"]
 }

package/src/generators/karma-project/files/workspace-with-root-project/karma.conf.js__tmpl__

@@ -1,7 +1,7 @@
 // Karma configuration file, see link for more information
 // https://karma-runner.github.io/6.4/config/configuration-file.html
 
-const { join } = require('path');
+const { join } = require('path');<% if (rootProjectWithConfigSet) { %>
 const setBaseKarmaConfig = require('<%= offsetFromRoot %>karma.conf');
 
 module.exports = function (config) {
@@ -12,4 +12,17 @@ module.exports = function (config) {
       dir: join(__dirname, '<%= offsetFromRoot %>coverage/<%= projectRoot %>')
     }
   });
-};
+};<% } else { %>
+const getBaseKarmaConfig = require('<%= offsetFromRoot %>karma.conf');
+
+module.exports = function (config) {
+  const baseConfig = getBaseKarmaConfig(config);
+
+  config.set({
+    ...baseConfig,
+    coverageReporter: {
+      ...baseConfig.coverageReporter,
+      dir: join(__dirname, '<%= offsetFromRoot %>coverage/<%= projectRoot %>')
+    }
+  });
+};<% } %>

package/src/generators/karma-project/karma-project.js

@@ -10,7 +10,7 @@ const update_workspace_config_1 = require("./lib/update-workspace-config");
 const karma_1 = require("../karma/karma");
 function karmaProjectGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const installTask = (0, karma_1.karmaGenerator)(tree, options);
+        const installTask = yield (0, karma_1.karmaGenerator)(tree, options);
         (0, check_test_target_1.checkProjectTestTarget)(tree, options.project);
         (0, generate_karma_project_files_1.generateKarmaProjectFiles)(tree, options.project);
         (0, update_tsconfig_1.updateTsConfigs)(tree, options.project);

package/src/generators/karma-project/karma-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"karma-project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma-project/karma-project.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+DAAiE;AACjE,qFAA+E;AAC/E,2DAAwD;AACxD,2EAAsE;AAEtE,0CAAgD;AAEhD,SAAsB,qBAAqB,CACzC,IAAU,EACV,OAA4B;;QAE5B,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClD,IAAA,0CAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAA,wDAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACjD,IAAA,iCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACvC,IAAA,+CAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAE7C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAfD,sDAeC;AAED,kBAAe,qBAAqB,CAAC"}
+{"version":3,"file":"karma-project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma-project/karma-project.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+DAAiE;AACjE,qFAA+E;AAC/E,2DAAwD;AACxD,2EAAsE;AAEtE,0CAAgD;AAEhD,SAAsB,qBAAqB,CACzC,IAAU,EACV,OAA4B;;QAE5B,MAAM,WAAW,GAAG,MAAM,IAAA,sBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxD,IAAA,0CAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAA,wDAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACjD,IAAA,iCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACvC,IAAA,+CAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAE7C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAfD,sDAeC;AAED,kBAAe,qBAAqB,CAAC"}

package/src/generators/karma-project/lib/generate-karma-project-files.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateKarmaProjectFiles = void 0;
 const devkit_1 = require("@nrwl/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
 function generateKarmaProjectFiles(tree, project) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'common'), projectConfig.root, {
@@ -20,6 +21,7 @@ function generateKarmaProjectFiles(tree, project) {
             tmpl: '',
             projectRoot: projectConfig.root,
             offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
+            rootProjectWithConfigSet: isUsingConfigSetInBaseKarmaConfig(tree),
         });
     }
 }
@@ -33,4 +35,13 @@ function isWorkspaceWithProjectAtRoot(tree) {
     }
     return false;
 }
+function isUsingConfigSetInBaseKarmaConfig(tree) {
+    if (!tree.exists('karma.conf.js')) {
+        return false;
+    }
+    const CONFIG_SET_SELECTOR = 'PropertyAccessExpression:has(Identifier[name=config], Identifier[name=set])';
+    const ast = tsquery_1.tsquery.ast(tree.read('karma.conf.js', 'utf-8'));
+    const nodes = (0, tsquery_1.tsquery)(ast, CONFIG_SET_SELECTOR, { visitAllChildren: true });
+    return nodes.length > 0;
+}
 //# sourceMappingURL=generate-karma-project-files.js.map

package/src/generators/karma-project/lib/generate-karma-project-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-karma-project-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/generate-karma-project-files.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AAEtB,SAAgB,yBAAyB,CAAC,IAAU,EAAE,OAAe;IACnE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EACrD,aAAa,CAAC,IAAI,EAClB;QACE,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,aAAa,CAAC,IAAI;QAC/B,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC;KACnD,CACF,CAAC;IAEF,IAAI,aAAa,CAAC,IAAI,KAAK,EAAE,IAAI,aAAa,CAAC,IAAI,KAAK,GAAG,EAAE;QAC3D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,EAC3D,aAAa,CAAC,IAAI,EAClB;YACE,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,OAAO;SACrB,CACF,CAAC;KACH;SAAM,IAAI,4BAA4B,CAAC,IAAI,CAAC,EAAE;QAC7C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,IAAI,EACJ,OAAO,EACP,6BAA6B,CAC9B,EACD,aAAa,CAAC,IAAI,EAClB;YACE,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,aAAa,CAAC,IAAI;YAC/B,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC;SACnD,CACF,CAAC;KACH;AACH,CAAC;AAxCD,8DAwCC;AAED,SAAS,4BAA4B,CAAC,IAAU;IAC9C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QAClC,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,IAAI,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE;YAC/C,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"generate-karma-project-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/generate-karma-project-files.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,uDAAoD;AAEpD,SAAgB,yBAAyB,CAAC,IAAU,EAAE,OAAe;IACnE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EACrD,aAAa,CAAC,IAAI,EAClB;QACE,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,aAAa,CAAC,IAAI;QAC/B,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC;KACnD,CACF,CAAC;IAEF,IAAI,aAAa,CAAC,IAAI,KAAK,EAAE,IAAI,aAAa,CAAC,IAAI,KAAK,GAAG,EAAE;QAC3D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,EAC3D,aAAa,CAAC,IAAI,EAClB;YACE,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,OAAO;SACrB,CACF,CAAC;KACH;SAAM,IAAI,4BAA4B,CAAC,IAAI,CAAC,EAAE;QAC7C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,IAAI,EACJ,OAAO,EACP,6BAA6B,CAC9B,EACD,aAAa,CAAC,IAAI,EAClB;YACE,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,aAAa,CAAC,IAAI;YAC/B,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC;YAClD,wBAAwB,EAAE,iCAAiC,CAAC,IAAI,CAAC;SAClE,CACF,CAAC;KACH;AACH,CAAC;AAzCD,8DAyCC;AAED,SAAS,4BAA4B,CAAC,IAAU;IAC9C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QAClC,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,IAAI,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE;YAC/C,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,iCAAiC,CAAC,IAAU;IACnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,OAAO,KAAK,CAAC;KACd;IAED,MAAM,mBAAmB,GACvB,6EAA6E,CAAC;IAEhF,MAAM,GAAG,GAAG,iBAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5E,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AAC1B,CAAC"}

package/src/generators/library/lib/update-project.js

@@ -130,13 +130,19 @@ function updateProjectTsConfig(host, options) {
     }
     (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {
         if (options.unitTestRunner === 'jest') {
-            json.exclude = ['src/test-setup.ts', '**/*.spec.ts'];
+            json.exclude = ['src/test-setup.ts', 'src/**/*.spec.ts'];
         }
         else if (options.unitTestRunner === 'none') {
             json.exclude = [];
         }
         else {
             json.exclude = json.exclude || [];
+            json.exclude = json.exclude.map((v) => {
+                if (v.startsWith('**/*')) {
+                    return v.replace('**/*', 'src/**/*');
+                }
+                return v;
+            });
         }
         return Object.assign(Object.assign({}, json), { extends: `./tsconfig.json`, compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${(0, devkit_1.offsetFromRoot)(options.projectRoot)}dist/out-tsc` }) });
     });

package/src/generators/library/lib/update-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":"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"}

package/src/generators/library/lib/update-tsconfig.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfig = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
+const create_ts_config_1 = require("../../utils/create-ts-config");
 function updateRootConfig(host, options) {
     (0, devkit_1.updateJson)(host, (0, typescript_1.getRootTsConfigPathInTree)(host), (json) => {
         const c = json.compilerOptions;
@@ -19,19 +20,19 @@ function updateRootConfig(host, options) {
 }
 function updateProjectConfig(host, options) {
     (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {
-        json.include = ['**/*.ts'];
+        json.include = ['src/**/*.ts'];
         json.exclude = [
             ...new Set([
                 ...(json.exclude || []),
                 'jest.config.ts',
-                '**/*.test.ts',
-                '**/*.spec.ts',
+                'src/**/*.test.ts',
+                'src/**/*.spec.ts',
             ]),
         ];
         return json;
     });
     // tsconfig.json
-    (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.json`, (json) => (Object.assign(Object.assign({}, json), { compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { target: 'es2022', useDefineForClassFields: false }) })));
+    (0, create_ts_config_1.createTsConfig)(host, options.projectRoot, 'lib', options, (0, typescript_1.getRelativePathToRootTsConfig)(host, options.projectRoot));
 }
 function updateProjectIvyConfig(host, options) {
     if (options.buildable || options.publishable) {
@@ -43,6 +44,7 @@ function updateProjectIvyConfig(host, options) {
     }
 }
 function updateTsConfig(host, options) {
+    (0, create_ts_config_1.extractTsConfigBase)(host);
     updateRootConfig(host, options);
     updateProjectConfig(host, options);
     updateProjectIvyConfig(host, options);

package/src/generators/library/lib/update-tsconfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAA6D;AAC7D,yEAAqF;AAGrF,SAAS,gBAAgB,CACvB,IAAU,EACV,OAA2C;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC;SACxD,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAC1B,IAAU,EACV,OAA2C;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,gBAAgB;gBAChB,cAAc;gBACd,cAAc;aACf,CAAC;SACH,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,gBAAgB;IAChB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCAC9D,IAAI,KACP,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,QAAQ,EAChB,uBAAuB,EAAE,KAAK,OAEhC,CAAC,CAAC;AACN,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBAC5C,OAAO,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAC5B,IAAU,EACV,OAA2C;IAE3C,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAPD,wCAOC"}
+{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAA6D;AAC7D,yEAGkD;AAElD,mEAGsC;AAEtC,SAAS,gBAAgB,CACvB,IAAU,EACV,OAA2C;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC;SACxD,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAC1B,IAAU,EACV,OAA2C;IAE3C,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,aAAa,CAAC,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,gBAAgB;gBAChB,kBAAkB;gBAClB,kBAAkB;aACnB,CAAC;SACH,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,gBAAgB;IAChB,IAAA,iCAAc,EACZ,IAAI,EACJ,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,OAAO,EACP,IAAA,0CAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CACzD,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBAC5C,OAAO,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAC5B,IAAU,EACV,OAA2C;IAE3C,IAAA,sCAAmB,EAAC,IAAI,CAAC,CAAC;IAC1B,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AARD,wCAQC"}

package/src/generators/ng-add/migrate-from-angular-cli.js

@@ -68,6 +68,7 @@ function migrateFromAngularCli(tree, rawOptions) {
                 (0, utilities_1.updateRootEsLintConfig)(tree, eslintConfig, options.unitTestRunner);
                 (0, utilities_1.cleanupEsLintPackages)(tree);
             }
+            (0, utilities_1.deleteGitKeepFilesIfNotNeeded)(tree);
         }
         (0, utilities_1.deleteAngularJson)(tree);
         if (!options.skipInstall) {

package/src/generators/ng-add/migrate-from-angular-cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":"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"}

package/src/generators/ng-add/utilities/workspace.d.ts

@@ -16,3 +16,4 @@ export declare function getWorkspaceRootFileTypesInfo(tree: Tree, migrators: Pro
 export declare function updateVsCodeRecommendedExtensions(tree: Tree): void;
 export declare function updatePrettierConfig(tree: Tree): Promise<void>;
 export declare function deleteAngularJson(tree: Tree): void;
+export declare function deleteGitKeepFilesIfNotNeeded(tree: Tree): void;

package/src/generators/ng-add/utilities/workspace.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteAngularJson = exports.updatePrettierConfig = exports.updateVsCodeRecommendedExtensions = exports.getWorkspaceRootFileTypesInfo = exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.cleanupEsLintPackages = exports.updateRootEsLintConfig = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.decorateAngularCli = exports.createNxJson = exports.validateWorkspace = void 0;
+exports.deleteGitKeepFilesIfNotNeeded = exports.deleteAngularJson = exports.updatePrettierConfig = exports.updateVsCodeRecommendedExtensions = exports.getWorkspaceRootFileTypesInfo = exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.cleanupEsLintPackages = exports.updateRootEsLintConfig = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.decorateAngularCli = exports.createNxJson = exports.validateWorkspace = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const linter_1 = require("@nrwl/linter");
@@ -336,4 +336,13 @@ function deleteAngularJson(tree) {
     tree.delete('angular.json');
 }
 exports.deleteAngularJson = deleteAngularJson;
+function deleteGitKeepFilesIfNotNeeded(tree) {
+    if (tree.children('apps').length > 1 && tree.exists('apps/.gitkeep')) {
+        tree.delete('apps/.gitkeep');
+    }
+    if (tree.children('libs').length > 1 && tree.exists('libs/.gitkeep')) {
+        tree.delete('libs/.gitkeep');
+    }
+}
+exports.deleteGitKeepFilesIfNotNeeded = deleteGitKeepFilesIfNotNeeded;
 //# sourceMappingURL=workspace.js.map

package/src/generators/ng-add/utilities/workspace.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":";;;;AACA,yCAUsB;AACtB,yCAAyD;AACzD,0GAA2G;AAC3G,6EAA+E;AAC/E,qEAA2F;AAC3F,yEAAqF;AACrF,iEAAqE;AACrE,2BAAkC;AAClC,4DAAkE;AAClE,+BAAqC;AACrC,sDAA0E;AAI1E,6DAAsE;AAEtE,SAAgB,iBAAiB,CAAC,IAAU;IAC1C,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAChC,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;KAC5D;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAChC,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;KAC5D;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,OAAO;KACR;IAED,MAAM,IAAI,KAAK,CAAC,GAAG,mDAA8B;;MAE7C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC7B,CAAC;AAhBD,8CAgBC;AAED,SAAgB,YAAY,CAAC,IAAU,EAAE,OAAyB;;IAChE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,MAAM,OAAO,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAEhD,IAAA,kBAAS,EAAsB,IAAI,EAAE,SAAS,kCACzC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACjC,QAAQ,EAAE;YACR,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,IAAA,gCAAiB,GAAE;SACxD,EACD,kBAAkB,EAAE;YAClB,OAAO,EAAE;gBACP,MAAM,EAAE,0BAA0B;gBAClC,OAAO,EAAE;oBACP,mBAAmB,EAAE;wBACnB,OAAO;wBACP,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;wBACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;wBACjC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;qBAChC,CAAC,MAAM,CAAC,OAAO,CAAC;iBAClB;aACF;SACF,EACD,WAAW,EAAE;YACX,aAAa,EAAE,EAAE;YACjB,OAAO,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;YAChD,UAAU,EAAE;gBACV,SAAS;gBACT,GAAG,CAAC,OAAO,CAAC,IAAI;oBACd,CAAC,CAAC;wBACE,mCAAmC;wBACnC,gCAAgC;wBAChC,8BAA8B;qBAC/B;oBACH,CAAC,CAAC,EAAE,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,SAAS;aAC3D,CAAC,MAAM,CAAC,OAAO,CAAC;SAClB,EACD,cAAc,EAAE;YACd,KAAK,EAAE;gBACL,SAAS,EAAE,CAAC,QAAQ,CAAC;gBACrB,MAAM,EAAE,CAAC,YAAY,EAAE,aAAa,CAAC;aACtC;YACD,IAAI,EAAE,OAAO,CAAC,IAAI;gBAChB,CAAC,CAAC;oBACE,MAAM,EAAE,CAAC,SAAS,EAAE,aAAa,EAAE,+BAA+B,CAAC;iBACpE;gBACH,CAAC,CAAC,SAAS;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;gBAChB,CAAC,CAAC;oBACE,MAAM,EAAE,CAAC,SAAS,EAAE,gCAAgC,CAAC;iBACtD;gBACH,CAAC,CAAC,SAAS;YACb,GAAG,EAAE,OAAO,CAAC,GAAG;gBACd,CAAC,CAAC;oBACE,MAAM,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC;iBACnC;gBACH,CAAC,CAAC,SAAS;SACd,IACD,CAAC;AACL,CAAC;AA5DD,oCA4DC;AAED,SAAS,yBAAyB,CAAC,IAAU;;IAK3C,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QAClC,IAAI,CAAC,OAAO,CAAC,GAAG,KAAI,MAAA,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAA,EAAE;YACxC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC;SACpB;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,KAAI,MAAA,OAAO,CAAC,OAAO,0CAAE,IAAI,CAAA,EAAE;YAC1C,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;SACrB;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,KAAI,MAAA,OAAO,CAAC,OAAO,0CAAE,IAAI,CAAA,EAAE;YAC1C,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;SACrB;QAED,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE;YAC/C,OAAO,OAAO,CAAC;SAChB;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,MAAM,iBAAiB,GAAG,IAAA,oCAAqB,EAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC;IACxE,MAAM,WAAW,GAAG,IAAA,iBAAY,EAC9B,IAAA,WAAI,EACF,IAAA,cAAO,EAAC,iBAAiB,CAAC,EAC1B,sDAAsD,CACvD,EACD,OAAO,CACR,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,yBAAyB,EAAE,WAAW,CAAC,CAAC;IAEnD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;QACxC,IACE,IAAI,CAAC,OAAO;YACZ,IAAI,CAAC,OAAO,CAAC,WAAW;YACxB,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAC7D;YACA,0CAA0C;YAC1C,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,oCAAoC,CAAC;SAClE;aAAM;YACL,MAAA,IAAI,CAAC,OAAO,oCAAZ,IAAI,CAAC,OAAO,GAAK,EAAE,EAAC;YACpB,+CAA+C;YAC/C,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,gCAAgC,CAAC;SAC7D;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;YACnB,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;SACxB;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AA7BD,gDA6BC;AAED,SAAgB,6BAA6B,CAAC,IAAU;IACtD,MAAM,eAAe,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IACzD,OAAQ,eAAuB,CAAC,cAAc,CAAC;IAC/C,IAAI,eAAe,CAAC,GAAG,EAAE;QACvB,OAAQ,eAAuB,CAAC,iBAAiB,CAAC;KACnD;IACD,IAAA,qCAA4B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AACtD,CAAC;AAPD,sEAOC;AAED,SAAgB,kBAAkB,CAAC,IAAU;;;IAC3C,MAAM,QAAQ,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,CAAC,CAAC;IACjE,YAAA,QAAQ,CAAC,eAAe,EAAC,KAAK,uCAAL,KAAK,GAAK,EAAE,EAAC;IACtC,QAAQ,CAAC,eAAe,CAAC,OAAO,GAAG,GAAG,CAAC;IACvC,QAAQ,CAAC,eAAe,CAAC,OAAO,GAAG,GAAG,CAAC;IACvC,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CAC3B,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,MAAA,QAAQ,CAAC,OAAO,mCAAI,EAAE,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC,CAC9D,CAAC;IACF,IAAA,kBAAS,EAAC,IAAI,EAAE,oBAAoB,EAAE,QAAQ,CAAC,CAAC;IAEhD,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;KAC9B;AACH,CAAC;AAbD,gDAaC;AAED,SAAgB,iBAAiB,CAAC,IAAU;IAC1C,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE;;QAC/C,WAAW,CAAC,OAAO,GAAG,MAAA,WAAW,CAAC,OAAO,mCAAI,EAAE,CAAC;QAChD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAClD,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;iBACtD,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC;iBACtB,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,WAAW,CAAC,eAAe,GAAG,MAAA,WAAW,CAAC,eAAe,mCAAI,EAAE,CAAC;QAChE,WAAW,CAAC,YAAY,GAAG,MAAA,WAAW,CAAC,YAAY,mCAAI,EAAE,CAAC;QAC1D,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE;YAChD,WAAW,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,+BAAoB,CAAC;SACpE;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,iBAAiB,CAAC,EAAE;YACnD,WAAW,CAAC,eAAe,CAAC,iBAAiB,CAAC,GAAG,oBAAS,CAAC;SAC5D;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;YACtC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,oBAAS,CAAC;SAC/C;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE;YAC5C,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,0BAAe,CAAC;SAC3D;QAED,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC;AA1BD,8CA0BC;AAED,SAAgB,sBAAsB,CACpC,IAAU,EACV,oBAAqC,EACrC,cAAuB;;IAEvB,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;QACjC;;;;;WAKG;QACH,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;KAC/B;IAED,IAAA,0BAAiB,EAAC,IAAI,EAAE,EAAE,MAAM,EAAE,eAAM,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;IAEnE,IAAI,CAAC,oBAAoB,EAAE;QACzB,8EAA8E;QAC9E,OAAO;KACR;IAED,oBAAoB,CAAC,cAAc,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/C,oBAAoB,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CACvC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,MAAA,oBAAoB,CAAC,OAAO,mCAAI,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAC/D,CAAC;IACF,MAAA,oBAAoB,CAAC,SAAS,0CAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;;QACnD,IAAI,CAAC,CAAA,MAAA,QAAQ,CAAC,aAAa,0CAAE,OAAO,CAAA,EAAE;YACpC,OAAO;SACR;QAED,OAAO,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC;IACxC,CAAC,CAAC,CAAC;IACH,kDAAkD;IAClD,oBAAoB,CAAC,SAAS,GAAG;QAC/B,GAAG,CAAC,MAAA,oBAAoB,CAAC,SAAS,mCAAI,EAAE,CAAC;QACzC;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;YACzC,KAAK,EAAE;gBACL,oCAAoC,EAAE;oBACpC,OAAO;oBACP;wBACE,6BAA6B,EAAE,IAAI;wBACnC,KAAK,EAAE,EAAE;wBACT,cAAc,EAAE;4BACd,EAAE,SAAS,EAAE,GAAG,EAAE,wBAAwB,EAAE,CAAC,GAAG,CAAC,EAAE;yBACpD;qBACF;iBACF;aACF;SACF;KACF,CAAC;IAEF,IAAA,kBAAS,EAAC,IAAI,EAAE,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;AAC1D,CAAC;AAtDD,wDAsDC;AAED,SAAgB,qBAAqB,CAAC,IAAU;IAC9C,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;QACxC,IAAI,MAAA,IAAI,CAAC,eAAe,0CAAG,yBAAyB,CAAC,EAAE;YACrD,OAAO,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,CAAC;SACxD;QACD,IAAI,MAAA,IAAI,CAAC,YAAY,0CAAG,yBAAyB,CAAC,EAAE;YAClD,OAAO,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAC;SACrD;QACD,IAAI,MAAA,IAAI,CAAC,eAAe,0CAAG,4BAA4B,CAAC,EAAE;YACxD,OAAO,IAAI,CAAC,eAAe,CAAC,4BAA4B,CAAC,CAAC;SAC3D;QACD,IAAI,MAAA,IAAI,CAAC,YAAY,0CAAG,4BAA4B,CAAC,EAAE;YACrD,OAAO,IAAI,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAAC;SACxD;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAjBD,sDAiBC;AAED,SAAsB,oBAAoB,CAAC,IAAU;;QACnD,iCAAiC,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,eAAe,CAAC,EAAE,GAAG,EAAE;YACtE,IAAI,EAAE,EAAE;YACR,GAAG,EAAE,GAAG;YACR,gBAAgB,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC;SAClD,CAAC,CAAC;IACL,CAAC;CAAA;AATD,oDASC;AAED,SAAgB,qBAAqB,CAAC,IAAU;IAC9C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,qBAAqB,CAAC,EACnD,GAAG,EACH;QACE,IAAI,EAAE,EAAE;KACT,CACF,CAAC;AACJ,CAAC;AATD,sDASC;AAED,SAAgB,6BAA6B,CAC3C,IAAU,EACV,SAA4B;IAE5B,MAAM,0BAA0B,GAA+B;QAC7D,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,KAAK;KACb,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;QACjC,0BAA0B,CAAC,MAAM,GAAG,IAAI,CAAC;KAC1C;IACD,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,0BAA0B,CAAC,KAAK,GAAG,IAAI,CAAC;KACzC;IAED,IAAI,0BAA0B,CAAC,MAAM,IAAI,0BAA0B,CAAC,KAAK,EAAE;QACzE,OAAO,0BAA0B,CAAC;KACnC;IAED,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,MAAM,WAAW,GAAG,QAAQ,CAAC,6BAA6B,EAAE,CAAC;QAC7D,0BAA0B,CAAC,MAAM;YAC/B,0BAA0B,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC;QAC1D,0BAA0B,CAAC,KAAK;YAC9B,0BAA0B,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,CAAC;QAExD,IAAI,0BAA0B,CAAC,MAAM,IAAI,0BAA0B,CAAC,KAAK,EAAE;YACzE,OAAO,0BAA0B,CAAC;SACnC;KACF;IAED,OAAO,0BAA0B,CAAC;AACpC,CAAC;AAjCD,sEAiCC;AAED,SAAgB,iCAAiC,CAAC,IAAU;IAC1D,MAAM,eAAe,GAAG;QACtB,sBAAsB;QACtB,qBAAqB;QACrB,wBAAwB;QACxB,wBAAwB;KACzB,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;QAC1C,IAAA,mBAAU,EACR,IAAI,EACJ,yBAAyB,EACzB,CAAC,IAAoC,EAAE,EAAE;YACvC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;YAClD,eAAe,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBACpC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;oBAC7C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;iBACtC;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;SAAM;QACL,IAAA,kBAAS,EAAC,IAAI,EAAE,yBAAyB,EAAE;YACzC,eAAe;SAChB,CAAC,CAAC;KACJ;AACH,CAAC;AA3BD,8EA2BC;AAED,SAAsB,oBAAoB,CAAC,IAAU;;QACnD,MAAM,sBAAsB,GAAG,MAAM,IAAA,4CAAiC,GAAE,CAAC;QACzE,IAAI,CAAC,sBAAsB,EAAE;YAC3B,IAAA,kBAAS,EAAC,IAAI,EAAE,aAAa,EAAE,uDAA4B,CAAC,CAAC;SAC9D;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;YACnC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,mBAAmB,CAAC,EACjD,GAAG,EACH,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CACvB,CAAC;SACH;IACH,CAAC;CAAA;AAdD,oDAcC;AAED,SAAgB,iBAAiB,CAAC,IAAU;IAC1C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,QAAQ,EAAE;QACxC,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC;QACtB,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;KACnD;IACD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;AAC9B,CAAC;AAPD,8CAOC;AAED,SAAgB,6BAA6B,CAAC,IAAU;IACtD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACpE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;KAC9B;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACpE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;KAC9B;AACH,CAAC;AAPD,sEAOC"}

package/src/generators/setup-tailwind/angular-v14/files/v2/tailwind.config.js__tmpl__

@@ -0,0 +1,18 @@
+const { createGlobPatternsForDependencies } = require('@nrwl/angular/tailwind');
+const { join } = require('path');
+
+module.exports = {
+  mode: 'jit',
+  purge: [
+    join(__dirname, '<%= relativeSourceRoot %>/**/!(*.stories|*.spec).{ts,html}'),
+    ...createGlobPatternsForDependencies(__dirname),
+  ],
+  darkMode: false, // or 'media' or 'class'
+  theme: {
+    extend: {},
+  },
+  variants: {
+    extend: {},
+  },
+  plugins: [],
+};

package/src/generators/setup-tailwind/angular-v14/files/v3/tailwind.config.js__tmpl__

@@ -0,0 +1,14 @@
+const { createGlobPatternsForDependencies } = require('@nrwl/angular/tailwind');
+const { join } = require('path');
+
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  content: [
+    join(__dirname, '<%= relativeSourceRoot %>/**/!(*.stories|*.spec).{ts,html}'),
+    ...createGlobPatternsForDependencies(__dirname),
+  ],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+};

package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config-path-to-project.d.ts

@@ -0,0 +1,3 @@
+import { ProjectConfiguration, Tree } from '@nrwl/devkit';
+import { NormalizedGeneratorOptions } from '../schema';
+export declare function addTailwindConfigPathToProject(tree: Tree, options: NormalizedGeneratorOptions, project: ProjectConfiguration): void;

package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config-path-to-project.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addTailwindConfigPathToProject = void 0;
+const devkit_1 = require("@nrwl/devkit");
+function addTailwindConfigPathToProject(tree, options, project) {
+    var _a, _b;
+    const buildTarget = (_a = project.targets) === null || _a === void 0 ? void 0 : _a[options.buildTarget];
+    if (!buildTarget) {
+        throw new Error((0, devkit_1.stripIndents) `The target "${options.buildTarget}" was not found for project "${options.project}".
+      If you are using a different build target, please provide it using the "--buildTarget" option.
+      If the project is not a buildable or publishable library, you don't need to setup TailwindCSS for it.`);
+    }
+    const supportedLibraryExecutors = [
+        '@nrwl/angular:ng-packagr-lite',
+        '@nrwl/angular:package',
+    ];
+    if (!supportedLibraryExecutors.includes(buildTarget.executor)) {
+        throw new Error((0, devkit_1.stripIndents) `The build target for project "${options.project}" is using an unsupported executor "${buildTarget.executor}".
+      Supported executors are ${supportedLibraryExecutors
+            .map((e) => `"${e}"`)
+            .join(', ')}.`);
+    }
+    if (((_b = buildTarget.options) === null || _b === void 0 ? void 0 : _b.tailwindConfig) &&
+        tree.exists(buildTarget.options.tailwindConfig)) {
+        throw new Error((0, devkit_1.stripIndents) `The "${buildTarget.options.tailwindConfig}" file is already configured for the project "${options.project}". Are you sure this is the right project to set up Tailwind?
+      If you are sure, you can remove the configuration and re-run the generator.`);
+    }
+    buildTarget.options = Object.assign(Object.assign({}, buildTarget.options), { tailwindConfig: (0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js') });
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
+}
+exports.addTailwindConfigPathToProject = addTailwindConfigPathToProject;
+//# sourceMappingURL=add-tailwind-config-path-to-project.js.map

package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config-path-to-project.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-tailwind-config-path-to-project.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config-path-to-project.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAGtB,SAAgB,8BAA8B,CAC5C,IAAU,EACV,OAAmC,EACnC,OAA6B;;IAE7B,MAAM,WAAW,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3D,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,eAAe,OAAO,CAAC,WAAW,gCAAgC,OAAO,CAAC,OAAO;;4GAES,CACvG,CAAC;KACH;IAED,MAAM,yBAAyB,GAAG;QAChC,+BAA+B;QAC/B,uBAAuB;KACxB,CAAC;IACF,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;QAC7D,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,iCACV,OAAO,CAAC,OACV,uCAAuC,WAAW,CAAC,QAAQ;gCACjC,yBAAyB;aAChD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;aACpB,IAAI,CAAC,IAAI,CAAC,GAAG,CACjB,CAAC;KACH;IAED,IACE,CAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,cAAc;QACnC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,EAC/C;QACA,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,QAAQ,WAAW,CAAC,OAAO,CAAC,cAAc,iDAAiD,OAAO,CAAC,OAAO;kFAC1C,CAC7E,CAAC;KACH;IAED,WAAW,CAAC,OAAO,mCACd,WAAW,CAAC,OAAO,KACtB,cAAc,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,GACtE,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC7D,CAAC;AA9CD,wEA8CC"}

package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config.d.ts

@@ -0,0 +1,3 @@
+import { ProjectConfiguration, Tree } from '@nrwl/devkit';
+import { GeneratorOptions } from '../schema';
+export declare function addTailwindConfig(tree: Tree, options: GeneratorOptions, project: ProjectConfiguration, tailwindVersion: '2' | '3'): void;

package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addTailwindConfig = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const path_1 = require("path");
+function addTailwindConfig(tree, options, project, tailwindVersion) {
+    if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js'))) {
+        throw new Error((0, devkit_1.stripIndents) `The "tailwind.config.js" file already exists in the project "${options.project}". Are you sure this is the right project to set up Tailwind?
+      If you are sure, you can remove the existing file and re-run the generator.`);
+    }
+    const filesDir = tailwindVersion === '3' ? 'files/v3' : 'files/v2';
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', filesDir), project.root, {
+        relativeSourceRoot: (0, path_1.relative)(project.root, project.sourceRoot),
+        tmpl: '',
+    });
+}
+exports.addTailwindConfig = addTailwindConfig;
+//# sourceMappingURL=add-tailwind-config.js.map

package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-tailwind-config.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-config.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,+BAAgC;AAGhC,SAAgB,iBAAiB,CAC/B,IAAU,EACV,OAAyB,EACzB,OAA6B,EAC7B,eAA0B;IAE1B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE;QACtE,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,gEAAgE,OAAO,CAAC,OAAO;kFACf,CAC7E,CAAC;KACH;IAED,MAAM,QAAQ,GAAG,eAAe,KAAK,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;IAEnE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,EAC5C,OAAO,CAAC,IAAI,EACZ;QACE,kBAAkB,EAAE,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;QAC9D,IAAI,EAAE,EAAE;KACT,CACF,CAAC;AACJ,CAAC;AAxBD,8CAwBC"}

package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-required-packages.d.ts

@@ -0,0 +1,2 @@
+import { GeneratorCallback, Tree } from '@nrwl/devkit';
+export declare function addTailwindRequiredPackages(tree: Tree): GeneratorCallback;

package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-required-packages.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addTailwindRequiredPackages = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const versions_1 = require("../../../../utils/versions");
+function addTailwindRequiredPackages(tree) {
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        autoprefixer: versions_1.versions.angularV14.autoprefixerVersion,
+        postcss: versions_1.versions.angularV14.postcssVersion,
+        tailwindcss: versions_1.versions.angularV14.tailwindVersion,
+    });
+}
+exports.addTailwindRequiredPackages = addTailwindRequiredPackages;
+//# sourceMappingURL=add-tailwind-required-packages.js.map

package/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-required-packages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-tailwind-required-packages.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/setup-tailwind/angular-v14/lib/add-tailwind-required-packages.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AACtB,yDAAsD;AAEtD,SAAgB,2BAA2B,CAAC,IAAU;IACpD,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,YAAY,EAAE,mBAAQ,CAAC,UAAU,CAAC,mBAAmB;QACrD,OAAO,EAAE,mBAAQ,CAAC,UAAU,CAAC,cAAc;QAC3C,WAAW,EAAE,mBAAQ,CAAC,UAAU,CAAC,eAAe;KACjD,CACF,CAAC;AACJ,CAAC;AAVD,kEAUC"}

package/src/generators/setup-tailwind/angular-v14/lib/detect-tailwind-installed-version.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nrwl/devkit';
+export declare function detectTailwindInstalledVersion(tree: Tree): '2' | '3' | undefined;

package/src/generators/setup-tailwind/angular-v14/lib/detect-tailwind-installed-version.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectTailwindInstalledVersion = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const version_utils_1 = require("@nrwl/workspace/src/utilities/version-utils");
+const semver_1 = require("semver");
+function detectTailwindInstalledVersion(tree) {
+    var _a;
+    const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
+    const tailwindVersion = (_a = dependencies === null || dependencies === void 0 ? void 0 : dependencies.tailwindcss) !== null && _a !== void 0 ? _a : devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies.tailwindcss;
+    if (!tailwindVersion) {
+        return undefined;
+    }
+    const version = (0, version_utils_1.checkAndCleanWithSemver)('tailwindcss', tailwindVersion);
+    if ((0, semver_1.lt)(version, '2.0.0')) {
+        throw new Error(`The Tailwind CSS version "${tailwindVersion}" is not supported. Please upgrade to v2.0.0 or higher.`);
+    }
+    return (0, semver_1.lt)(version, '3.0.0') ? '2' : '3';
+}
+exports.detectTailwindInstalledVersion = detectTailwindInstalledVersion;
+//# sourceMappingURL=detect-tailwind-installed-version.js.map

package/src/generators/setup-tailwind/angular-v14/lib/detect-tailwind-installed-version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"detect-tailwind-installed-version.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/setup-tailwind/angular-v14/lib/detect-tailwind-installed-version.ts"],"names":[],"mappings":";;;AAAA,yCAA8C;AAC9C,+EAAsF;AACtF,mCAA4B;AAE5B,SAAgB,8BAA8B,CAC5C,IAAU;;IAEV,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACzE,MAAM,eAAe,GACnB,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,mCAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,CAAC;IAE5D,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,OAAO,GAAG,IAAA,uCAAuB,EAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IACxE,IAAI,IAAA,WAAE,EAAC,OAAO,EAAE,OAAO,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,6BAA6B,eAAe,yDAAyD,CACtG,CAAC;KACH;IAED,OAAO,IAAA,WAAE,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAC1C,CAAC;AAnBD,wEAmBC"}

package/src/generators/setup-tailwind/angular-v14/lib/index.d.ts

@@ -0,0 +1,6 @@
+export * from './add-tailwind-config-path-to-project';
+export * from './add-tailwind-config';
+export * from './add-tailwind-required-packages';
+export * from './detect-tailwind-installed-version';
+export * from './normalize-options';
+export * from './update-application-styles';

package/src/generators/setup-tailwind/angular-v14/lib/index.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./add-tailwind-config-path-to-project"), exports);
+tslib_1.__exportStar(require("./add-tailwind-config"), exports);
+tslib_1.__exportStar(require("./add-tailwind-required-packages"), exports);
+tslib_1.__exportStar(require("./detect-tailwind-installed-version"), exports);
+tslib_1.__exportStar(require("./normalize-options"), exports);
+tslib_1.__exportStar(require("./update-application-styles"), exports);
+//# sourceMappingURL=index.js.map

package/src/generators/setup-tailwind/angular-v14/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/setup-tailwind/angular-v14/lib/index.ts"],"names":[],"mappings":";;;AAAA,gFAAsD;AACtD,gEAAsC;AACtC,2EAAiD;AACjD,8EAAoD;AACpD,8DAAoC;AACpC,sEAA4C"}

package/src/generators/setup-tailwind/angular-v14/lib/normalize-options.d.ts

@@ -0,0 +1,2 @@
+import type { GeneratorOptions, NormalizedGeneratorOptions } from '../schema';
+export declare function normalizeOptions(options: GeneratorOptions): NormalizedGeneratorOptions;