diff --git a/.changeset/config.json b/.changeset/config.json index 83c584af40b..78276722d50 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -12,7 +12,6 @@ "iota-wallet", "iota-explorer", "wallet-dashboard", - "@iota/apps-ui-kit", "apps-backend", "@iota/core", "@iota/apps-ui-kit", diff --git a/.github/workflows/_turborepo.yml b/.github/workflows/_turborepo.yml index a2a02a18ef9..7a28a616b65 100644 --- a/.github/workflows/_turborepo.yml +++ b/.github/workflows/_turborepo.yml @@ -52,12 +52,6 @@ jobs: - name: (debug-before) Check SDK dist folder continue-on-error: true run: tree ./sdk/typescript/dist - - name: (debug) Lint - continue-on-error: true - run: pnpm turbo lint - - name: (debug-after) Check SDK dist folder - continue-on-error: true - run: tree ./sdk/typescript/dist - name: Lint run: pnpm turbo lint - name: Install wasm-pack for mbf package diff --git a/apps/explorer/tailwind.config.ts b/apps/explorer/tailwind.config.ts index 224711dc95e..5532fa8c156 100644 --- a/apps/explorer/tailwind.config.ts +++ b/apps/explorer/tailwind.config.ts @@ -5,11 +5,12 @@ import preset from '@iota/core/tailwind.config'; import colors from 'tailwindcss/colors'; import { type Config } from 'tailwindcss'; -import { uiKitResponsivePreset } from '@iota/apps-ui-kit'; +// Note: exception for the tailwind preset import +import uiKitResponsivePreset from '../../apps/ui-kit/src/lib/tailwind/responsive.preset'; export default { presets: [preset, uiKitResponsivePreset], - content: ['./src/**/*.{js,jsx,ts,tsx}', './node_modules/@iota/apps-ui-kit/dist/**/*.js'], + content: ['./src/**/*.{js,jsx,ts,tsx}', './../ui-kit/src/lib/**/*.{js,jsx,ts,tsx}'], theme: { // This COLOR are duplicated from @iota/core tailwind.config.ts!!! // They are repeated here cause uiKitResponsivePreset overwrites the colors, and they are still used throughout Explorer diff --git a/apps/explorer/tsconfig.json b/apps/explorer/tsconfig.json index bea45c24203..623178a72a9 100644 --- a/apps/explorer/tsconfig.json +++ b/apps/explorer/tsconfig.json @@ -24,6 +24,7 @@ "references": [ { "path": "../../sdk/typescript/" }, { "path": "../../sdk/kiosk/" }, - { "path": "../../sdk/dapp-kit/" } + { "path": "../../sdk/dapp-kit/" }, + { "path": "../ui-kit" } ] } diff --git a/apps/ui-kit/tsconfig.base.json b/apps/ui-kit/tsconfig.base.json index 76fac5f8526..187384cd91e 100644 --- a/apps/ui-kit/tsconfig.base.json +++ b/apps/ui-kit/tsconfig.base.json @@ -10,10 +10,14 @@ "noFallthroughCasesInSwitch": true, "moduleResolution": "node", "resolveJsonModule": true, - "noEmit": true, "isolatedModules": true, "sourceMap": true, "jsx": "react-jsx", + "composite": true, + "declaration": true, + "declarationMap": true, + "outDir": "dist", + "emitDeclarationOnly": true, "paths": { "@/*": ["./src/*"], "@/components": ["./src/lib/components"], diff --git a/apps/wallet/configs/ts/tsconfig.common.json b/apps/wallet/configs/ts/tsconfig.common.json index 1206d3c9d36..5cd0e3c4128 100644 --- a/apps/wallet/configs/ts/tsconfig.common.json +++ b/apps/wallet/configs/ts/tsconfig.common.json @@ -54,5 +54,6 @@ } }, "include": ["../../src", "../../tests"], - "exclude": ["../../build", "../../node_modules"] + "exclude": ["../../build", "../../node_modules"], + "references": [{ "path": "../ui-kit" }] } diff --git a/apps/wallet/tailwind.config.ts b/apps/wallet/tailwind.config.ts index 19ef6350361..f1935832df5 100644 --- a/apps/wallet/tailwind.config.ts +++ b/apps/wallet/tailwind.config.ts @@ -5,11 +5,12 @@ import preset from '@iota/core/tailwind.config'; import { type Config } from 'tailwindcss'; import animatePlugin from 'tailwindcss-animate'; -import { uiKitStaticPreset } from '@iota/apps-ui-kit'; +// Note: exception for the tailwind preset import +import uiKitStaticPreset from '../../apps/ui-kit/src/lib/tailwind/static.preset'; export default { presets: [preset, uiKitStaticPreset], - content: ['./src/**/*.{js,jsx,ts,tsx}', './node_modules/@iota/apps-ui-kit/dist/**/*.js'], + content: ['./src/**/*.{js,jsx,ts,tsx}', './../ui-kit/src/lib/**/*.{js,jsx,ts,tsx}'], theme: { extend: { colors: { diff --git a/turbo.json b/turbo.json index abc4d0b6757..f73103f2c7e 100644 --- a/turbo.json +++ b/turbo.json @@ -2,9 +2,7 @@ "ui": "tui", "$schema": "https://turbo.build/schema.json", "tasks": { - "lint": { - "dependsOn": ["^build"] - }, + "lint": { }, "lint:fix": { "dependsOn": ["^build"] },