@analogjs/platform 1.0.0-beta.2 → 1.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@analogjs/platform",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "description": "The fullstack meta-framework for Angular",
   "type": "module",
   "author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -25,12 +25,12 @@
   },
   "dependencies": {
     "nitropack": "^2.6.0",
-    "@analogjs/vite-plugin-angular": "^1.0.0-beta.2",
-    "@analogjs/vite-plugin-nitro": "^1.0.0-beta.2"
+    "@analogjs/vite-plugin-angular": "^1.0.0-beta.4",
+    "@analogjs/vite-plugin-nitro": "^1.0.0-beta.4"
   },
   "peerDependencies": {
-    "@nx/devkit": "^16.0.0 || ^17.0.0",
-    "@nx/vite": "^16.0.0 || ^17.0.0"
+    "@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0",
+    "@nx/vite": "^16.0.0 || ^17.0.0 || ^18.0.0"
   },
   "builders": "./src/lib/nx-plugin/executors.json",
   "executors": "./src/lib/nx-plugin/executors.json",

package/src/index.d.ts

@@ -1,3 +1,3 @@
 import { platformPlugin } from './lib/platform-plugin.js';
-export { Options } from './lib/options.js';
+export { Options, PrerenderContentFile } from './lib/options';
 export default platformPlugin;

package/src/lib/clear-client-page-endpoint.js

@@ -30,4 +30,4 @@ export function clearClientPageEndpointsPlugin() {
         },
     };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYXItY2xpZW50LXBhZ2UtZW5kcG9pbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2NsZWFyLWNsaWVudC1wYWdlLWVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBVSxhQUFhLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFN0MsTUFBTSxVQUFVLDhCQUE4QjtJQUM1QyxPQUFPO1FBQ0wsSUFBSSxFQUFFLDhDQUE4QztRQUNwRCxLQUFLLEVBQUUsT0FBTztRQUNkLE1BQU07WUFDSixPQUFPO2dCQUNMLEtBQUssRUFBRTtvQkFDTCxhQUFhLEVBQUU7d0JBQ2IsTUFBTSxDQUFDLE9BQU87NEJBQ1osSUFDRSxPQUFPLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUM7Z0NBQ3ZDLE9BQU8sQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxFQUNuQztnQ0FDQSxPQUFPOzZCQUNSO3dCQUNILENBQUM7cUJBQ0Y7aUJBQ0Y7YUFDRixDQUFDO1FBQ0osQ0FBQztRQUNELFNBQVMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLE9BQU87WUFDMUIsSUFDRSxDQUFDLE9BQU8sRUFBRSxHQUFHO2dCQUNiLEVBQUUsQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLGVBQWUsQ0FBQyxDQUFDO2dCQUMzQyxFQUFFLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQyxFQUN6QjtnQkFDQSxPQUFPO29CQUNMLElBQUksRUFBRSwyQkFBMkI7b0JBQ2pDLEdBQUcsRUFBRSxJQUFJO2lCQUNWLENBQUM7YUFDSDtZQUVELE9BQU87UUFDVCxDQUFDO0tBQ0YsQ0FBQztBQUNKLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYXItY2xpZW50LXBhZ2UtZW5kcG9pbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2NsZWFyLWNsaWVudC1wYWdlLWVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBVSxhQUFhLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFN0MsTUFBTSxVQUFVLDhCQUE4QjtJQUM1QyxPQUFPO1FBQ0wsSUFBSSxFQUFFLDhDQUE4QztRQUNwRCxLQUFLLEVBQUUsT0FBTztRQUNkLE1BQU07WUFDSixPQUFPO2dCQUNMLEtBQUssRUFBRTtvQkFDTCxhQUFhLEVBQUU7d0JBQ2IsTUFBTSxDQUFDLE9BQU87NEJBQ1osSUFDRSxPQUFPLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUM7Z0NBQ3ZDLE9BQU8sQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxFQUNuQyxDQUFDO2dDQUNELE9BQU87NEJBQ1QsQ0FBQzt3QkFDSCxDQUFDO3FCQUNGO2lCQUNGO2FBQ0YsQ0FBQztRQUNKLENBQUM7UUFDRCxTQUFTLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxPQUFPO1lBQzFCLElBQ0UsQ0FBQyxPQUFPLEVBQUUsR0FBRztnQkFDYixFQUFFLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxlQUFlLENBQUMsQ0FBQztnQkFDM0MsRUFBRSxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsRUFDekIsQ0FBQztnQkFDRCxPQUFPO29CQUNMLElBQUksRUFBRSwyQkFBMkI7b0JBQ2pDLEdBQUcsRUFBRSxJQUFJO2lCQUNWLENBQUM7WUFDSixDQUFDO1lBRUQsT0FBTztRQUNULENBQUM7S0FDRixDQUFDO0FBQ0osQ0FBQyJ9

package/src/lib/content-plugin.js

