feat: build angular tailwind css v 1.17.0-rc.4

meta-d · Dec 4, 2023 · e68dfbc · e68dfbc
1 parent 5372a8b
commit e68dfbc
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 71 deletions.
diff --git a/apps/ng/src/app/dashboard/dashboard.component.html b/apps/ng/src/app/dashboard/dashboard.component.html
@@ -1,4 +1,4 @@
-<ngm-analytical-card
+<ngm-analytical-card displayDensity="compact"
     [dataSettings]="{
         dataSource: 'S4CDS',
         entitySet: '$/CPMB/SOIX6DW',

diff --git a/apps/ng/src/app/dashboard/dashboard.component.ts b/apps/ng/src/app/dashboard/dashboard.component.ts
@@ -3,7 +3,7 @@ import { Component, inject } from '@angular/core'
 import { FormsModule } from '@angular/forms'
 import { MatButtonModule } from '@angular/material/button'
 import { AnalyticalCardModule } from '@metad/ocap-angular/analytical-card'
-import { NgmAgentService, NgmDSCoreService, OCAP_AGENT_TOKEN, OCAP_DATASOURCE_TOKEN } from '@metad/ocap-angular/core'
+import { DensityDirective, NgmAgentService, NgmDSCoreService, OCAP_AGENT_TOKEN, OCAP_DATASOURCE_TOKEN } from '@metad/ocap-angular/core'
 import { AgentType, DataSource, Syntax, Type } from '@metad/ocap-core'
 import { S4ServerAgent } from './s4-agent.service'
 
@@ -39,7 +39,7 @@ import { S4ServerAgent } from './s4-agent.service'
       multi: true
     }
   ],
-  imports: [CommonModule, FormsModule, MatButtonModule, AnalyticalCardModule]
+  imports: [CommonModule, FormsModule, MatButtonModule, AnalyticalCardModule, DensityDirective]
 })
 export class DashboardComponent {
   #dsCoreService = inject(NgmDSCoreService)

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ocap",
   "author": "Metad",
-  "version": "1.17.0-rc.3",
+  "version": "1.17.0-rc.4",
   "scripts": {
     "start": "concurrently \"yarn start:api\" \"yarn start:olap\" \"yarn start:cloud\"",
     "start:cloud": "nx serve cloud --disableHostCheck --host 0.0.0.0",
@@ -16,8 +16,8 @@
     "start:api:debug": "nodemon --config nodemon-debug.json",
     "storybook": "concurrently \"yarn:watch:*\"",
     "watch:tailwind": "npx tailwindcss -c packages/angular/tailwind.config.js -i ./packages/angular/_index.scss -o ./packages/angular/.storybook/index.css -m1 --watch",
-    "watch:storybook": "npx nx storybook angular",
-    "build": "yarn nx build store && yarn nx build core && yarn nx build echarts && yarn nx build sql && yarn nx build xmla && yarn --cwd ./packages/duckdb build:release && yarn nx build duckdb && yarn nx build ocap-angular",
+    "w:sb:ocap-angular": "npx nx storybook ocap-angular",
+    "build": "yarn nx build store && yarn nx build core && yarn nx build echarts && yarn nx build sql && yarn nx build xmla && yarn --cwd ./packages/duckdb build:release && yarn nx build duckdb && yarn build:package:angular",
     "build:package:duckdb": "yarn --cwd ./packages/duckdb build:release && yarn nx build duckdb",
     "build:package:contracts": "yarn nx build contracts",
     "build:package:common": "yarn nx build common",
@@ -26,6 +26,7 @@
     "build:package:server": "yarn nx build server",
     "build:package:adapter": "yarn nx build adapter",
     "build:package:analytics": "yarn nx build analytics",
+    "build:package:angular": "yarn nx run ocap-angular:build-prod",
     "build:package:olap": "yarn --cwd ./packages/olap build",
     "build:package:all": "yarn nx build contracts && yarn nx build common && yarn nx build config && yarn nx build auth && yarn nx build server && yarn nx build adapter && yarn nx build analytics",
     "seed:module": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=7000 yarn ts-node -r tsconfig-paths/register --project apps/api/tsconfig.app.json ./apps/api/src/seed-module.ts --name",

diff --git a/packages/angular/controls/member-list/member-list.component.stories.ts b/packages/angular/controls/member-list/member-list.component.stories.ts
@@ -131,55 +131,3 @@ Appearance.args = {
     displayDensity: DisplayDensity.compact
   }
 }
-
-export const RadioGroup = Template.bind({})
-RadioGroup.args = {
-  dataSettings: {
-    dataSource: 'Sales',
-    entitySet: 'SalesOrder3s'
-  },
-  dimension: {
-    dimension: 'Department'
-  },
-  options: {
-    radio: true
-  },
-  appearance: {
-    appearance: 'outline',
-  }
-}
-
-export const RadioGroupCosy = Template.bind({})
-RadioGroupCosy.args = {
-  dataSettings: {
-    dataSource: 'Sales',
-    entitySet: 'SalesOrder3s'
-  },
-  dimension: {
-    dimension: 'Department'
-  },
-  options: {
-    radio: true
-  },
-  appearance: {
-    appearance: 'outline',
-    displayDensity: DisplayDensity.cosy
-  }
-}
-export const RadioGroupCompact = Template.bind({})
-RadioGroupCompact.args = {
-  dataSettings: {
-    dataSource: 'Sales',
-    entitySet: 'SalesOrder3s'
-  },
-  dimension: {
-    dimension: 'Department'
-  },
-  options: {
-    radio: true
-  },
-  appearance: {
-    appearance: 'outline',
-    displayDensity: DisplayDensity.compact
-  },
-}
diff --git a/packages/angular/core/style/_mat-button-theme.scss b/packages/angular/core/style/_mat-button-theme.scss
@@ -36,7 +36,7 @@
     }
 
     &.mat-mdc-icon-button {
-      --mdc-icon-button-icon-size: 18px;
+      // --mdc-icon-button-icon-size: 18px;
       display: flex;
       justify-content: center;
       align-items: center;
@@ -69,7 +69,7 @@
     }
 
     &.mat-mdc-icon-button {
-      --mdc-icon-button-icon-size: 16px;
+      // --mdc-icon-button-icon-size: 16px;
       width: 24px;
       height: 24px;
       line-height: 24px;

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metad/ocap-angular",
-  "version": "1.17.0-rc.3",
+  "version": "1.17.0-rc.4",
   "keywords": [
     "metad",
     "ocap",

diff --git a/packages/angular/project.json b/packages/angular/project.json
@@ -40,6 +40,48 @@
         }
       ]
     },
