dlzn-ui 1.23.0 → 1.25.0

package/{eslint-config.ts → eslint-config.mjs}

@@ -1,14 +1,28 @@
+import { existsSync } from 'node:fs'
+import { dirname, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import antfu, { perfectionist as perfectionistConfigFn } from '@antfu/eslint-config'
-import type { Linter } from 'eslint'
 import perfectionist from 'eslint-plugin-perfectionist'
 import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
-import { resolveOne } from './build/utils.ts'
+
+function resolveOne(metaUrl, paths) {
+  const here = dirname(fileURLToPath(metaUrl))
+  const arr = paths.map((path) => resolve(here, path))
+  const result = arr.findIndex((file) => existsSync(file))
+
+  if (result === -1) {
+    throw new Error(`resolveOne: path not found: ${paths.join(', ')}`)
+  }
+
+  return paths[result]
+}
 
 const prettierOptions = await import(
-  resolveOne(import.meta.url, ['./prettier.config.ts', './prettier-config.ts'])
+  resolveOne(import.meta.url, ['./prettier.config.mjs', './prettier-config.mjs'])
 )
 const perfectionistConfig = await perfectionistConfigFn({})
-const eslintConfig: Linter.Config[] = await antfu(
+/** @type {import('eslint').Linter.Config[]} */
+const eslintConfig = await antfu(
   {
     formatters: {
       // 都默认开启了
@@ -195,7 +209,7 @@ const eslintConfig: Linter.Config[] = await antfu(
     },
   },
 )
-  .override(perfectionistConfig[0].name!, {
+  .override(perfectionistConfig[0].name, {
     rules: {
       ...perfectionist.configs['recommended-natural'].rules,
       ...perfectionistConfig[0].rules,

package/package.json

@@ -15,14 +15,14 @@
       "import": "./const/index.mjs",
       "types": "./const/index.d.ts"
     },
-    "./eslint-config": "./eslint-config.ts",
-    "./prettier-config": "./prettier-config.ts",
-    "./stylelint-config": "./stylelint-config.ts",
+    "./eslint-config": "./eslint-config.mjs",
+    "./prettier-config": "./prettier-config.mjs",
+    "./stylelint-config": "./stylelint-config.mjs",
     "./utils": {
       "import": "./utils/index.mjs",
       "types": "./utils/index.d.ts"
     },
-    "./vite-config": "./vite-config.ts"
+    "./vite-config": "./vite-config.mjs"
   },
   "keywords": [],
   "license": "MIT",
@@ -49,7 +49,6 @@
     "stylelint-config-recess-order": "^7.7.0",
     "stylelint-config-recommended-vue": "^2.0.0",
     "stylelint-config-standard": "^40.0.0",
-    "stylelint-define-config": "^17.14.0",
     "stylelint-order": "^8.1.1",
     "stylelint-use-nesting": "^6.0.2",
     "tailwindcss": "^4.3.3",
@@ -64,6 +63,6 @@
     "**/*.css"
   ],
   "type": "module",
-  "version": "1.23.0",
+  "version": "1.25.0",
   "scripts": {}
 }

package/{prettier-config.ts → prettier-config.mjs}

@@ -3,10 +3,23 @@
  * @description: 还有些是 prettier-plugin-tailwindcss 的配置 https://github.com/tailwindlabs/prettier-plugin-tailwindcss
  */
 
-import type { Config } from 'prettier'
-import type { PluginOptions } from 'prettier-plugin-tailwindcss'
-import { resolveOne } from './build/utils.ts'
+import { existsSync } from 'node:fs'
+import { dirname, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
 
+function resolveOne(metaUrl, paths) {
+  const here = dirname(fileURLToPath(metaUrl))
+  const arr = paths.map((path) => resolve(here, path))
+  const result = arr.findIndex((file) => existsSync(file))
+
+  if (result === -1) {
+    throw new Error(`resolveOne: path not found: ${paths.join(', ')}`)
+  }
+
+  return result[result]
+}
+
+/** @type {import('prettier').Config & import('prettier-plugin-tailwindcss').PluginOptions} */
 export default {
   $schema: 'https://json.schemastore.org/prettierrc',
   arrowParens: 'always', // 单参数箭头函数参数周围使用圆括号-eg: (x) => x
@@ -33,4 +46,4 @@ export default {
   trailingComma: 'all',
   useTabs: false, // 使用空格代替tab缩进
   vueIndentScriptAndStyle: false, // 不对vue中的script及style标签缩进
-} satisfies Config & PluginOptions
+}

package/{stylelint-config.ts → stylelint-config.mjs}

@@ -1,9 +1,9 @@
 // [插件集合](https://stylelint.io/awesome-stylelint/)
 // [stylelint 内置规则集](https://stylelint.io/user-guide/rules)
 // 最新的版本去除了很多配置，比如缩进, 抛弃的规则 可在 @stylistic/stylelint-config(https://github.com/stylelint-stylistic/stylelint-config/blob/main/stylelint.config.js) 中找回
-import defineConfig from 'stylelint-define-config'
+/** @type {import('stylelint').Config} */
 
-export default defineConfig({
+export default {
   cache: true,
   extends: [
     '@stylistic/stylelint-config',
@@ -70,4 +70,4 @@ export default defineConfig({
     ],
     'value-keyword-case': ['lower', { ignoreFunctions: ['v-bind'] }],
   },
-})
+}

package/vite-config.mjs

@@ -0,0 +1,52 @@
+import { existsSync } from 'node:fs'
+import { dirname, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import tailwindcss from '@tailwindcss/vite'
+import vue from '@vitejs/plugin-vue'
+import tailwindAutoReference from 'vite-plugin-vue-tailwind-auto-reference'
+
+/**
+ * @typedef {import('vite').ConfigEnv} ConfigEnv
+ * @typedef {typeof import('vite-plugin-vue-tailwind-auto-reference').default} TailwindAutoReference
+ * @typedef {Parameters<TailwindAutoReference>} TailwindAutoReferenceParameters
+ * @typedef {{ tailwindAutoReferenceParameters?: TailwindAutoReferenceParameters }} DlznViteOptions
+ * @typedef {import('vite').UserConfig} UserConfig
+ */
+
+function resolveOne(metaUrl, paths) {
+  const here = dirname(fileURLToPath(metaUrl))
+  const arr = paths.map((path) => resolve(here, path))
+  const result = arr.findIndex((file) => existsSync(file))
+
+  if (result === -1) {
+    throw new Error(`resolveOne: path not found: ${paths.join(', ')}`)
+  }
+
+  return paths[result]
+}
+
+/**
+ * @param {ConfigEnv} _env
+ * @param {DlznViteOptions} options
+ * @returns {UserConfig} Vite config
+ */
+export default (_env, options) => {
+  return {
+    plugins: [
+      vue({
+        // features: {
+        //   optionsAPI: false, // 不能删掉，tdesign 内部使用到了
+        // },
+      }),
+      tailwindAutoReference(
+        options.tailwindAutoReferenceParameters?.[0] ??
+          resolveOne(import.meta.url, [
+            './assets/css/tailwindcss-entry.css',
+            './src/assets/css/tailwindcss-entry.css',
+          ]),
+        options.tailwindAutoReferenceParameters?.[1],
+      ),
+      tailwindcss(),
+    ],
+  }
+}

package/vite-config.ts

@@ -1,31 +0,0 @@
-import type { ConfigEnv, UserConfig } from 'vite'
-import tailwindcss from '@tailwindcss/vite'
-import vue from '@vitejs/plugin-vue'
-import tailwindAutoReference from 'vite-plugin-vue-tailwind-auto-reference'
-import { resolveOne } from './build/utils.ts'
-
-export default (
-  _env: ConfigEnv,
-  options: {
-    tailwindAutoReferenceParameters?: Parameters<typeof tailwindAutoReference>
-  },
-): UserConfig => {
-  return {
-    plugins: [
-      vue({
-        // features: {
-        //   optionsAPI: false, // 不能删掉，tdesign 内部使用到了
-        // },
-      }),
-      tailwindAutoReference(
-        options.tailwindAutoReferenceParameters?.[0] ??
-          resolveOne(import.meta.url, [
-            './assets/css/tailwindcss-entry.css',
-            './src/assets/css/tailwindcss-entry.css',
-          ]),
-        options.tailwindAutoReferenceParameters?.[1],
-      ),
-      tailwindcss(),
-    ],
-  }
-}