Merge branch 'main' into fix/customElements-not-defined

build/package.json

@@ -17,12 +17,12 @@
   "dependencies": {
     "@pnpm/find-workspace-packages": "^6.0.5",
     "@pnpm/logger": "^5.0.0",
-    "@rollup/plugin-commonjs": "^25.0.2",
+    "@rollup/plugin-commonjs": "^24.1.0",
     "@rollup/plugin-node-resolve": "^15.0.2",
     "@vitejs/plugin-vue": "^4.1.0",
     "chalk": "^5.2.0",
     "components-helper": "^2.1.4",
-    "consola": "^3.2.3",
+    "consola": "^2.15.3",
     "esbuild": "^0.17.16",
     "fast-glob": "^3.2.12",
     "fs-extra": "^11.1.1",
@@ -37,8 +37,6 @@
     "@esbuild-kit/cjs-loader": "^2.4.2",
     "@pnpm/types": "^9.0.0",
     "@types/rollup-plugin-css-only": "^3.1.0",
-    "rollup-plugin-postcss": "^4.0.2",
-    "sass": "^1.67.0",
     "unbuild": "^1.2.0",
     "vue": "^3.2.47"
   }

build/src/tasks/full-bundle.ts

@@ -1,16 +1,16 @@
 import path from 'path'
-import { rollup } from 'rollup'
 import { nodeResolve } from '@rollup/plugin-node-resolve'
+import { rollup } from 'rollup'
 import commonjs from '@rollup/plugin-commonjs'
-import esbuild from 'rollup-plugin-esbuild'
 import vue from '@vitejs/plugin-vue'
 import DefineOptions from 'unplugin-vue-define-options/rollup'
+import esbuild from 'rollup-plugin-esbuild'
 import { parallel } from 'gulp'
 import glob from 'fast-glob'
-import postcss from 'rollup-plugin-postcss'
 import { camelCase, upperFirst } from 'lodash-unified'