+    "build-lib": {
+      "executor": "nx:run-commands",
+      "outputs": ["{workspaceRoot}/dist/{projectRoot}"],
+      "configurations": {
+        "production": {
+          "commands": [
+            "nx run ocap-angular:build:production",
+            "tailwindcss -c packages/angular/tailwind.config.js -i ./packages/angular/_index.scss -o ./dist/packages/angular/index.css -m"
+          ],
+          "parallel": false
+        },
+        "development": {
+          "commands": [
+            "nx run ocap-angular:build:development",
+            "tailwindcss -c packages/angular/tailwind.config.js -i ./packages/angular/_index.scss -o ./dist/packages/angular/index.css"
+          ],
+          "parallel": false
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "build-prod": {
+      "executor": "nx:run-commands",
+      "outputs": ["{workspaceRoot}/dist/{projectRoot}"],
+      "configurations": {
+        "production": {
+          "commands": [
+            "rm -rf dist/packages/angular",
+            "nx run ocap-angular:build-lib:production"
+          ],
+          "parallel": false
+        },
+        "development": {
+          "commands": [
+            "rm -rf dist/packages/angular",
+            "nx run ocap-angular:build-lib:development"
+          ],
+          "parallel": false
+        }
+      },
+      "defaultConfiguration": "production"
+    },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
@@ -59,7 +101,7 @@
       "options": {
         "port": 6006,
         "configDir": "packages/angular/.storybook",
-        "browserTarget": "angular:build-storybook",
+        "browserTarget": "ocap-angular:build-storybook",
         "compodoc": false
       },
       "configurations": {
@@ -74,7 +116,7 @@
       "options": {
         "outputDir": "dist/storybook/angular",
         "configDir": "packages/angular/.storybook",
-        "browserTarget": "angular:build-storybook",
+        "browserTarget": "ocap-angular:build-storybook",
         "compodoc": false,
         "styles": ["packages/angular/_index.scss", "apps/cloud/src/styles.scss"]
       },
@@ -87,12 +129,12 @@
     "static-storybook": {
       "executor": "@nx/web:file-server",
       "options": {
-        "buildTarget": "angular:build-storybook",
+        "buildTarget": "ocap-angular:build-storybook",
         "staticFilePath": "dist/storybook/angular"
       },
       "configurations": {
         "ci": {
-          "buildTarget": "angular:build-storybook:ci"
+          "buildTarget": "ocap-angular:build-storybook:ci"
         }
       }
     }

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metad/ocap-core",
-  "version": "1.17.0-rc.3",
+  "version": "1.17.0-rc.4",
   "dependencies": {
     "tslib": "^2.3.0"
   },

diff --git a/packages/duckdb/package.json b/packages/duckdb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metad/ocap-duckdb",
-  "version": "1.17.0-rc.3",
+  "version": "1.17.0-rc.4",
   "keywords": [
     "metad",
     "ocap",

diff --git a/packages/echarts/package.json b/packages/echarts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metad/ocap-echarts",
-  "version": "1.17.0-rc.3",
+  "version": "1.17.0-rc.4",
   "keywords": [
     "metad",
     "ocap",

diff --git a/packages/sql/package.json b/packages/sql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metad/ocap-sql",
-  "version": "1.17.0-rc.3",
+  "version": "1.17.0-rc.4",
   "keywords": [
     "metad",
     "ocap",

diff --git a/packages/store/package.json b/packages/store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metad/store",
-  "version": "1.17.0-rc.3",
+  "version": "1.17.0-rc.4",
   "keywords": [
     "metad",
     "ocap",

diff --git a/packages/xmla/package.json b/packages/xmla/package.json
@@ -1,4 +1,4 @@
 {
   "name": "@metad/ocap-xmla",
-  "version": "1.17.0-rc.3"
+  "version": "1.17.0-rc.4"
 }