@@ -6,7 +6,7 @@ export function contentPlugin() {
             name: 'analogjs-content-frontmatter',
             async transform(code, id) {
                 // Transform only the frontmatter into a JSON object for lists
-                if (!id.includes('.md?analog-content-list')) {
+                if (!id.includes('analog-content-list=true')) {
                     return;
                 }
                 const cachedContent = cache.get(id);
@@ -34,4 +34,4 @@ export function contentPlugin() {
         },
     ];
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGVudC1wbHVnaW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2NvbnRlbnQtcGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBT3pCLE1BQU0sVUFBVSxhQUFhO0lBQzNCLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxFQUFtQixDQUFDO0lBRXpDLE9BQU87UUFDTDtZQUNFLElBQUksRUFBRSw4QkFBOEI7WUFDcEMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtnQkFDdEIsOERBQThEO2dCQUM5RCxJQUFJLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyx5QkFBeUIsQ0FBQyxFQUFFO29CQUMzQyxPQUFPO2lCQUNSO2dCQUVELE1BQU0sYUFBYSxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQ3BDLHlFQUF5RTtnQkFDekUsOEVBQThFO2dCQUM5RSw4RUFBOEU7Z0JBQzlFLDBDQUEwQztnQkFDMUMsSUFBSSxhQUFhLEVBQUUsSUFBSSxLQUFLLElBQUksRUFBRTtvQkFDaEMsT0FBTyxrQkFBa0IsYUFBYSxDQUFDLFVBQVUsRUFBRSxDQUFDO2lCQUNyRDtnQkFFRCxNQUFNLEVBQUUsR0FBUSxNQUFNLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQztnQkFDN0Msa0ZBQWtGO2dCQUNsRixpRkFBaUY7Z0JBQ2pGLDJDQUEyQztnQkFDM0MsTUFBTSxXQUFXLEdBQUcsRUFBRSxDQUFDLE9BQU8sSUFBSSxFQUFFLENBQUM7Z0JBQ3JDLE1BQU0sWUFBWSxHQUFHLEVBQUUsQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztnQkFDL0QsTUFBTSxFQUFFLFVBQVUsRUFBRSxHQUFHLFdBQVcsQ0FBQyxZQUFZLENBQUMsQ0FBQztnQkFDakQsTUFBTSxPQUFPLEdBQUc7b0JBQ2QsSUFBSTtvQkFDSixVQUFVLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUM7aUJBQ3ZDLENBQUM7Z0JBQ0YsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsT0FBTyxDQUFDLENBQUM7Z0JBRXZCLE9BQU8sa0JBQWtCLE9BQU8sQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNoRCxDQUFDO1NBQ0Y7S0FDRixDQUFDO0FBQ0osQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGVudC1wbHVnaW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2NvbnRlbnQtcGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBT3pCLE1BQU0sVUFBVSxhQUFhO0lBQzNCLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxFQUFtQixDQUFDO0lBRXpDLE9BQU87UUFDTDtZQUNFLElBQUksRUFBRSw4QkFBOEI7WUFDcEMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtnQkFDdEIsOERBQThEO2dCQUM5RCxJQUFJLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQywwQkFBMEIsQ0FBQyxFQUFFLENBQUM7b0JBQzdDLE9BQU87Z0JBQ1QsQ0FBQztnQkFFRCxNQUFNLGFBQWEsR0FBRyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDO2dCQUNwQyx5RUFBeUU7Z0JBQ3pFLDhFQUE4RTtnQkFDOUUsOEVBQThFO2dCQUM5RSwwQ0FBMEM7Z0JBQzFDLElBQUksYUFBYSxFQUFFLElBQUksS0FBSyxJQUFJLEVBQUUsQ0FBQztvQkFDakMsT0FBTyxrQkFBa0IsYUFBYSxDQUFDLFVBQVUsRUFBRSxDQUFDO2dCQUN0RCxDQUFDO2dCQUVELE1BQU0sRUFBRSxHQUFRLE1BQU0sTUFBTSxDQUFDLGNBQWMsQ0FBQyxDQUFDO2dCQUM3QyxrRkFBa0Y7Z0JBQ2xGLGlGQUFpRjtnQkFDakYsMkNBQTJDO2dCQUMzQyxNQUFNLFdBQVcsR0FBRyxFQUFFLENBQUMsT0FBTyxJQUFJLEVBQUUsQ0FBQztnQkFDckMsTUFBTSxZQUFZLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDO2dCQUMvRCxNQUFNLEVBQUUsVUFBVSxFQUFFLEdBQUcsV0FBVyxDQUFDLFlBQVksQ0FBQyxDQUFDO2dCQUNqRCxNQUFNLE9BQU8sR0FBRztvQkFDZCxJQUFJO29CQUNKLFVBQVUsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQztpQkFDdkMsQ0FBQztnQkFDRixLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQztnQkFFdkIsT0FBTyxrQkFBa0IsT0FBTyxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ2hELENBQUM7U0FDRjtLQUNGLENBQUM7QUFDSixDQUFDIn0=

package/src/lib/nx-plugin/src/generators/app/files/root/tsconfig.base.json

@@ -0,0 +1,20 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "rootDir": ".",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "target": "es2015",
+    "module": "esnext",
+    "lib": ["es2020", "dom"],
+    "skipLibCheck": true,
+    "skipDefaultLibCheck": true,
+    "baseUrl": ".",
+    "paths": {}
+  },
+  "exclude": ["node_modules", "tmp"]
+}