+import { version } from '../../../packages/puik/version'
+import { PuikAlias } from '../plugins/puik-alias'
 import {
-  themeRoot,
   puikRoot,
   puikOutput,
   localeRoot,
@@ -19,8 +19,6 @@ import {
   writeBundles,
   withTaskName,
 } from '../utils'
-import { version } from '../../../packages/puik/version'
-import { PuikAlias } from '../plugins/puik-alias'
 import { target } from '../build-info'
 
 const banner = `/*! Puik v${version} */\n`
@@ -29,22 +27,15 @@ async function buildFullEntry(minify: boolean) {
   const bundle = await rollup({
     input: path.resolve(puikRoot, 'index.ts'),
     plugins: [
-      nodeResolve({
-        extensions: ['.mjs', '.js', '.json', '.ts', '.scss'],
-      }),
-      commonjs(),
       PuikAlias(),
       vue({
         isProduction: true,
-        customElement: true,
-      }),
-      postcss({
-        config: {
-          path: `${themeRoot}/postcss.config.js`,
-          ctx: {},
-        },
       }),
       DefineOptions(),
+      nodeResolve({
+        extensions: ['.mjs', '.js', '.json', '.ts'],
+      }),
+      commonjs(),
       esbuild({
         exclude: [],
         minify,

build/src/tasks/modules.ts

@@ -1,18 +1,16 @@
 import { rollup } from 'rollup'
+import vue from '@vitejs/plugin-vue'
+import DefineOptions from 'unplugin-vue-define-options/rollup'
 import { nodeResolve } from '@rollup/plugin-node-resolve'
 import commonjs from '@rollup/plugin-commonjs'
 import esbuild from 'rollup-plugin-esbuild'
-import vue from '@vitejs/plugin-vue'
-import DefineOptions from 'unplugin-vue-define-options/rollup'
-import postcss from 'rollup-plugin-postcss'
 import glob from 'fast-glob'
 import {
   puikRoot,
   pkgRoot,
   generateExternal,
   writeBundles,
   excludeFiles,
-  themeRoot,
 } from '../utils'
 import { PuikAlias } from '../plugins/puik-alias'
 import { buildConfigEntries, target } from '../build-info'
@@ -30,22 +28,15 @@ export const buildModules = async () => {
   const bundle = await rollup({
     input,
     plugins: [
-      commonjs(),
-      nodeResolve({
-        extensions: ['.mjs', '.js', '.json', '.ts', '.scss'],
-      }),
       PuikAlias(),
       DefineOptions(),
       vue({
         isProduction: false,
-        customElement: true,
       }),
-      postcss({
-        config: {
-          path: `${themeRoot}/postcss.config.js`,
-          ctx: {},
-        },
+      nodeResolve({
+        extensions: ['.mjs', '.js', '.json', '.ts'],
       }),
+      commonjs(),
       esbuild({
         sourceMap: true,
         target,

package.json

@@ -49,8 +49,8 @@
     "vue": "^3.2.0"
   },
   "dependencies": {
-    "@headlessui/vue": "^1.7.16",
-    "@popperjs/core": "^2.11.8",
+    "@headlessui/vue": "^1.7.13",
+    "@popperjs/core": "^2.11.7",
     "@puik/components": "workspace:*",
     "@puik/hooks": "workspace:*",
     "@puik/locale": "workspace:*",
@@ -63,53 +63,53 @@
     "lodash-unified": "^1.0.3"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.7.1",
-    "@commitlint/config-conventional": "^17.7.0",
-    "@esbuild-kit/cjs-loader": "^2.4.4",
-    "@faker-js/faker": "^8.1.0",
-    "@pnpm/find-workspace-packages": "^6.0.9",
+    "@commitlint/cli": "^17.5.1",
+    "@commitlint/config-conventional": "^17.4.4",
+    "@esbuild-kit/cjs-loader": "^2.4.2",
+    "@faker-js/faker": "^8.0.2",
+    "@pnpm/find-workspace-packages": "^6.0.5",
     "@pnpm/logger": "5.0.0",
-    "@pnpm/types": "^9.2.0",
-    "@puik/build": "workspace:^",
-    "@types/fs-extra": "^11.0.2",
-    "@types/gulp": "^4.0.14",
-    "@types/lodash": "^4.14.198",
-    "@types/lodash-es": "^4.17.9",
-    "@types/node": "^18.17.18",
-    "@types/sass": "^1.45.0",
+    "@pnpm/types": "^9.0.0",
+    "@puik/build": "workspace:^0.0.1",
+    "@types/fs-extra": "^11.0.1",
+    "@types/gulp": "^4.0.10",
+    "@types/lodash": "^4.14.192",
+    "@types/lodash-es": "^4.17.7",
+    "@types/node": "^18.15.11",
+    "@types/sass": "^1.43.1",
     "@typescript-eslint/eslint-plugin": "5.58.0",
     "@typescript-eslint/parser": "5.58.0",
-    "@vitejs/plugin-vue": "^4.3.4",
+    "@vitejs/plugin-vue": "^4.1.0",
     "@vitest/coverage-v8": "^0.32.4",
-    "@vue/test-utils": "^2.4.1",
+    "@vue/test-utils": "^2.3.2",
     "@vue/tsconfig": "^0.1.3",
-    "chalk": "^5.3.0",
-    "chromatic": "^6.24.1",
-    "consola": "^3.2.3",
+    "chalk": "^5.2.0",
+    "chromatic": "^6.17.3",
+    "consola": "^2.15.3",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^8.49.0",
+    "eslint": "^8.38.0",
     "eslint-config-prettier": "8.8.0",
-    "eslint-define-config": "^1.23.0",
+    "eslint-define-config": "^1.17.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-vue": "9.10.0",
-    "fast-glob": "^3.3.1",
+    "fast-glob": "^3.2.12",
     "husky": "^8.0.3",
     "hygen": "^6.2.11",
-    "jsdom": "^21.1.2",
-    "lint-staged": "^13.3.0",
-    "prettier": "^2.8.8",
+    "jsdom": "^21.1.1",
+    "lint-staged": "^13.2.1",
+    "prettier": "^2.8.7",
     "pretty-quick": "^3.1.3",
-    "rimraf": "^5.0.1",
-    "sass": "^1.68.0",
+    "rimraf": "^5.0.0",
+    "sass": "^1.62.0",
     "ts-morph": "^14.0.0",
-    "tsx": "^3.12.10",
+    "tsx": "^3.12.6",
     "type-fest": "^2.19.0",
-    "typescript": "^5.2.2",
-    "unplugin-vue-define-options": "^1.3.18",
+    "typescript": "^5.0.4",
+    "unplugin-vue-define-options": "^1.3.3",
     "vitest": "^0.32.4",
-    "vue": "^3.3.4",
-    "vue-router": "^4.2.5",
-    "vue-tsc": "^1.8.13"
+    "vue": "^3.2.47",
+    "vue-router": "^4.1.6",
+    "vue-tsc": "^1.2.0"
   }
 }

packages/components/icon/src/icon.vue

@@ -26,8 +26,3 @@ const style = {
   color: props.color,
 }
 </script>
-
-<style lang="scss">
-@import '../../../theme/src/base';
-@import '../../../theme/src/icon';
-</style>

packages/components/tooltip/index.ts

@@ -1,4 +1,3 @@
-import { defineCustomElement } from 'vue'
 import { withInstall } from '@puik/utils'
 
 import Tooltip from './src/tooltip.vue'

packages/components/tooltip/src/tooltip.vue

@@ -87,8 +87,3 @@ onMounted(() => {
   }
 })
 </script>
-
-<style lang="scss">
-@use '../../../theme/src/base';
-@use '../../../theme/src/tooltip.scss';
-</style>

packages/puik/component.ts

@@ -35,7 +35,7 @@ import {
   PuikMenuItemTitle,
 } from '@puik/components/menu'
 import { PuikProgressBar } from '@puik/components/progress-bar'
-import { PuikIcon, PuikIconCe } from '@puik/components/icon'
+import { PuikIcon } from '@puik/components/icon'
 import { PuikLink } from '@puik/components/link'
 import { PuikCard } from '@puik/components/card'
 import { PuikSnackbar } from '@puik/components/snackbar'
@@ -44,7 +44,7 @@ import { PuikCheckbox } from '@puik/components/checkbox'
 import { PuikRadio } from '@puik/components/radio'
 import { PuikSelect, PuikOption } from '@puik/components/select'
 import { PuikAlert } from '@puik/components/alert'
-import { PuikTooltip, PuikTooltipCe } from '@puik/components/tooltip'
+import { PuikTooltip } from '@puik/components/tooltip'
 import { PuikSwitch } from '@puik/components/switch'
 import { PuikButton, PuikButtonCe } from '@puik/components/button'
 import { PuikInput, PuikInputCe } from '@puik/components/input'
@@ -82,7 +82,6 @@ export default [
   PuikMenuItemTitle,
   PuikProgressBar,
   PuikIcon,
-  PuikIconCe,
   PuikLink,
   PuikCard,
   PuikSnackbar,
@@ -95,7 +94,6 @@ export default [
   PuikSelect,
   PuikAlert,
   PuikTooltip,
-  PuikTooltipCe,
   PuikSwitch,
   PuikButton,
   PuikButtonCe,

packages/theme/src/chip.scss

@@ -10,7 +10,7 @@
   &--small {
     @apply px-1 py-0;
     .puik-chip__close {
-      @apply p-[1px];
+      @apply p-1 py-[2px];
     }
   }
   &--disabled {
@@ -20,7 +20,7 @@
     }
   }
   &__close {
-    @apply p-[3px] ml-auto cursor-pointer rounded-[50%] hover:bg-primary-400;
+    @apply p-1 py-[2px] ml-auto cursor-pointer rounded-[50%] hover:bg-primary-400;
   }
   &__icon {
     @apply mr-1;

playground/package.json

@@ -12,7 +12,6 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.1.0",
-    "sass": "^1.67.0",
     "typescript": "^5.0.4",
     "vite": "^4.2.1",
     "vue-tsc": "^1.2.0"

playground/vite.config.ts

@@ -29,10 +29,6 @@ export default defineConfig({
         find: /^@puik\/(.*)$/,
         replacement: `${path.resolve('../packages')}/$1`,
       },
-      {
-        find: /^~(.*)$/,
-        replacement: '$1',
-      },
     ],
   },
 })