@spartan-ng/cli 0.0.1-alpha.710 → 0.0.1-alpha.712
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/generators/base/generator.js +4 -2
- package/src/generators/base/generator.js.map +1 -1
- package/src/generators/base/lib/build-dependency-array.d.ts +1 -1
- package/src/generators/base/lib/build-dependency-array.js +2 -4
- package/src/generators/base/lib/build-dependency-array.js.map +1 -1
- package/src/generators/base/lib/initialize-angular-library.js +5 -4
- package/src/generators/base/lib/initialize-angular-library.js.map +1 -1
- package/src/generators/init/compat.d.ts +2 -1
- package/src/generators/init/compat.js +1 -1
- package/src/generators/init/compat.js.map +1 -1
- package/src/generators/init/generator.d.ts +2 -1
- package/src/generators/init/generator.js +3 -3
- package/src/generators/init/generator.js.map +1 -1
- package/src/generators/init/schema.d.ts +6 -0
- package/src/generators/init/schema.json +19 -1
- package/src/generators/migrate-core/generator.js +0 -15
- package/src/generators/migrate-core/generator.js.map +1 -1
- package/src/generators/migrate-helm-libraries/generator.js +7 -2
- package/src/generators/migrate-helm-libraries/generator.js.map +1 -1
- package/src/generators/theme/compat.d.ts +1 -1
- package/src/generators/theme/generator.d.ts +2 -1
- package/src/generators/theme/generator.js +64 -32
- package/src/generators/theme/generator.js.map +1 -1
- package/src/generators/theme/libs/add-theme-to-application-styles.d.ts +0 -1
- package/src/generators/theme/libs/add-theme-to-application-styles.js +35 -21
- package/src/generators/theme/libs/add-theme-to-application-styles.js.map +1 -1
- package/src/generators/theme/libs/colors.d.ts +0 -1
- package/src/generators/theme/libs/colors.js +1 -277
- package/src/generators/theme/libs/colors.js.map +1 -1
- package/src/generators/theme/schema.d.ts +17 -0
- package/src/generators/theme/schema.json +19 -1
- package/src/generators/ui/libs/alert-dialog/files/index.ts.template +3 -0
- package/src/generators/ui/libs/alert-dialog/files/lib/hlm-alert-dialog-action.ts.template +1 -3
- package/src/generators/ui/libs/alert-dialog/files/lib/hlm-alert-dialog-cancel.ts.template +6 -4
- package/src/generators/ui/libs/alert-dialog/files/lib/hlm-alert-dialog-content.ts.template +5 -5
- package/src/generators/ui/libs/alert-dialog/files/lib/hlm-alert-dialog-description.ts.template +2 -4
- package/src/generators/ui/libs/alert-dialog/files/lib/hlm-alert-dialog-footer.ts.template +5 -4
- package/src/generators/ui/libs/alert-dialog/files/lib/hlm-alert-dialog-header.ts.template +2 -4
- package/src/generators/ui/libs/alert-dialog/files/lib/hlm-alert-dialog-media.ts.template +12 -0
- package/src/generators/ui/libs/alert-dialog/files/lib/hlm-alert-dialog-overlay.ts.template +1 -6
- package/src/generators/ui/libs/alert-dialog/files/lib/hlm-alert-dialog-title.ts.template +2 -4
- package/src/generators/ui/libs/alert-dialog/files/lib/hlm-alert-dialog-trigger.ts.template +1 -3
- package/src/generators/ui/libs/carousel/files/lib/hlm-carousel.ts.template +2 -6
- package/src/generators/ui/libs/dialog/files/lib/hlm-dialog-close.ts.template +1 -3
- package/src/generators/ui/libs/dialog/files/lib/hlm-dialog-content.ts.template +2 -5
- package/src/generators/ui/libs/dialog/files/lib/hlm-dialog-description.ts.template +2 -4
- package/src/generators/ui/libs/dialog/files/lib/hlm-dialog-footer.ts.template +2 -4
- package/src/generators/ui/libs/dialog/files/lib/hlm-dialog-header.ts.template +2 -4
- package/src/generators/ui/libs/dialog/files/lib/hlm-dialog-overlay.ts.template +2 -3
- package/src/generators/ui/libs/dialog/files/lib/hlm-dialog-title.ts.template +2 -4
- package/src/generators/ui/libs/dialog/files/lib/hlm-dialog-trigger.ts.template +1 -3
- package/src/generators/ui/libs/sheet/files/lib/hlm-sheet-close.ts.template +1 -3
- package/src/generators/ui/libs/sheet/files/lib/hlm-sheet-content.ts.template +11 -23
- package/src/generators/ui/libs/sheet/files/lib/hlm-sheet-description.ts.template +2 -4
- package/src/generators/ui/libs/sheet/files/lib/hlm-sheet-footer.ts.template +2 -4
- package/src/generators/ui/libs/sheet/files/lib/hlm-sheet-header.ts.template +2 -4
- package/src/generators/ui/libs/sheet/files/lib/hlm-sheet-overlay.ts.template +1 -4
- package/src/generators/ui/libs/sheet/files/lib/hlm-sheet-title.ts.template +2 -4
- package/src/generators/ui/libs/sheet/files/lib/hlm-sheet-trigger.ts.template +1 -3
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-content.ts.template +4 -1
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-footer.ts.template +1 -1
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-group-action.ts.template +4 -6
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-group-content.ts.template +1 -1
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-group-label.ts.template +1 -4
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-group.ts.template +1 -1
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-header.ts.template +1 -1
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-inset.ts.template +2 -7
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-menu-action.ts.template +2 -8
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-menu-badge.ts.template +4 -8
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-menu-button.ts.template +6 -7
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-menu-skeleton.ts.template +7 -4
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-menu-sub-button.ts.template +5 -6
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-menu-sub.ts.template +1 -4
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-menu.ts.template +1 -1
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-rail.ts.template +2 -2
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-trigger.ts.template +8 -15
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar-wrapper.ts.template +1 -1
- package/src/generators/ui/libs/sidebar/files/lib/hlm-sidebar.ts.template +11 -18
- package/src/generators/ui/libs/tooltip/files/lib/hlm-tooltip.ts.template +3 -2
- package/src/generators/ui/style-luma.css +3 -3
- package/src/generators/ui/style-lyra.css +6 -6
- package/src/generators/ui/style-maia.css +7 -7
- package/src/generators/ui/style-mira.css +6 -8
- package/src/generators/ui/style-nova.css +7 -7
- package/src/generators/ui/style-vega.css +7 -7
- package/src/generators/ui/supported-ui-libraries.json +41 -41
- package/src/registry/schema.d.ts +94 -121
- package/src/registry/schema.js +1 -10
- package/src/registry/schema.js.map +1 -1
- package/src/utils/get-tailwind-version.d.ts +0 -2
- package/src/utils/get-tailwind-version.js +0 -18
- package/src/utils/get-tailwind-version.js.map +0 -1
package/package.json
CHANGED
|
@@ -51,7 +51,9 @@ async function generateEntrypointFiles(tree, alias, options) {
|
|
|
51
51
|
});
|
|
52
52
|
}
|
|
53
53
|
else {
|
|
54
|
-
|
|
54
|
+
// Resolve the workspace's root tsconfig rather than assuming tsconfig.base.json - a standalone nx
|
|
55
|
+
// workspace registers paths in tsconfig.json (there is no base file).
|
|
56
|
+
(0, devkit_1.updateJson)(tree, (0, js_1.getRootTsConfigPathInTree)(tree), (json) => {
|
|
55
57
|
json.compilerOptions ||= {};
|
|
56
58
|
json.compilerOptions.paths ||= {};
|
|
57
59
|
json.compilerOptions.paths[alias] = [`./${(0, devkit_1.joinPathFragments)(targetLibDir, 'index.ts').replace(/\\/g, '/')}`];
|
|
@@ -69,7 +71,7 @@ function generateLibraryFiles(tree, targetLibDir, options) {
|
|
|
69
71
|
function registerDependencies(tree, options) {
|
|
70
72
|
const cdkVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/cdk', versions_1.FALLBACK_ANGULAR_CDK_VERSION, true);
|
|
71
73
|
const dependencies = (0, build_dependency_array_1.buildDependencyArray)(tree, options, cdkVersion);
|
|
72
|
-
const devDependencies = (0, build_dependency_array_1.buildDevDependencyArray)(
|
|
74
|
+
const devDependencies = (0, build_dependency_array_1.buildDevDependencyArray)();
|
|
73
75
|
return (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
|
|
74
76
|
}
|
|
75
77
|
async function hlmBaseGenerator(tree, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/base/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/base/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type Tree } from '@nx/devkit';
|
|
2
2
|
import type { HlmBaseGeneratorSchema } from '../schema';
|
|
3
3
|
export declare function buildDependencyArray(tree: Tree, options: HlmBaseGeneratorSchema, cdkVersion: string): Record<string, string>;
|
|
4
|
-
export declare function buildDevDependencyArray(
|
|
4
|
+
export declare function buildDevDependencyArray(): {
|
|
5
5
|
'tw-animate-css': string;
|
|
6
6
|
};
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.buildDependencyArray = buildDependencyArray;
|
|
4
4
|
exports.buildDevDependencyArray = buildDevDependencyArray;
|
|
5
|
-
const get_tailwind_version_1 = require("../../../utils/get-tailwind-version");
|
|
6
5
|
const version_utils_1 = require("../../../utils/version-utils");
|
|
7
6
|
const versions_1 = require("../versions");
|
|
8
7
|
function buildDependencyArray(tree, options, cdkVersion) {
|
|
@@ -19,10 +18,9 @@ function buildDependencyArray(tree, options, cdkVersion) {
|
|
|
19
18
|
}
|
|
20
19
|
return dependencies;
|
|
21
20
|
}
|
|
22
|
-
function buildDevDependencyArray(
|
|
23
|
-
const tailwindVersion = (0, get_tailwind_version_1.getTailwindVersion)(tree);
|
|
21
|
+
function buildDevDependencyArray() {
|
|
24
22
|
return {
|
|
25
|
-
|
|
23
|
+
'tw-animate-css': versions_1.TW_ANIMATE_CSS,
|
|
26
24
|
};
|
|
27
25
|
}
|
|
28
26
|
//# sourceMappingURL=build-dependency-array.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-dependency-array.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/base/lib/build-dependency-array.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"build-dependency-array.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/base/lib/build-dependency-array.ts"],"names":[],"mappings":";;AAKA,oDAeC;AAED,0DAIC;AAzBD,gEAA0E;AAE1E,0CAAuF;AAEvF,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAA+B,EAAE,UAAkB;IACnG,IAAI,YAAY,GAA2B;QAC1C,cAAc,EAAE,UAAU;QAC1B,mBAAmB,EAAE,IAAA,0CAA0B,EAAC,IAAI,EAAE,iBAAiB,EAAE,SAAS,EAAE,IAAI,CAAC;QACzF,gBAAgB,EAAE,iCAAsB;KACxC,CAAC;IAEF,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC9B,YAAY,GAAG,EAAE,GAAG,YAAY,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IACjE,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC3D,YAAY,CAAC,gBAAgB,CAAC,GAAG,2BAAgB,CAAC;IACnD,CAAC;IACD,OAAO,YAAY,CAAC;AACrB,CAAC;AAED,SAAgB,uBAAuB;IACtC,OAAO;QACN,gBAAgB,EAAE,yBAAc;KAChC,CAAC;AACH,CAAC"}
|
|
@@ -13,10 +13,11 @@ function addRulesToEslintOverride(tree, libRoot, filePattern, newRules) {
|
|
|
13
13
|
if (!tree.exists(eslintPath))
|
|
14
14
|
return;
|
|
15
15
|
const eslintFullPath = path.join(process.cwd(), eslintPath);
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
// Don't tie ts-morph to a specific on-disk tsconfig. During generation the root tsconfig may not be
|
|
17
|
+
// on disk yet - e.g. in a standalone nx workspace where @nx/angular:library has only just created
|
|
18
|
+
// tsconfig.base.json in the virtual tree - and pointing at a missing file throws "File not found".
|
|
19
|
+
// We only manipulate the eslint config's AST, so no tsconfig project context is needed.
|
|
20
|
+
const project = new ts_morph_1.Project({ useInMemoryFileSystem: true });
|
|
20
21
|
const sourceFile = project.createSourceFile(eslintFullPath, tree.read(eslintPath, 'utf-8'), { overwrite: true });
|
|
21
22
|
const exportArray = sourceFile.getFirstDescendantByKind(ts_morph_1.SyntaxKind.ArrayLiteralExpression);
|
|
22
23
|
if (!exportArray)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initialize-angular-library.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/base/lib/initialize-angular-library.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"initialize-angular-library.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/generators/base/lib/initialize-angular-library.ts"],"names":[],"mappings":";;AA8HA,kEA8BC;AAED,4DAkBC;;AAhLD,uDAAwD;AAExD,uCAAkF;AAClF,mDAA6B;AAC7B,uCAA6E;AAE7E,uDAAkD;AAElD,SAAS,wBAAwB,CAAC,IAAU,EAAE,OAAe,EAAE,WAAmB,EAAE,QAAgC;IACnH,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;IACnE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QAAE,OAAO;IAErC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;IAE5D,oGAAoG;IACpG,kGAAkG;IAClG,mGAAmG;IACnG,wFAAwF;IACxF,MAAM,OAAO,GAAG,IAAI,kBAAO,CAAC,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC;IAE7D,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAElH,MAAM,WAAW,GAAG,UAAU,CAAC,wBAAwB,CAAC,qBAAU,CAAC,sBAAsB,CAAC,CAAC;IAC3F,IAAI,CAAC,WAAW;QAAE,OAAO;IAEzB,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;QACzD,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,qBAAU,CAAC,uBAAuB,CAAC;YAAE,OAAO,KAAK,CAAC;QACxE,MAAM,GAAG,GAAG,EAA6B,CAAC;QAC1C,MAAM,SAAS,GAAG,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3C,OAAO,SAAS,EAAE,OAAO,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC,CAAwC,CAAC;IAE1C,IAAI,CAAC,WAAW;QAAE,OAAO;IAEzB,IAAI,SAAS,GAAG,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,CAAC,SAAS,EAAE,CAAC;QAChB,WAAW,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QACxE,SAAS,GAAG,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,8DAA8D;IAC9D,MAAM,QAAQ,GAAI,SAAiB,CAAC,2BAA2B,CAAC,qBAAU,CAAC,uBAAuB,CAAC,CAAC;IAEpG,KAAK,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9D,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrC,QAAQ,CAAC,qBAAqB,CAAC;gBAC9B,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,SAAS;aACtB,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;AAClD,CAAC;AAED;;GAEG;AACH,SAAS,UAAU,CAAC,IAAU,EAAE,OAAe;IAC9C,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE;QACpD,mCAAmC,EAAE,OAAO;QAC5C,iCAAiC,EAAE;;;;;GAKlC;QACD,0CAA0C,EAAE,OAAO;QACnD,0CAA0C,EAAE,OAAO;QACnD,wCAAwC,EAAE;;;;;;;;IAQxC;KACF,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,YAAY,CAAC,IAAU,EAAE,OAAe;IAChD,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE;QACtD,uDAAuD,EAAE,OAAO;QAChE,yDAAyD,EAAE,OAAO;KAClE,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAe;IAC5C,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1B,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAU,EAAE,GAAW;IACtD,kEAAkE;IAClE,MAAM,MAAM,GAAG,IAAA,0BAAiB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;IAC1E,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACjD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACvB,CAAC;IACF,CAAC;IAED,kEAAkE;IAClE,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACxD,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5B,IAAI,CAAC,KAAK,CACT,SAAS,EACT,wGAAwG,CACxG,CAAC;IACH,CAAC;AACF,CAAC;AAED,MAAM,aAAa,GAAoB;IACtC,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,KAAK;IACb,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,IAAI;IACf,MAAM,EAAE,IAAI;IACZ,cAAc,EAAE,2BAAc,CAAC,IAAI;CACnC,CAAC;AAEK,KAAK,UAAU,2BAA2B,CAChD,IAAU,EACV,OAAyF;IAEzF,MAAM,EAAE,gBAAgB,EAAE,GAAG,gEAAa,wBAAwB,GAAC,CAAC;IACpE,MAAM,GAAG,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE;QAC7C,GAAG,CAAC,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;QAC/D,GAAG,aAAa;QAChB,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,+BAAa;QACnB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,UAAU,EAAE,OAAO,CAAC,WAAW;QAC/B,SAAS,EAAE,GAAG;QACd,IAAI,EAAE,OAAO,CAAC,IAAI;KAClB,CAAC,CAAC;IAEH,sBAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAClC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAEpB,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,GAAG,EAAE,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACtE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAClC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AACjB,CAAC;AAEM,KAAK,UAAU,wBAAwB,CAAC,IAAU,EAAE,OAA+B;IACzF,MAAM,EAAE,gBAAgB,EAAE,GAAG,gEAAa,wBAAwB,GAAC,CAAC;IAEpE,MAAM,GAAG,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/D,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE;QAC7C,GAAG,CAAC,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;QAC/D,GAAG,aAAa;QAChB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,UAAU,EAAE,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,EAAE;QACpD,SAAS,EAAE,GAAG;QACd,IAAI,EAAE,OAAO,CAAC,IAAI;KAClB,CAAC,CAAC;IAEH,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAEpB,OAAO,QAAQ,CAAC;AACjB,CAAC"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
-
|
|
1
|
+
import type { SpartanInitGeneratorSchema } from './schema';
|
|
2
|
+
declare const _default: (generatorOptions: SpartanInitGeneratorSchema) => (tree: any, context: any) => Promise<any>;
|
|
2
3
|
export default _default;
|
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const devkit_1 = require("@nx/devkit");
|
|
4
4
|
const generator_1 = require("./generator");
|
|
5
|
-
exports.default = (0, devkit_1.convertNxGenerator)((tree) => (0, generator_1.spartanInitGenerator)(tree));
|
|
5
|
+
exports.default = (0, devkit_1.convertNxGenerator)((tree, options) => (0, generator_1.spartanInitGenerator)(tree, options));
|
|
6
6
|
//# sourceMappingURL=compat.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/init/compat.ts"],"names":[],"mappings":";;AAAA,uCAA2D;AAC3D,2CAAmD;
|
|
1
|
+
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/init/compat.ts"],"names":[],"mappings":";;AAAA,uCAA2D;AAC3D,2CAAmD;AAGnD,kBAAe,IAAA,2BAAkB,EAAC,CAAC,IAAU,EAAE,OAAmC,EAAE,EAAE,CACrF,IAAA,gCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CACnC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { type GeneratorCallback, type Tree } from '@nx/devkit';
|
|
2
|
-
|
|
2
|
+
import type { SpartanInitGeneratorSchema } from './schema';
|
|
3
|
+
export declare function spartanInitGenerator(tree: Tree, options?: SpartanInitGeneratorSchema): Promise<GeneratorCallback>;
|
|
3
4
|
export default spartanInitGenerator;
|
|
@@ -7,16 +7,16 @@ const version_utils_1 = require("../../utils/version-utils");
|
|
|
7
7
|
const build_dependency_array_1 = require("../base/lib/build-dependency-array");
|
|
8
8
|
const versions_1 = require("../base/versions");
|
|
9
9
|
const generator_1 = tslib_1.__importDefault(require("../theme/generator"));
|
|
10
|
-
async function spartanInitGenerator(tree) {
|
|
10
|
+
async function spartanInitGenerator(tree, options = {}) {
|
|
11
11
|
devkit_1.logger.info('Initializing Spartan UI Library...');
|
|
12
12
|
const cdkVersionStr = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/cdk', versions_1.FALLBACK_ANGULAR_CDK_VERSION, true);
|
|
13
13
|
const dependencies = (0, build_dependency_array_1.buildDependencyArray)(tree, {}, cdkVersionStr);
|
|
14
|
-
const devDependencies = (0, build_dependency_array_1.buildDevDependencyArray)(
|
|
14
|
+
const devDependencies = (0, build_dependency_array_1.buildDevDependencyArray)();
|
|
15
15
|
const tasks = [];
|
|
16
16
|
if (Object.entries(dependencies).length > 0 || Object.entries(devDependencies).length > 0) {
|
|
17
17
|
tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies));
|
|
18
18
|
}
|
|
19
|
-
await (0, generator_1.default)(tree, true);
|
|
19
|
+
await (0, generator_1.default)(tree, { ...options, setupTailwindCss: true });
|
|
20
20
|
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
21
21
|
}
|
|
22
22
|
exports.default = spartanInitGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/init/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/init/generator.ts"],"names":[],"mappings":";;AAQA,oDAiBC;;AAzBD,uCAAuH;AACvH,6DAAuE;AACvE,+EAAmG;AAEnG,+CAAgE;AAChE,2EAAgE;AAGzD,KAAK,UAAU,oBAAoB,CAAC,IAAU,EAAE,UAAsC,EAAE;IAC9F,eAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;IAElD,MAAM,aAAa,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,cAAc,EAAE,uCAA4B,EAAE,IAAI,CAAC,CAAC;IAE3G,MAAM,YAAY,GAA2B,IAAA,6CAAoB,EAAC,IAAI,EAAE,EAA4B,EAAE,aAAa,CAAC,CAAC;IACrH,MAAM,eAAe,GAA2B,IAAA,gDAAuB,GAAE,CAAC;IAE1E,MAAM,KAAK,GAAwB,EAAE,CAAC;IAEtC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3F,KAAK,CAAC,IAAI,CAAC,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,MAAM,IAAA,mBAA8B,EAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAEnF,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;AACnC,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
|
|
@@ -3,6 +3,24 @@
|
|
|
3
3
|
"$id": "Init",
|
|
4
4
|
"title": "Initialize Spartan in your project",
|
|
5
5
|
"type": "object",
|
|
6
|
-
"properties": {
|
|
6
|
+
"properties": {
|
|
7
|
+
"project": {
|
|
8
|
+
"type": "string",
|
|
9
|
+
"description": "The application to add the theme to. If omitted you will be prompted to choose one."
|
|
10
|
+
},
|
|
11
|
+
"theme": {
|
|
12
|
+
"type": "string",
|
|
13
|
+
"enum": ["neutral", "stone", "zinc", "gray", "slate"],
|
|
14
|
+
"description": "The theme to apply. Passing this runs the generator non-interactively (no prompts)."
|
|
15
|
+
},
|
|
16
|
+
"stylesEntryPoint": {
|
|
17
|
+
"type": "string",
|
|
18
|
+
"description": "Path to the styles entry point relative to the workspace root. Auto-detected when omitted."
|
|
19
|
+
},
|
|
20
|
+
"prefix": {
|
|
21
|
+
"type": "string",
|
|
22
|
+
"description": "Prefix class name applied to the theme's style definitions, e.g. theme-zinc. Leave empty for a global theme."
|
|
23
|
+
}
|
|
24
|
+
},
|
|
7
25
|
"required": []
|
|
8
26
|
}
|
|
@@ -5,7 +5,6 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
const visit_files_1 = require("../../utils/visit-files");
|
|
6
6
|
async function migrateCoreGenerator(tree, options) {
|
|
7
7
|
updateImports(tree);
|
|
8
|
-
updateTailwindConfig(tree);
|
|
9
8
|
if (!options.skipFormat) {
|
|
10
9
|
await (0, devkit_1.formatFiles)(tree);
|
|
11
10
|
}
|
|
@@ -34,19 +33,5 @@ function updateImports(tree) {
|
|
|
34
33
|
}
|
|
35
34
|
});
|
|
36
35
|
}
|
|
37
|
-
/**
|
|
38
|
-
* Update the tailwind config file
|
|
39
|
-
*/
|
|
40
|
-
function updateTailwindConfig(tree) {
|
|
41
|
-
(0, visit_files_1.visitFiles)(tree, '/', (path) => {
|
|
42
|
-
// technically the tailwind config file could be anywhere and named anything
|
|
43
|
-
// but all we need to do is a simple string replace '@spartan-ng/ui-core/hlm-tailwind-preset' with '@spartan-ng/brain/hlm-tailwind-preset'
|
|
44
|
-
const content = tree.read(path).toString('utf-8');
|
|
45
|
-
if (content.includes('@spartan-ng/ui-core/hlm-tailwind-preset')) {
|
|
46
|
-
const updatedCode = content.replace(/@spartan-ng\/ui-core\/hlm-tailwind-preset/g, '@spartan-ng/brain/hlm-tailwind-preset');
|
|
47
|
-
tree.write(path, updatedCode);
|
|
48
|
-
}
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
36
|
exports.default = migrateCoreGenerator;
|
|
52
37
|
//# sourceMappingURL=generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-core/generator.ts"],"names":[],"mappings":";;AAIA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-core/generator.ts"],"names":[],"mappings":";;AAIA,oDAMC;AAVD,uCAAoD;AACpD,yDAAqD;AAG9C,KAAK,UAAU,oBAAoB,CAAC,IAAU,EAAE,OAAmC;IACzF,aAAa,CAAC,IAAI,CAAC,CAAC;IAEpB,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACzB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACzB,CAAC;AACF,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,IAAU;IAChC,IAAA,wBAAU,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAElD,IAAI,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC;YAC7C,MAAM,WAAW,GAAG,OAAO;gBAC1B,sDAAsD;iBACrD,OAAO,CAAC,4DAA4D,EAAE,CAAC,KAAK,EAAE,EAAE,CAChF,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,CAC9D;gBACD,2DAA2D;iBAC1D,OAAO,CAAC,mEAAmE,EAAE,CAAC,KAAK,EAAE,EAAE,CACvF,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,CAC9D;gBACD,sDAAsD;iBACrD,OAAO,CAAC,4DAA4D,EAAE,CAAC,KAAK,EAAE,EAAE,CAChF,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,CAC9D;gBACD,wDAAwD;iBACvD,OAAO,CAAC,gEAAgE,EAAE,CAAC,KAAK,EAAE,EAAE,CACpF,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,CAC9D;gBACD,4DAA4D;iBAC3D,OAAO,CAAC,sDAAsD,EAAE,CAAC,KAAK,EAAE,EAAE,CAC1E,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,CAC9D;gBACD,gDAAgD;iBAC/C,OAAO,CAAC,qDAAqD,EAAE,CAAC,KAAK,EAAE,EAAE,CACzE,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,CAC9D,CAAC;YAEH,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC/B,CAAC;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
|
|
@@ -36,7 +36,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
36
|
exports.migrateHelmLibrariesGenerator = migrateHelmLibrariesGenerator;
|
|
37
37
|
const devkit_1 = require("@nx/devkit");
|
|
38
38
|
const js_1 = require("@nx/js");
|
|
39
|
-
|
|
39
|
+
// Import `removeGenerator` from its module directly rather than the `@nx/workspace` barrel.
|
|
40
|
+
// The barrel eagerly evaluates `convert-to-nx-project`, whose `output.js` crashes on nx 22
|
|
41
|
+
// ("Cannot read properties of undefined (reading 'inverse')") due to a chalk/tslib interop
|
|
42
|
+
// issue in nx itself. Importing the generator directly avoids loading that module.
|
|
43
|
+
// See https://github.com/nrwl/nx/issues/35521 - revert to the barrel once nx ships the fix.
|
|
44
|
+
const remove_1 = require("@nx/workspace/src/generators/remove/remove");
|
|
40
45
|
const enquirer_1 = require("enquirer");
|
|
41
46
|
const path_1 = require("path");
|
|
42
47
|
const config_1 = require("../../utils/config");
|
|
@@ -145,7 +150,7 @@ async function removeExistingLibraries(tree, options, libraries) {
|
|
|
145
150
|
if (!projectName) {
|
|
146
151
|
throw new Error(`Could not find the project name for library: ${library} in project root path ${projectRoot}`);
|
|
147
152
|
}
|
|
148
|
-
await (0,
|
|
153
|
+
await (0, remove_1.removeGenerator)(tree, {
|
|
149
154
|
projectName,
|
|
150
155
|
forceRemove: true,
|
|
151
156
|
skipFormat: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-helm-libraries/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/migrate-helm-libraries/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: (generatorOptions:
|
|
1
|
+
declare const _default: (generatorOptions: import("./schema").HlmThemeGeneratorSchema) => (tree: any, context: any) => Promise<any>;
|
|
2
2
|
export default _default;
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import type { Tree } from '@nx/devkit';
|
|
2
|
-
|
|
2
|
+
import type { HlmThemeGeneratorSchema } from './schema';
|
|
3
|
+
export default function addThemeToApplicationGenerator(tree: Tree, options?: HlmThemeGeneratorSchema): Promise<void>;
|
|
@@ -5,44 +5,76 @@ const enquirer_1 = require("enquirer");
|
|
|
5
5
|
const get_project_names_1 = require("../../utils/get-project-names");
|
|
6
6
|
const add_theme_to_application_styles_1 = require("./libs/add-theme-to-application-styles");
|
|
7
7
|
const colors_1 = require("./libs/colors");
|
|
8
|
-
async function addThemeToApplicationGenerator(tree,
|
|
8
|
+
async function addThemeToApplicationGenerator(tree, options = {}) {
|
|
9
|
+
const setupTailwindCss = options.setupTailwindCss ?? true;
|
|
10
|
+
// Passing a theme opts into non-interactive mode: every remaining answer falls back to a sensible
|
|
11
|
+
// default (auto-detected styles entry point, global theme) instead of prompting. This lets the CLI be
|
|
12
|
+
// driven by flags (`ng g @spartan-ng/cli:ui-theme --theme=zinc`) and scripted in CI.
|
|
13
|
+
const nonInteractive = !!options.theme;
|
|
9
14
|
const { projects, projectNames } = (0, get_project_names_1.getProjectsAndNames)(tree);
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
let app = options.project;
|
|
16
|
+
if (app && !projectNames.includes(app)) {
|
|
17
|
+
throw new Error(`The provided project "${app}" is not an application in this workspace. Choose one of: ${projectNames.join(', ')}.`);
|
|
18
|
+
}
|
|
19
|
+
if (!app) {
|
|
20
|
+
if (nonInteractive) {
|
|
21
|
+
if (projectNames.length === 1) {
|
|
22
|
+
app = projectNames[0];
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
throw new Error(`Could not determine which application to add the theme to. Pass "--project" to choose one of: ${projectNames.join(', ')}.`);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
const response = await (0, enquirer_1.prompt)({
|
|
30
|
+
type: 'select',
|
|
31
|
+
required: true,
|
|
32
|
+
name: 'app',
|
|
33
|
+
message: 'Choose which application you want to add the theme to:',
|
|
34
|
+
choices: projectNames,
|
|
35
|
+
});
|
|
36
|
+
app = response.app;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
const project = projects.get(app);
|
|
18
40
|
if (!project)
|
|
19
41
|
return;
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
42
|
+
let theme = options.theme;
|
|
43
|
+
if (theme && !colors_1.themeNames.includes(theme)) {
|
|
44
|
+
throw new Error(`The provided theme "${theme}" is not valid. Valid themes are: ${colors_1.themeNames.join(', ')}.`);
|
|
45
|
+
}
|
|
46
|
+
let stylesEntryPoint = options.stylesEntryPoint;
|
|
47
|
+
let prefix = options.prefix;
|
|
48
|
+
if (!nonInteractive) {
|
|
49
|
+
const answers = await (0, enquirer_1.prompt)([
|
|
50
|
+
{
|
|
51
|
+
type: 'select',
|
|
52
|
+
required: true,
|
|
53
|
+
name: 'theme',
|
|
54
|
+
message: 'Choose which theme to apply. You can always re-run this generator and add a custom prefix to add other themes.',
|
|
55
|
+
choices: colors_1.themeNames,
|
|
56
|
+
},
|
|
57
|
+
{
|
|
58
|
+
type: 'input',
|
|
59
|
+
name: 'stylesEntryPoint',
|
|
60
|
+
message: "Path to the styles entry point relative to the workspace root. If not provided the generator will do its best to find it and it will error if it can't.",
|
|
61
|
+
},
|
|
62
|
+
{
|
|
63
|
+
type: 'input',
|
|
64
|
+
name: 'prefix',
|
|
65
|
+
message: "Prefix class name applied to your theme's style definitions: e.g., theme-zinc. Leave empty for global theme.",
|
|
66
|
+
},
|
|
67
|
+
]);
|
|
68
|
+
theme = answers.theme;
|
|
69
|
+
stylesEntryPoint = answers.stylesEntryPoint;
|
|
70
|
+
prefix = answers.prefix;
|
|
71
|
+
}
|
|
39
72
|
await (0, add_theme_to_application_styles_1.addThemeToApplicationStyles)(tree, {
|
|
40
73
|
setupTailwindCss,
|
|
41
74
|
project: project.name,
|
|
42
|
-
theme:
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
prefix: themeOptions.prefix,
|
|
75
|
+
theme: theme,
|
|
76
|
+
stylesEntryPoint,
|
|
77
|
+
prefix,
|
|
46
78
|
}, project);
|
|
47
79
|
}
|
|
48
80
|
//# sourceMappingURL=generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/theme/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../libs/cli/src/generators/theme/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,20 +4,9 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.addThemeToApplicationStyles = addThemeToApplicationStyles;
|
|
6
6
|
const devkit_1 = require("@nx/devkit");
|
|
7
|
-
const enquirer_1 = require("enquirer");
|
|
8
|
-
const get_tailwind_version_1 = require("../../../utils/get-tailwind-version");
|
|
9
7
|
const colors_1 = require("./colors");
|
|
10
8
|
async function addThemeToApplicationStyles(tree, options, project) {
|
|
11
|
-
const
|
|
12
|
-
if (tailwindVersion === 3) {
|
|
13
|
-
await (0, enquirer_1.prompt)({
|
|
14
|
-
type: 'confirm',
|
|
15
|
-
name: 'Tailwind 3 detected',
|
|
16
|
-
initial: true,
|
|
17
|
-
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?`,
|
|
18
|
-
});
|
|
19
|
-
}
|
|
20
|
-
const spartantTailwindPresetImport = tailwindVersion === 4 ? '@import "@spartan-ng/brain/hlm-tailwind-preset.css";' : '';
|
|
9
|
+
const spartantTailwindPresetImport = '@import "@spartan-ng/brain/hlm-tailwind-preset.css";';
|
|
21
10
|
const prefix = options.prefix ? ` .${options.prefix}` : '';
|
|
22
11
|
let stylesEntryPoint = options.stylesEntryPoint;
|
|
23
12
|
if (stylesEntryPoint && !tree.exists(stylesEntryPoint)) {
|
|
@@ -30,9 +19,7 @@ async function addThemeToApplicationStyles(tree, options, project) {
|
|
|
30
19
|
Please specify a styles entry point using the "stylesEntryPoint" option.`);
|
|
31
20
|
}
|
|
32
21
|
}
|
|
33
|
-
const stylesEntryPointContent = tree.read(stylesEntryPoint, 'utf-8');
|
|
34
|
-
const CDK_IMPORT = `@import "@angular/cdk/overlay-prebuilt.css";`;
|
|
35
|
-
const ckdOverlayImport = tailwindVersion === 4 ? '' : CDK_IMPORT;
|
|
22
|
+
const stylesEntryPointContent = tree.read(stylesEntryPoint, 'utf-8') ?? '';
|
|
36
23
|
const twSetup = options.setupTailwindCss
|
|
37
24
|
? `@layer theme, base, components, utilities;
|
|
38
25
|
@import 'tailwindcss/theme.css' layer(theme);
|
|
@@ -43,13 +30,16 @@ async function addThemeToApplicationStyles(tree, options, project) {
|
|
|
43
30
|
const fontSans = stylesEntryPointContent.includes('--font-sans')
|
|
44
31
|
? ''
|
|
45
32
|
: `--font-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`;
|
|
46
|
-
const colorScheme =
|
|
33
|
+
const colorScheme = colors_1.themes[options.theme];
|
|
34
|
+
// The preset is added through an `@import`, which is only valid before any non-`@import` rule.
|
|
35
|
+
// Slot it in right after the stylesheet's existing leading imports (such as the app's own
|
|
36
|
+
// `@import "tailwindcss"`) so it stays valid CSS and Tailwind is still imported first.
|
|
37
|
+
const { leadingImports, body: stylesBody } = splitLeadingImports(stylesEntryPointContent);
|
|
38
|
+
const styleHeader = [twSetup, leadingImports, spartantTailwindPresetImport, stylesBody]
|
|
39
|
+
.filter((part) => part.trim() !== '')
|
|
40
|
+
.join('\n');
|
|
47
41
|
let stylesCssContentWithPotentialTailwindCssImport = (0, devkit_1.stripIndents) `
|
|
48
|
-
${
|
|
49
|
-
${ckdOverlayImport}
|
|
50
|
-
|
|
51
|
-
${stylesEntryPointContent}
|
|
52
|
-
${spartantTailwindPresetImport}
|
|
42
|
+
${styleHeader}
|
|
53
43
|
|
|
54
44
|
:root${prefix} {
|
|
55
45
|
color-scheme: light;
|
|
@@ -82,6 +72,30 @@ async function addThemeToApplicationStyles(tree, options, project) {
|
|
|
82
72
|
}
|
|
83
73
|
tree.write(stylesEntryPoint, stylesCssContentWithPotentialTailwindCssImport);
|
|
84
74
|
}
|
|
75
|
+
/**
|
|
76
|
+
* Split a stylesheet into its leading import block and the remaining rules. `@charset`, `@import`
|
|
77
|
+
* and `@layer ...;` statements (plus blank lines) may legally appear at the top of a stylesheet, so
|
|
78
|
+
* the spartan preset `@import` can be inserted right after them: still valid CSS (an `@import` after
|
|
79
|
+
* a normal rule is ignored) while leaving any existing `@import "tailwindcss"` first.
|
|
80
|
+
*/
|
|
81
|
+
function splitLeadingImports(content) {
|
|
82
|
+
const lines = content.split('\n');
|
|
83
|
+
let boundary = 0;
|
|
84
|
+
for (const line of lines) {
|
|
85
|
+
const trimmed = line.trim();
|
|
86
|
+
const isLeading = trimmed === '' ||
|
|
87
|
+
trimmed.startsWith('@charset') ||
|
|
88
|
+
trimmed.startsWith('@import') ||
|
|
89
|
+
/^@layer\b[^{]*;$/.test(trimmed);
|
|
90
|
+
if (!isLeading)
|
|
91
|
+
break;
|
|
92
|
+
boundary++;
|
|
93
|
+
}
|
|
94
|
+
return {
|
|
95
|
+
leadingImports: lines.slice(0, boundary).join('\n'),
|
|
96
|
+
body: lines.slice(boundary).join('\n'),
|
|
97
|
+
};
|
|
98
|
+
}
|
|
85
99
|
function findStylesEntryPoint(tree, project) {
|
|
86
100
|
// first check for common names
|
|
87
101
|
const possibleStylesEntryPoints = [
|
|
@@ -1 +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;;
|
|
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":"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"}
|