@spartan-ng/cli 0.0.1-alpha.533 → 0.0.1-alpha.534

package/src/generators/theme/libs/add-theme-to-application-styles.js

@@ -3,17 +3,19 @@
 // Check out the code here: https://github.com/nrwl/nx/blob/master/packages/angular/src/generators/setup-tailwind/lib/update-application-styles.ts
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addThemeToApplicationStyles = addThemeToApplicationStyles;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const semver = tslib_1.__importStar(require("semver"));
+const enquirer_1 = require("enquirer");
+const get_tailwind_version_1 = require("../../../utils/get-tailwind-version");
 const colors_1 = require("./colors");
-function addThemeToApplicationStyles(tree, options, project) {
-    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
-    const deps = { ...packageJson.dependencies, ...packageJson.devDependencies };
-    let tailwindVersion = 3;
-    if ('tailwindcss' in deps) {
-        const version = deps['tailwindcss'];
-        tailwindVersion = semver.coerce(version)?.major ?? 3;
+async function addThemeToApplicationStyles(tree, options, project) {
+    const tailwindVersion = (0, get_tailwind_version_1.getTailwindVersion)(tree);
+    if (tailwindVersion === 3) {
+        await (0, enquirer_1.prompt)({
+            type: 'confirm',
+            name: 'Tailwind 3 detected',
+            initial: true,
+            message: `Please note that we cannot guarantee full compatibility of the components with Tailwind CSS version 3, and some features may not function as expected. Are you sure you want to proceed with Tailwind CSS v3?`,
+        });
     }
     const tailwindImport = tailwindVersion === 4 ? '@import "@spartan-ng/brain/hlm-tailwind-preset.css";' : '';
     const prefix = options.prefix ? ` .${options.prefix}` : '';
@@ -29,10 +31,10 @@ function addThemeToApplicationStyles(tree, options, project) {
         }
     }
     const stylesEntryPointContent = tree.read(stylesEntryPoint, 'utf-8');
-    const CDK_IMPORT = `@import '@angular/cdk/overlay-prebuilt.css';`;
+    const CDK_IMPORT = `@import "@angular/cdk/overlay-prebuilt.css";`;
     const ckdOverlayImport = stylesEntryPointContent.includes(CDK_IMPORT) ? '' : CDK_IMPORT;
     const fontSans = stylesEntryPointContent.includes('--font-sans') ? '' : `--font-sans: '';`;
-    const colorScheme = tailwindVersion === 4 ? colors_1.themes[options.theme].cssVarsV4 : colors_1.themes[options.theme].cssVarsV3;
+    const colorScheme = tailwindVersion === 4 ? colors_1.themes[options.theme] : colors_1.legacyThemes[options.theme];
     tree.write(stylesEntryPoint, (0, devkit_1.stripIndents) `
     ${ckdOverlayImport}
 
@@ -51,7 +53,7 @@ function addThemeToApplicationStyles(tree, options, project) {
 
 		:root.dark${prefix} {
 			color-scheme: dark;
-			
+
 			${Object.entries(colorScheme.dark)
         .map(([key, value]) => `--${key}: ${value};`)
         .join('\n')}
@@ -59,8 +61,11 @@ function addThemeToApplicationStyles(tree, options, project) {
 
     @layer base {
       * {
-        @apply border-border;
-      }
+    		@apply border-border outline-ring/50;
+ 			}
+  		body {
+  		  @apply bg-background text-foreground;
+  		}
     }`);
 }
 function findStylesEntryPoint(tree, project) {

package/src/generators/theme/libs/add-theme-to-application-styles.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-theme-to-application-styles.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/theme/libs/add-theme-to-application-styles.ts"],"names":[],"mappings":";AAAA,gHAAgH;AAChH,kJAAkJ;;AAelJ,kEA4EC;;AAzFD,uCAA6G;AAE7G,uDAAiC;AACjC,qCAAkD;AAUlD,SAAgB,2BAA2B,CAC1C,IAAU,EACV,OAA2C,EAC3C,OAA6B;IAE7B,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAc,IAAI,EAAE,cAAc,CAAC,CAAC;IAChE,MAAM,IAAI,GAAG,EAAE,GAAG,WAAW,CAAC,YAAY,EAAE,GAAG,WAAW,CAAC,eAAe,EAAE,CAAC;IAE7E,IAAI,eAAe,GAAG,CAAC,CAAC;IAExB,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;QACpC,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,cAAc,GAAG,eAAe,KAAK,CAAC,CAAC,CAAC,CAAC,sDAAsD,CAAC,CAAC,CAAC,EAAE,CAAC;IAE3G,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3D,IAAI,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAEhD,IAAI,gBAAgB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,oCAAoC,gBAAgB,uBAAuB,CAAC,CAAC;IAC9F,CAAC;IAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACvB,gBAAgB,GAAG,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEvD,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACd,IAAA,qBAAY,EAAA,oDAAoD,OAAO,CAAC,OAAO;iFACF,CAC7E,CAAC;QACH,CAAC;IACF,CAAC;IAED,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAErE,MAAM,UAAU,GAAG,8CAA8C,CAAC;IAClE,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;IAExF,MAAM,QAAQ,GAAG,uBAAuB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC;IAE3F,MAAM,WAAW,GAAG,eAAe,KAAK,CAAC,CAAC,CAAC,CAAC,eAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC;IAE9G,IAAI,CAAC,KAAK,CACT,gBAAgB,EAChB,IAAA,qBAAY,EAAA;MACR,gBAAgB;;MAEhB,uBAAuB;MACvB,cAAc;;SAEX,MAAM;;;KAGV,QAAQ;;KAER,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC;SACjC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,GAAG,KAAK,KAAK,GAAG,CAAC;SAC5C,IAAI,CAAC,IAAI,CAAC;;;cAGD,MAAM;;;KAGf,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;SAChC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,GAAG,KAAK,KAAK,GAAG,CAAC;SAC5C,IAAI,CAAC,IAAI,CAAC;;;;;;;MAOT,CACJ,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAA6B;IACtE,+BAA+B;IAC/B,MAAM,yBAAyB,GAAG;QACjC,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC;QACnE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC;QACpE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC;QACpE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC;KACpE,CAAC;IAEF,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/E,IAAI,gBAAgB,EAAE,CAAC;QACtB,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAED,8EAA8E;IAC9E,MAAM,MAAM,GAAuD,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC;IAE1G,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,0DAA0D;IAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/B,OAAO,CAAC,KAAK,QAAQ;QACpB,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CACjF,CAAC;IAEF,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;AACxD,CAAC"}
+{"version":3,"file":"add-theme-to-application-styles.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/theme/libs/add-theme-to-application-styles.ts"],"names":[],"mappings":";AAAA,gHAAgH;AAChH,kJAAkJ;;AAelJ,kEA8EC;AA3FD,uCAAmG;AACnG,uCAAkC;AAClC,8EAAyE;AACzE,qCAAgE;AAUzD,KAAK,UAAU,2BAA2B,CAChD,IAAU,EACV,OAA2C,EAC3C,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAA,yCAAkB,EAAC,IAAI,CAAC,CAAC;IACjD,IAAI,eAAe,KAAK,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAA,iBAAM,EAAC;YACZ,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,+MAA+M;SACxN,CAAC,CAAC;IACJ,CAAC;IACD,MAAM,cAAc,GAAG,eAAe,KAAK,CAAC,CAAC,CAAC,CAAC,sDAAsD,CAAC,CAAC,CAAC,EAAE,CAAC;IAE3G,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3D,IAAI,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAEhD,IAAI,gBAAgB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,oCAAoC,gBAAgB,uBAAuB,CAAC,CAAC;IAC9F,CAAC;IAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACvB,gBAAgB,GAAG,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEvD,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACd,IAAA,qBAAY,EAAA,oDAAoD,OAAO,CAAC,OAAO;iFACF,CAC7E,CAAC;QACH,CAAC;IACF,CAAC;IAED,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAErE,MAAM,UAAU,GAAG,8CAA8C,CAAC;IAClE,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;IAExF,MAAM,QAAQ,GAAG,uBAAuB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC;IAE3F,MAAM,WAAW,GAAG,eAAe,KAAK,CAAC,CAAC,CAAC,CAAC,eAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,qBAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhG,IAAI,CAAC,KAAK,CACT,gBAAgB,EAChB,IAAA,qBAAY,EAAA;MACR,gBAAgB;;MAEhB,uBAAuB;MACvB,cAAc;;SAEX,MAAM;;;KAGV,QAAQ;;KAER,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC;SACjC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,GAAG,KAAK,KAAK,GAAG,CAAC;SAC5C,IAAI,CAAC,IAAI,CAAC;;;cAGD,MAAM;;;KAGf,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;SAChC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,GAAG,KAAK,KAAK,GAAG,CAAC;SAC5C,IAAI,CAAC,IAAI,CAAC;;;;;;;;;;MAUT,CACJ,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAA6B;IACtE,+BAA+B;IAC/B,MAAM,yBAAyB,GAAG;QACjC,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC;QACnE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC;QACpE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC;QACpE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC;KACpE,CAAC;IAEF,MAAM,gBAAgB,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/E,IAAI,gBAAgB,EAAE,CAAC;QACtB,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAED,8EAA8E;IAC9E,MAAM,MAAM,GAAuD,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC;IAE1G,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,0DAA0D;IAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/B,OAAO,CAAC,KAAK,QAAQ;QACpB,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CACjF,CAAC;IAEF,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;AACxD,CAAC"}

package/src/generators/theme/libs/colors.d.ts

@@ -1,14 +1,9 @@
+export declare const legacyThemes: Record<ThemeName, ColorScheme>;
+export declare const themes: Record<ThemeName, ColorScheme>;
 interface ColorScheme {
-    cssVarsV3: {
-        light: Record<string, string>;
-        dark: Record<string, string>;
-    };
-    cssVarsV4: {
-        light: Record<string, string>;
-        dark: Record<string, string>;
-    };
+    light: Record<string, string>;
+    dark: Record<string, string>;
 }
-export declare const themes: Record<string, ColorScheme>;
-export type ThemeName = keyof typeof themes;
+export type ThemeName = ['neutral', 'stone', 'zinc', 'gray', 'slate'][number];
 export declare const themeNames: ThemeName[];
 export {};