chore: upd builds

package.json

@@ -13,6 +13,7 @@
  "showcase-taxonomy:serve": "nx serve showcase-taxonomy",
  "showcase-taxonomy:build": "nx build showcase-taxonomy",
  "showcase-dashboard:serve": "nx serve showcase-dashboards",
+ "showcase-dashboard:build": "nx build showcase-dashboards",
  "----Primitives---": "-----------------------------------------------------------------------",
  "primitives:build": "nx run primitives:build",
  "primitives:test": "nx run primitives:test",
@@ -108,7 +109,7 @@
  "autoprefixer": "^10.4.0",
  "chromatic": "^11.3.0",
  "classnames": "^2.5.1",
- "clsx": "^2.1.0",
+ "clsx": "^2.1.1",
  "esbuild": "^0.19.2",
  "eslint": "8.57.0",
  "eslint-config-prettier": "^9.0.0",

packages/shadcn/button/ng-package.json

@@ -1,8 +1,5 @@
 {
- "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
- "dest": "../../dist/shadcn",
  "lib": {
  "entryFile": "index.ts"
- },
- "allowedNonPeerDependencies": []
+ }
 }

packages/shadcn/button/src/button.component.ts

@@ -1,10 +1,10 @@
 // This code is an adaptation of code from https://ui.shadcn.com/docs.
 
-import { computed, Directive, input } from '@angular/core';
+import { computed, Directive, input, signal } from '@angular/core';
 
 import { twMerge } from '@radix-ng/shadcn/core';
 import { cva, type VariantProps } from 'class-variance-authority';
-import { ClassValue } from 'clsx';
+import type { ClassValue } from 'clsx';
 
 const variants = cva(
  'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
@@ -50,13 +50,15 @@ export class ShButtonDirective {
  readonly size = input<ButtonVariants['size']>('default');
 
  protected computedClass = computed(() =>
- twMerge(variants({ variant: this.variant() }), this.userClass())
+ twMerge(
+ variants({ variant: this.variant(), size: this.size() }),
+ this._settableClass(),
+ this.userClass()
+ )
  );
 
- // set variant(value: ButtonVariants['variant']) {
- // this._variant.set(value);
- // }
- // get variant() {
- // return this._variant();
- // }
+ private readonly _settableClass = signal<ClassValue>('');
+ setClass(value: ClassValue) {
+ this._settableClass.set(value);
+ }
 }

packages/shadcn/core/ng-package.json

@@ -1,8 +1,5 @@
 {
- "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
- "dest": "../../dist/shadcn",
  "lib": {
  "entryFile": "index.ts"
- },
- "allowedNonPeerDependencies": []
+ }
 }

packages/shadcn/input/ng-package.json

@@ -1,8 +1,5 @@
 {
- "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
- "dest": "../../dist/shadcn",
  "lib": {
  "entryFile": "index.ts"
- },
- "allowedNonPeerDependencies": []
+ }
 }

packages/shadcn/label/ng-package.json

@@ -1,8 +1,5 @@
 {
- "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
- "dest": "../../dist/shadcn",
  "lib": {
  "entryFile": "index.ts"
- },
- "allowedNonPeerDependencies": []
+ }
 }

packages/shadcn/package.json

@@ -23,15 +23,13 @@
  "@angular/cdk": "^17.0.0",
  "@radix-ng/primitives": "workspace:*"
  },
- "dependencies": {
- "class-variance-authority": "^0.7.0",
- "clsx": "^2.1.1",
- "tailwind-merge": "^2.3.0"
- },
  "devDependencies": {
  "@angular/core": "^17.0.0",
  "@angular/cdk": "^17.0.0",
- "@radix-ng/primitives": "workspace:*"
+ "@radix-ng/primitives": "workspace:*",
+ "class-variance-authority": "^0.7.0",
+ "clsx": "^2.1.1",
+ "tailwind-merge": "^2.3.0"
  },
  "sideEffects": false
 }

packages/shadcn/project.json

@@ -7,6 +7,11 @@
  "tags": [],
  "targets": {
  "build": {
+ "executor": "nx:run-commands",
+ "options": { "commands": [] },
+ "dependsOn": ["primitives:build", "build-lib"]
+ },
+ "build-lib": {
  "executor": "@nx/angular:package",
  "outputs": ["{workspaceRoot}/dist/{projectRoot}"],
  "options": {

packages/shadcn/tsconfig.lib.prod.json

@@ -0,0 +1,9 @@
+{
+ "extends": "./tsconfig.lib.json",
+ "compilerOptions": {
+ "declarationMap": false
+ },
+ "angularCompilerOptions": {
+ "compilationMode": "partial"
+ }
+}