package/src/lib/nx-plugin/src/generators/app/files/tailwind/tailwind.config.js__template__

@@ -0,0 +1,14 @@
+const { createGlobPatternsForDependencies } = require('@nx/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/lib/nx-plugin/src/generators/app/files/template-angular-v17/vite.config.ts__template__

@@ -7,6 +7,7 @@ import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
+    root: __dirname,
     publicDir: 'src/public',
     <% if (addTRPC) { %>
     ssr: {
@@ -14,6 +15,9 @@ export default defineConfig(({ mode }) => {
     },
     <% } %>
     build: {
+      outDir: '<%= offsetFromRoot %>dist/<%= projectRoot %>/client',
+      reportCompressedSize: true,
+      commonjsOptions: { transformMixedEsModules: true },      
       target: ['es2020'],
     },
     plugins: [

package/src/lib/nx-plugin/src/generators/app/generator.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.appGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
@@ -13,9 +12,7 @@ const add_tailwind_config_1 = require("./lib/add-tailwind-config");
 const add_trpc_1 = require("./lib/add-trpc");
 const add_home_page_1 = require("./lib/add-home-page");
 const minimum_supported_versions_1 = require("./versions/minimum-supported-versions");
-const add_eslint_1 = require("./lib/add-eslint");
 function normalizeOptions(tree, options, nxVersion) {
-    var _a, _b;
     const appsDir = (0, devkit_1.getWorkspaceLayout)(tree).appsDir;
     const allNames = (0, devkit_1.names)(options.analogAppName);
     const projectDirectory = allNames.fileName;
@@ -26,9 +23,12 @@ function normalizeOptions(tree, options, nxVersion) {
         : [];
     const offsetFromRoot = (0, devkit_1.offsetFromRoot)(projectRoot);
     const nxPackageNamespace = (0, semver_1.major)(nxVersion) >= 16 ? '@nx' : '@nrwl';
-    const addTailwind = (_a = options.addTailwind) !== null && _a !== void 0 ? _a : true;
-    const addTRPC = (_b = options.addTRPC) !== null && _b !== void 0 ? _b : false;
-    return Object.assign(Object.assign(Object.assign({}, options), allNames), { projectName,
+    const addTailwind = options.addTailwind ?? true;
+    const addTRPC = options.addTRPC ?? false;
+    return {
+        ...options,
+        ...allNames,
+        projectName,
         projectRoot,
         projectDirectory,
         parsedTags,
@@ -36,44 +36,42 @@ function normalizeOptions(tree, options, nxVersion) {
         appsDir,
         nxPackageNamespace,
         addTailwind,
-        addTRPC });
+        addTRPC,
+    };
 }
-function appGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nxVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'nx');
-        if (!nxVersion) {
-            throw new Error((0, devkit_1.stripIndents) `Nx must be installed to execute this plugin`);
-        }
-        if ((0, minimum_supported_versions_1.belowMinimumSupportedNxVersion)(nxVersion)) {
-            throw new Error((0, devkit_1.stripIndents) `Nx v15.2.0 or newer is required to install Analog`);
-        }
-        if ((0, minimum_supported_versions_1.belowMinimumSupportedNxtRPCVersion)(nxVersion) && options.addTRPC) {
-            console.warn('Nx v16.1.0 or newer is required to use tRPC with Analog. Skipping installation.');
-            options.addTRPC = false;
-        }
-        const normalizedOptions = normalizeOptions(tree, options, nxVersion);
-        const angularVersion = yield (0, initialize_analog_workspace_1.initializeAngularWorkspace)(tree, nxVersion, normalizedOptions);
-        const majorNxVersion = (0, semver_1.major)(nxVersion);
-        const majorAngularVersion = (0, semver_1.major)((0, semver_1.coerce)(angularVersion));
-        yield (0, add_analog_dependencies_1.addAnalogDependencies)(tree, nxVersion, angularVersion);
-        const { projectRoot, projectName, parsedTags, name, appsDir, nxPackageNamespace, } = normalizedOptions;
-        (0, add_analog_project_config_1.addAnalogProjectConfig)(tree, projectRoot, projectName, parsedTags, name, appsDir, nxPackageNamespace);
-        (0, add_files_1.addFiles)(tree, normalizedOptions, majorAngularVersion);
-        if (normalizedOptions.addTailwind) {
-            yield (0, add_tailwind_config_1.addTailwindConfig)(tree, normalizedOptions.projectRoot, normalizedOptions.projectName, majorNxVersion);
-        }
-        if (normalizedOptions.addTRPC) {
-            yield (0, add_trpc_1.addTrpc)(tree, normalizedOptions.projectRoot, nxVersion, normalizedOptions);
-        }
-        (0, add_home_page_1.addHomePage)(tree, normalizedOptions);
-        yield (0, add_eslint_1.addEslint)(tree, majorNxVersion, normalizedOptions);
-        if (!normalizedOptions.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return () => {
-            (0, devkit_1.installPackagesTask)(tree);
-        };
-    });
+async function appGenerator(tree, options) {
+    const nxVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'nx');
+    if (!nxVersion) {
+        throw new Error((0, devkit_1.stripIndents) `Nx must be installed to execute this plugin`);
+    }
+    if ((0, minimum_supported_versions_1.belowMinimumSupportedNxVersion)(nxVersion)) {
+        throw new Error((0, devkit_1.stripIndents) `Nx v15.2.0 or newer is required to install Analog`);
+    }
+    if ((0, minimum_supported_versions_1.belowMinimumSupportedNxtRPCVersion)(nxVersion) && options.addTRPC) {
+        console.warn('Nx v16.1.0 or newer is required to use tRPC with Analog. Skipping installation.');
+        options.addTRPC = false;
+    }
+    const normalizedOptions = normalizeOptions(tree, options, nxVersion);
+    const angularVersion = await (0, initialize_analog_workspace_1.initializeAngularWorkspace)(tree, nxVersion, normalizedOptions);
+    const majorAngularVersion = (0, semver_1.major)((0, semver_1.coerce)(angularVersion));
+    await (0, add_analog_dependencies_1.addAnalogDependencies)(tree, nxVersion, angularVersion);
+    const { projectRoot, projectName, parsedTags, name, appsDir, nxPackageNamespace, } = normalizedOptions;
+    (0, add_analog_project_config_1.addAnalogProjectConfig)(tree, projectRoot, projectName, parsedTags, name, appsDir, nxPackageNamespace);
+    (0, add_files_1.addFiles)(tree, normalizedOptions, majorAngularVersion);
+    if (normalizedOptions.addTailwind) {
+        await (0, add_tailwind_config_1.addTailwindConfig)(tree, projectName);
+    }
+    if (normalizedOptions.addTRPC) {
+        await (0, add_trpc_1.addTrpc)(tree, projectRoot, nxVersion, normalizedOptions);
+    }
+    (0, add_home_page_1.addHomePage)(tree, normalizedOptions);
+    // await addEslint(tree, majorNxVersion, normalizedOptions);
+    if (!normalizedOptions.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return () => {
+        (0, devkit_1.installPackagesTask)(tree);
+    };
 }
 exports.appGenerator = appGenerator;
 exports.default = appGenerator;

package/src/lib/nx-plugin/src/generators/app/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/generator.ts"],"names":[],"mappings":"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"}

package/src/lib/nx-plugin/src/generators/app/lib/add-analog-dependencies.js

@@ -1,19 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAnalogDependencies = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const dependencies_1 = require("../versions/dependencies");
 const dev_dependencies_1 = require("../versions/dev-dependencies");
-function addAnalogDependencies(tree, nxVersion, angularVersion) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const dependencies = (0, dependencies_1.getAnalogDependencies)(nxVersion, angularVersion);
-        const devDependencies = (0, dev_dependencies_1.getAnalogDevDependencies)(nxVersion);
-        // ensure previous @analogjs/platform version is removed, whether installed
-        // as a dependency or devDependency, before adding analog dependencies.
-        (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@analogjs/platform'], ['@analogjs/platform']);
-        (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
-    });
+async function addAnalogDependencies(tree, nxVersion, angularVersion) {
+    const dependencies = (0, dependencies_1.getAnalogDependencies)(nxVersion, angularVersion);
+    const devDependencies = (0, dev_dependencies_1.getAnalogDevDependencies)(nxVersion);
+    // ensure previous @analogjs/platform version is removed, whether installed
+    // as a dependency or devDependency, before adding analog dependencies.
+    (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@analogjs/platform'], ['@analogjs/platform']);
+    (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
 }
 exports.addAnalogDependencies = addAnalogDependencies;
 //# sourceMappingURL=add-analog-dependencies.js.map

package/src/lib/nx-plugin/src/generators/app/lib/add-analog-dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-analog-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-analog-dependencies.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,2DAAiE;AACjE,mEAAwE;AAExE,SAAsB,qBAAqB,CACzC,IAAU,EACV,SAAiB,EACjB,cAAsB;;QAEtB,MAAM,YAAY,GAAG,IAAA,oCAAqB,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACtE,MAAM,eAAe,GAAG,IAAA,2CAAwB,EAAC,SAAS,CAAC,CAAC;QAC5D,2EAA2E;QAC3E,uEAAuE;QACvE,IAAA,0CAAiC,EAC/B,IAAI,EACJ,CAAC,oBAAoB,CAAC,EACtB,CAAC,oBAAoB,CAAC,CACvB,CAAC;QACF,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;IACpE,CAAC;CAAA;AAfD,sDAeC"}
+{"version":3,"file":"add-analog-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-analog-dependencies.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AACpB,2DAAiE;AACjE,mEAAwE;AAEjE,KAAK,UAAU,qBAAqB,CACzC,IAAU,EACV,SAAiB,EACjB,cAAsB;IAEtB,MAAM,YAAY,GAAG,IAAA,oCAAqB,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACtE,MAAM,eAAe,GAAG,IAAA,2CAAwB,EAAC,SAAS,CAAC,CAAC;IAC5D,2EAA2E;IAC3E,uEAAuE;IACvE,IAAA,0CAAiC,EAC/B,IAAI,EACJ,CAAC,oBAAoB,CAAC,EACtB,CAAC,oBAAoB,CAAC,CACvB,CAAC;IACF,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;AACpE,CAAC;AAfD,sDAeC"}

package/src/lib/nx-plugin/src/generators/app/lib/add-eslint.js

@@ -1,29 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addEslint = void 0;
-const tslib_1 = require("tslib");
-function addEslint(tree, majorNxVersion, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const linterOptions = {
-            // needed to not depend on linter package
-            linter: 'eslint',
-            project: options.projectName,
-            eslintFilePatterns: [`${options.projectRoot}/**/*.{ts,html}`],
-            skipFormat: true,
-        };
-        if (majorNxVersion >= 16) {
-            yield (yield Promise.resolve().then(() => require(
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            '@nx/eslint'))).lintProjectGenerator(tree, linterOptions);
-        }
-        else {
-            yield (yield Promise.resolve().then(() => require(
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            '@nrwl/linter'))).lintProjectGenerator(tree, linterOptions);
-        }
-    });
+async function addEslint(tree, majorNxVersion, options) {
+    const linterOptions = {
+        // needed to not depend on linter package
+        linter: 'eslint',
+        project: options.projectName,
+        eslintFilePatterns: [`${options.projectRoot}/**/*.{ts,html}`],
+        skipFormat: true,
+    };
+    if (majorNxVersion >= 16) {
+        await (await Promise.resolve().then(() => require(
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        '@nx/eslint'))).lintProjectGenerator(tree, linterOptions);
+    }
+    else {
+        await (await Promise.resolve().then(() => require(
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        '@nrwl/linter'))).lintProjectGenerator(tree, linterOptions);
+    }
 }
 exports.addEslint = addEslint;
 //# sourceMappingURL=add-eslint.js.map

package/src/lib/nx-plugin/src/generators/app/lib/add-eslint.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-eslint.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-eslint.ts"],"names":[],"mappings":";;;;AAGA,SAAsB,SAAS,CAC7B,IAAU,EACV,cAAsB,EACtB,OAA0B;;QAE1B,MAAM,aAAa,GAAG;YACpB,yCAAyC;YACzC,MAAM,EAAE,QAAe;YACvB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,iBAAiB,CAAC;YAC7D,UAAU,EAAE,IAAI;SACjB,CAAC;QACF,IAAI,cAAc,IAAI,EAAE,EAAE;YACxB,MAAM,CACJ;YACE,6DAA6D;YAC7D,aAAa;YACb,YAAY,EACb,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAC7C;aAAM;YACL,MAAM,CACJ;YACE,6DAA6D;YAC7D,aAAa;YACb,cAAc,EACf,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAC7C;IACH,CAAC;CAAA;AA7BD,8BA6BC"}
+{"version":3,"file":"add-eslint.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-eslint.ts"],"names":[],"mappings":";;;AAGO,KAAK,UAAU,SAAS,CAC7B,IAAU,EACV,cAAsB,EACtB,OAA0B;IAE1B,MAAM,aAAa,GAAG;QACpB,yCAAyC;QACzC,MAAM,EAAE,QAAe;QACvB,OAAO,EAAE,OAAO,CAAC,WAAW;QAC5B,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,iBAAiB,CAAC;QAC7D,UAAU,EAAE,IAAI;KACjB,CAAC;IACF,IAAI,cAAc,IAAI,EAAE,EAAE,CAAC;QACzB,MAAM,CACJ;QACE,6DAA6D;QAC7D,aAAa;QACb,YAAY,EACb,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAC9C,CAAC;SAAM,CAAC;QACN,MAAM,CACJ;QACE,6DAA6D;QAC7D,aAAa;QACb,cAAc,EACf,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC;AA7BD,8BA6BC"}

package/src/lib/nx-plugin/src/generators/app/lib/add-files.js

@@ -4,8 +4,14 @@ exports.addFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 function addFiles(tree, options, majorAngularVersion) {
-    const templateOptions = Object.assign(Object.assign({}, options), { template: '' });
+    const templateOptions = {
+        ...options,
+        template: '',
+    };
     (0, devkit_1.generateFiles)(tree, path.join(__dirname, '..', 'files', 'template-angular-v' + majorAngularVersion), options.projectRoot, templateOptions);
+    if (!tree.read('/tsconfig.base.json')) {
+        (0, devkit_1.generateFiles)(tree, path.join(__dirname, '..', 'files', 'root'), '.', templateOptions);
+    }
 }
 exports.addFiles = addFiles;
 //# sourceMappingURL=add-files.js.map

package/src/lib/nx-plugin/src/generators/app/lib/add-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-files.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AACjD,6BAA6B;AAG7B,SAAgB,QAAQ,CACtB,IAAU,EACV,OAA0B,EAC1B,mBAA2B;IAE3B,MAAM,eAAe,mCAChB,OAAO,KACV,QAAQ,EAAE,EAAE,GACb,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CACP,SAAS,EACT,IAAI,EACJ,OAAO,EACP,oBAAoB,GAAG,mBAAmB,CAC3C,EACD,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AApBD,4BAoBC"}
+{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-files.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AACjD,6BAA6B;AAG7B,SAAgB,QAAQ,CACtB,IAAU,EACV,OAA0B,EAC1B,mBAA2B;IAE3B,MAAM,eAAe,GAAG;QACtB,GAAG,OAAO;QACV,QAAQ,EAAE,EAAE;KACb,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CACP,SAAS,EACT,IAAI,EACJ,OAAO,EACP,oBAAoB,GAAG,mBAAmB,CAC3C,EACD,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACtC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,EAC3C,GAAG,EACH,eAAe,CAChB,CAAC;IACJ,CAAC;AACH,CAAC;AA7BD,4BA6BC"}

package/src/lib/nx-plugin/src/generators/app/lib/add-home-page.js

@@ -4,7 +4,10 @@ exports.addHomePage = void 0;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 function addHomePage(tree, options) {
-    const templateOptions = Object.assign(Object.assign({}, options), { template: '' });
+    const templateOptions = {
+        ...options,
+        template: '',
+    };
     (0, devkit_1.generateFiles)(tree, path.join(__dirname, '..', 'files', 'index-page'), options.projectRoot, templateOptions);
     let pageDirectory = options.addTailwind ? 'tailwind' : 'css';
     if (options.addTRPC) {

package/src/lib/nx-plugin/src/generators/app/lib/add-home-page.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-home-page.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-home-page.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AACjD,6BAA6B;AAG7B,SAAgB,WAAW,CAAC,IAAU,EAAE,OAA0B;IAChE,MAAM,eAAe,mCAChB,OAAO,KACV,QAAQ,EAAE,EAAE,GACb,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,EACjD,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;IAEF,IAAI,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7D,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,aAAa,IAAI,OAAO,CAAC;KAC1B;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,aAAa,CAAC,EACxE,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AAxBD,kCAwBC"}
+{"version":3,"file":"add-home-page.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-home-page.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AACjD,6BAA6B;AAG7B,SAAgB,WAAW,CAAC,IAAU,EAAE,OAA0B;IAChE,MAAM,eAAe,GAAG;QACtB,GAAG,OAAO;QACV,QAAQ,EAAE,EAAE;KACb,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,EACjD,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;IAEF,IAAI,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7D,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,aAAa,IAAI,OAAO,CAAC;IAC3B,CAAC;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,aAAa,CAAC,EACxE,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AAxBD,kCAwBC"}

package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-config.d.ts

@@ -1,2 +1,13 @@
-import { Tree } from '@nx/devkit';
-export declare function addTailwindConfig(tree: Tree, projectRoot: string, projectName: string, majorNxVersion: number): Promise<void>;
+import { GeneratorCallback, Tree } from '@nx/devkit';
+export declare function addTailwindConfig(tree: Tree, projectName: string): Promise<void>;
+export interface GeneratorOptions {
+    project: string;
+    buildTarget?: string;
+    skipFormat?: boolean;
+    stylesEntryPoint?: string;
+    skipPackageJson?: boolean;
+}
+export interface NormalizedGeneratorOptions extends GeneratorOptions {
+    buildTarget: string;
+}
+export declare function setupTailwindGenerator(tree: Tree, rawOptions: GeneratorOptions): Promise<GeneratorCallback>;

package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-config.js

@@ -1,27 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addTailwindConfig = void 0;
-const tslib_1 = require("tslib");
+exports.setupTailwindGenerator = exports.addTailwindConfig = void 0;
 const devkit_1 = require("@nx/devkit");
-const path = require("path");
-function addTailwindConfig(tree, projectRoot, projectName, majorNxVersion) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (majorNxVersion >= 16) {
-            yield (yield Promise.resolve().then(() => require(
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            '@nx/angular/generators'))).setupTailwindGenerator(tree, {
-                project: projectName,
-            });
-        }
-        else {
-            yield (yield Promise.resolve().then(() => require(
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            '@nrwl/angular/generators'))).setupTailwindGenerator(tree, { project: projectName });
-        }
-        (0, devkit_1.generateFiles)(tree, path.join(__dirname, '..', 'files', 'tailwind'), projectRoot, { template: '' });
+const add_tailwind_helpers_1 = require("./add-tailwind-helpers");
+async function addTailwindConfig(tree, projectName) {
+    await setupTailwindGenerator(tree, {
+        project: projectName,
     });
 }
 exports.addTailwindConfig = addTailwindConfig;
+async function setupTailwindGenerator(tree, rawOptions) {
+    const options = (0, add_tailwind_helpers_1.normalizeOptions)(rawOptions);
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const tailwindInstalledVersion = (0, add_tailwind_helpers_1.detectTailwindInstalledVersion)(tree);
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    let installTask = () => { };
+    if (!options.skipPackageJson) {
+        if (tailwindInstalledVersion === undefined) {
+            installTask = (0, add_tailwind_helpers_1.addTailwindRequiredPackages)(tree);
+        }
+    }
+    (0, add_tailwind_helpers_1.addTailwindConfigFile)(tree, options, project);
+    if (project.projectType === 'application') {
+        (0, add_tailwind_helpers_1.updateApplicationStyles)(tree, options, project);
+    }
+    else if (project.projectType === 'library') {
+        (0, add_tailwind_helpers_1.addTailwindConfigPathToProject)(tree, options, project);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return installTask;
+}
+exports.setupTailwindGenerator = setupTailwindGenerator;
 //# sourceMappingURL=add-tailwind-config.js.map

package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-tailwind-config.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-tailwind-config.ts"],"names":[],"mappings":";;;;AAAA,uCAAiD;AACjD,6BAA6B;AAE7B,SAAsB,iBAAiB,CACrC,IAAU,EACV,WAAmB,EACnB,WAAmB,EACnB,cAAsB;;QAEtB,IAAI,cAAc,IAAI,EAAE,EAAE;YACxB,MAAM,CACJ;YACE,6DAA6D;YAC7D,aAAa;YACb,wBAAwB,EACzB,CACF,CAAC,sBAAsB,CAAC,IAAI,EAAE;gBAC7B,OAAO,EAAE,WAAW;aACrB,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,CACJ;YACE,6DAA6D;YAC7D,aAAa;YACb,0BAA0B,EAC3B,CACF,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;SAC1D;QAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,EAC/C,WAAW,EACX,EAAE,QAAQ,EAAE,EAAE,EAAE,CACjB,CAAC;IACJ,CAAC;CAAA;AAhCD,8CAgCC"}
+{"version":3,"file":"add-tailwind-config.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-tailwind-config.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AACpB,iEAOgC;AAEzB,KAAK,UAAU,iBAAiB,CAAC,IAAU,EAAE,WAAmB;IACrE,MAAM,sBAAsB,CAAC,IAAI,EAAE;QACjC,OAAO,EAAE,WAAW;KACrB,CAAC,CAAC;AACL,CAAC;AAJD,8CAIC;AAcM,KAAK,UAAU,sBAAsB,CAC1C,IAAU,EACV,UAA4B;IAE5B,MAAM,OAAO,GAAG,IAAA,uCAAgB,EAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEhE,MAAM,wBAAwB,GAAG,IAAA,qDAA8B,EAAC,IAAI,CAAC,CAAC;IAEtE,gEAAgE;IAChE,IAAI,WAAW,GAAsB,GAAG,EAAE,GAAE,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QAC7B,IAAI,wBAAwB,KAAK,SAAS,EAAE,CAAC;YAC3C,WAAW,GAAG,IAAA,kDAA2B,EAAC,IAAI,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAED,IAAA,4CAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAE9C,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE,CAAC;QAC1C,IAAA,8CAAuB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;SAAM,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAC7C,IAAA,qDAA8B,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AA9BD,wDA8BC"}

package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-helpers.d.ts

@@ -0,0 +1,8 @@
+import { Tree, GeneratorCallback, ProjectConfiguration } from '@nx/devkit';
+import { GeneratorOptions, NormalizedGeneratorOptions } from './add-tailwind-config';
+export declare function normalizeOptions(options: GeneratorOptions): NormalizedGeneratorOptions;
+export declare function detectTailwindInstalledVersion(tree: Tree): '2' | '3' | undefined;
+export declare function addTailwindRequiredPackages(tree: Tree): GeneratorCallback;
+export declare function updateApplicationStyles(tree: Tree, options: NormalizedGeneratorOptions, project: ProjectConfiguration): void;
+export declare function addTailwindConfigPathToProject(tree: Tree, options: NormalizedGeneratorOptions, project: ProjectConfiguration): void;
+export declare function addTailwindConfigFile(tree: Tree, options: GeneratorOptions, project: ProjectConfiguration): void;

package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-helpers.js

@@ -0,0 +1,116 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addTailwindConfigFile = exports.addTailwindConfigPathToProject = exports.updateApplicationStyles = exports.addTailwindRequiredPackages = exports.detectTailwindInstalledVersion = exports.normalizeOptions = void 0;
+const semver_1 = require("@nx/devkit/src/utils/semver");
+const tailwind_dependencies_1 = require("../versions/tailwind-dependencies");
+const semver_2 = require("semver");
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+function normalizeOptions(options) {
+    return {
+        ...options,
+        buildTarget: options.buildTarget || 'build',
+    };
+}
+exports.normalizeOptions = normalizeOptions;
+function detectTailwindInstalledVersion(tree) {
+    const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
+    const tailwindVersion = dependencies?.tailwindcss ?? devDependencies?.tailwindcss;
+    if (!tailwindVersion) {
+        return undefined;
+    }
+    const version = (0, semver_1.checkAndCleanWithSemver)('tailwindcss', tailwindVersion);
+    if ((0, semver_2.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_2.lt)(version, '3.0.0') ? '2' : '3';
+}
+exports.detectTailwindInstalledVersion = detectTailwindInstalledVersion;
+function addTailwindRequiredPackages(tree) {
+    const pkgVersions = (0, tailwind_dependencies_1.getTailwindDependencies)();
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        autoprefixer: pkgVersions.autoprefixer,
+        postcss: pkgVersions.postcss,
+        tailwindcss: pkgVersions.tailwindcss,
+    });
+}
+exports.addTailwindRequiredPackages = addTailwindRequiredPackages;
+function updateApplicationStyles(tree, options, project) {
+    let stylesEntryPoint = options.stylesEntryPoint;
+    if (stylesEntryPoint && !tree.exists(stylesEntryPoint)) {
+        throw new Error(`The provided styles entry point "${stylesEntryPoint}" could not be found.`);
+    }
+    if (!stylesEntryPoint) {
+        stylesEntryPoint = findStylesEntryPoint(tree, options, project);
+        if (!stylesEntryPoint) {
+            throw new Error((0, devkit_1.stripIndents) `Could not find a styles entry point for project "${options.project}".
+        Please specify a styles entry point using the "--stylesEntryPoint" option.`);
+        }
+    }
+    const stylesEntryPointContent = tree.read(stylesEntryPoint, 'utf-8');
+    tree.write(stylesEntryPoint, (0, devkit_1.stripIndents) `@tailwind base;
+    @tailwind components;
+    @tailwind utilities;
+
+    ${stylesEntryPointContent}`);
+}
+exports.updateApplicationStyles = updateApplicationStyles;
+function findStylesEntryPoint(tree, options, project) {
+    // first check for common names
+    const possibleStylesEntryPoints = [
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.css'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.scss'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.sass'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot ?? project.root, 'styles.less'),
+    ];
+    const stylesEntryPoint = possibleStylesEntryPoints.find((s) => tree.exists(s));
+    if (stylesEntryPoint) {
+        return stylesEntryPoint;
+    }
+    // then check for the specified styles in the build configuration if it exists
+    const styles = project.targets?.[options.buildTarget].options?.styles;
+    if (!styles) {
+        return undefined;
+    }
+    // find the first style that belongs to the project source
+    const style = styles.find((s) => typeof s === 'string'
+        ? s.startsWith(project.root) && tree.exists(s)
+        : s.input.startsWith(project.root) &&
+            s.inject !== false &&
+            tree.exists(s.input));
+    if (!style) {
+        return undefined;
+    }
+    return typeof style === 'string' ? style : style.input;
+}
+function addTailwindConfigPathToProject(tree, options, project) {
+    const buildTarget = project.targets?.[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.`);
+    }
+    if (buildTarget.options?.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 = {
+        ...buildTarget.options,
+        tailwindConfig: (0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js'),
+    };
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
+}
+exports.addTailwindConfigPathToProject = addTailwindConfigPathToProject;
+function addTailwindConfigFile(tree, options, project) {
+    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.`);
+    }
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'tailwind'), project.root, {
+        relativeSourceRoot: (0, path_1.relative)(project.root, project.sourceRoot),
+        template: '',
+    });
+}
+exports.addTailwindConfigFile = addTailwindConfigFile;
+//# sourceMappingURL=add-tailwind-helpers.js.map

package/src/lib/nx-plugin/src/generators/app/lib/add-tailwind-helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-tailwind-helpers.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-tailwind-helpers.ts"],"names":[],"mappings":"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"}