@pubinfo/config 2.0.0-beta.26 → 2.0.0-beta.27

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 export { p as eslint } from './shared/config.CSqBb4YU.mjs';
 export { default as stylelint } from './stylelint.mjs';
-export { colorScheme, cssVarKey, customColorKey, defineTheme, globalTheme, mergeTheme, themeOptions, themes } from './themes/index.mjs';
+export { colorScheme, cssVarKey, customColorKey, defineTheme, getThemes, globalTheme, themeOptions } from './themes/index.mjs';
 export { default as presetPubinfo } from './unocss/index.mjs';
 import '@antfu/eslint-config';
 import 'unocss';

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { p as eslint } from './shared/config.CSqBb4YU.js';
 export { default as stylelint } from './stylelint.js';
-export { colorScheme, cssVarKey, customColorKey, defineTheme, globalTheme, mergeTheme, themeOptions, themes } from './themes/index.js';
+export { colorScheme, cssVarKey, customColorKey, defineTheme, getThemes, globalTheme, themeOptions } from './themes/index.js';
 export { default as presetPubinfo } from './unocss/index.js';
 import '@antfu/eslint-config';
 import 'unocss';

package/dist/index.mjs

@@ -1,6 +1,6 @@
 export { p as eslint } from './shared/config.D4FYsBnQ.mjs';
 export { default as stylelint } from './stylelint.mjs';
-export { customColorKey, defineTheme, mergeTheme, themes } from './themes/index.mjs';
+export { customColorKey, defineTheme, getThemes } from './themes/index.mjs';
 export { default as presetPubinfo } from './unocss/index.mjs';
 import '@antfu/eslint-config';
 import 'unocss';

package/dist/themes/index.d.mts

@@ -21,9 +21,7 @@ declare const customColorKey: readonly ["--ui-primary", "--ui-text"];
 interface globalTheme {
     [key: string]: colorScheme;
 }
-declare function mergeTheme(themes: globalTheme[]): globalTheme;
+declare function getThemes(): globalTheme;
 declare function defineTheme(theme: themeOptions): globalTheme;
 
-declare const themes: globalTheme;
-
-export { type colorScheme, type cssVarKey, customColorKey, defineTheme, type globalTheme, mergeTheme, type themeOptions, themes };
+export { type colorScheme, type cssVarKey, customColorKey, defineTheme, getThemes, type globalTheme, type themeOptions };

package/dist/themes/index.d.ts

@@ -21,9 +21,7 @@ declare const customColorKey: readonly ["--ui-primary", "--ui-text"];
 interface globalTheme {
     [key: string]: colorScheme;
 }
-declare function mergeTheme(themes: globalTheme[]): globalTheme;
+declare function getThemes(): globalTheme;
 declare function defineTheme(theme: themeOptions): globalTheme;
 
-declare const themes: globalTheme;
-
-export { type colorScheme, type cssVarKey, customColorKey, defineTheme, type globalTheme, mergeTheme, type themeOptions, themes };
+export { type colorScheme, type cssVarKey, customColorKey, defineTheme, getThemes, type globalTheme, type themeOptions };

package/dist/themes/index.mjs

@@ -36,9 +36,9 @@ function parseHexColor(str) {
 }
 
 const customColorKey = ["--ui-primary", "--ui-text"];
-function mergeTheme(themes) {
-  const themeColor = Object.assign({}, ...themes);
-  return themeColor;
+let themeColorMap = {};
+function getThemes() {
+  return themeColorMap;
 }
 function normalizeColor(colors) {
   for (const key of customColorKey) {
@@ -51,10 +51,11 @@ function defineTheme(theme) {
   const { name, colors } = theme;
   const colorScheme = /* @__PURE__ */ Object.create(null);
   colorScheme[name] = normalizeColor(colors);
+  themeColorMap = Object.assign(themeColorMap, colorScheme);
   return colorScheme;
 }
 
-const dark = defineTheme({
+defineTheme({
   name: "dark",
   colors: {
     "label": "\u58A8\u591C\u5E7D",
@@ -100,7 +101,7 @@ const dark = defineTheme({
   }
 });
 
-const dracula = defineTheme({
+defineTheme({
   name: "dracula",
   colors: {
     "label": "\u6697\u84DD\u79D8",
@@ -146,7 +147,7 @@ const dracula = defineTheme({
   }
 });
 
-const luxury = defineTheme({
+defineTheme({
   name: "luxury",
   colors: {
     "label": "\u91D1\u534E\u4E3D",
@@ -192,7 +193,7 @@ const luxury = defineTheme({
   }
 });
 
-const night = defineTheme({
+defineTheme({
   name: "night",
   colors: {
     "label": "\u591C\u84DD\u68A6",
@@ -238,7 +239,7 @@ const night = defineTheme({
   }
 });
 
-const stone = defineTheme({
+defineTheme({
   name: "stone",
   colors: {
     "label": "\u77F3\u9752\u6DA6",
@@ -284,7 +285,7 @@ const stone = defineTheme({
   }
 });
 
-const synthwave = defineTheme({
+defineTheme({
   name: "synthwave",
   colors: {
     "label": "\u7D2B\u7535\u6D41",
@@ -330,7 +331,7 @@ const synthwave = defineTheme({
   }
 });
 
-const barbie = defineTheme({
+defineTheme({
   name: "barbie",
   colors: {
     "label": "\u68A6\u9732\u7C89",
@@ -376,7 +377,7 @@ const barbie = defineTheme({
   }
 });
 
-const classic = defineTheme({
+defineTheme({
   name: "classic",
   colors: {
     "label": "\u84DD\u53E4\u96C5",
@@ -422,7 +423,7 @@ const classic = defineTheme({
   }
 });
 
-const cyberpunk = defineTheme({
+defineTheme({
   name: "cyberpunk",
   colors: {
     "label": "\u9EC4\u672A\u6765",
@@ -468,7 +469,7 @@ const cyberpunk = defineTheme({
   }
 });
 
-const light = defineTheme({
+defineTheme({
   name: "light",
   colors: {
     "label": "\u5E7D\u5F71\u9ED1",
@@ -514,7 +515,7 @@ const light = defineTheme({
   }
 });
 
-const naive = defineTheme({
+defineTheme({
   name: "naive",
   colors: {
     "label": "\u9752\u5B87\u53E4",
@@ -560,7 +561,7 @@ const naive = defineTheme({
   }
 });
 
-const winter = defineTheme({
+defineTheme({
   name: "winter",
   colors: {
     "label": "\u51B0\u96EA\u84DD",
@@ -606,21 +607,4 @@ const winter = defineTheme({
   }
 });
 
-const themes = mergeTheme([
-  // --亮色主题--
-  light,
-  classic,
-  naive,
-  barbie,
-  winter,
-  cyberpunk,
-  // --暗色主题--
-  dark,
-  dracula,
-  night,
-  luxury,
-  synthwave,
-  stone
-]);
-
-export { customColorKey, defineTheme, mergeTheme, themes };
+export { customColorKey, defineTheme, getThemes };

package/dist/unocss/index.d.mts

@@ -1,5 +1,8 @@
 import * as unocss from 'unocss';
+import { globalTheme } from '../themes/index.mjs';
 
-declare const _default: unocss.PresetFactory<object, undefined>;
+declare const _default: unocss.PresetFactory<object, {
+    themes?: globalTheme[];
+}>;
 
 export { _default as default };

package/dist/unocss/index.d.ts

@@ -1,5 +1,8 @@
 import * as unocss from 'unocss';
+import { globalTheme } from '../themes/index.js';
 
-declare const _default: unocss.PresetFactory<object, undefined>;
+declare const _default: unocss.PresetFactory<object, {
+    themes?: globalTheme[];
+}>;
 
 export { _default as default };

package/dist/unocss/index.mjs

@@ -1,6 +1,6 @@
 import { definePreset as definePreset$1, transformerDirectives, presetUno, presetAttributify, presetTypography, presetIcons } from 'unocss';
 import { definePreset, entriesToCss, toArray } from '@unocss/core';
-import { themes } from '../themes/index.mjs';
+import { getThemes } from '../themes/index.mjs';
 
 const suffix = [["", " *", "::before", "::after"], ["::backdrop"]];
 function createCssVar(key, themeName) {
@@ -19,10 +19,15 @@ function createCssVar(key, themeName) {
   };
   return map[key](themeName);
 }
-function normalizePreflights() {
+function mergeTheme(themes) {
+  const themeColor = Object.assign({}, ...themes);
+  return themeColor;
+}
+function normalizePreflights(_themes = []) {
   return {
     getCSS: () => {
       const injectionCss = [];
+      const themes = Object.assign(getThemes(), mergeTheme(_themes));
       Object.keys(themes).forEach((key) => {
         delete themes[key].label;
         const css = entriesToCss(Object.entries(themes[key]));
@@ -36,20 +41,20 @@ function normalizePreflights() {
     }
   };
 }
-const presetThemes = definePreset(() => {
+const presetThemes = definePreset((options) => {
   return {
     name: "@wsys/preset-themes",
     preflights: [
-      normalizePreflights()
+      normalizePreflights(options?.themes)
     ]
   };
 });
 
-const index = definePreset$1(() => {
+const index = definePreset$1((options) => {
   return {
     name: "preset-pubinfo",
     presets: [
-      presetThemes(),
+      presetThemes({ themes: options?.themes }),
       presetUno(),
       presetAttributify(),
       presetTypography(),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/config",
   "type": "module",
-  "version": "2.0.0-beta.26",
+  "version": "2.0.0-beta.27",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -28,7 +28,8 @@
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "src"
   ],
   "peerDependencies": {
     "eslint": "^9.21.0",

package/src/eslint/config/ignores.ts

@@ -0,0 +1,10 @@
+import type { TypedFlatConfigItem } from '@antfu/eslint-config';
+import { GLOB_EXCLUDE } from '../globs';
+
+export async function ignores(): Promise<TypedFlatConfigItem[]> {
+  return [
+    {
+      ignores: GLOB_EXCLUDE,
+    },
+  ];
+}

package/src/eslint/config/stylistic.ts

@@ -0,0 +1,21 @@
+import type { TypedFlatConfigItem } from '@antfu/eslint-config';
+
+export async function stylistic(): Promise<TypedFlatConfigItem[]> {
+  return [
+    {
+      rules: {
+        'eslint-comments/no-unlimited-disable': 'off',
+        'curly': ['error', 'all'],
+        'antfu/consistent-list-newline': 'off',
+        'regexp/no-unused-capturing-group': 'off',
+        'unused-imports/no-unused-vars': 'off',
+        'unicorn/consistent-function-scoping': 'off',
+      },
+    },
+    {
+      rules: {
+        'style/semi': ['error', 'always'],
+      },
+    },
+  ];
+}

package/src/eslint/config/vue.ts

@@ -0,0 +1,54 @@
+import type { TypedFlatConfigItem } from '@antfu/eslint-config';
+
+export async function vue(): Promise<TypedFlatConfigItem[]> {
+  return [
+    {
+      files: [
+        '**/*.vue',
+      ],
+      rules: {
+        'vue/block-order': ['error', {
+          order: [
+            'route',
+            'i18n',
+            'script',
+            'template',
+            'style',
+          ],
+        }],
+        'vue/component-api-style': ['error',
+          ['script-setup', 'composition'],
+        ],
+        'vue/match-component-import-name': ['error'],
+        'vue/new-line-between-multi-line-property': ['error'],
+        'vue/no-empty-component-block': ['error'],
+        'vue/no-potential-component-option-typo': ['error', {
+          presets: ['all'],
+        }],
+        'vue/prefer-define-options': ['error'],
+        'vue/valid-define-options': ['error'],
+        'vue/require-macro-variable-name': ['error', {
+          defineProps: 'props',
+          defineEmits: 'emit',
+          defineSlots: 'slots',
+          useSlots: 'slots',
+          useAttrs: 'attrs',
+        }],
+        'vue/no-unused-emit-declarations': ['error'],
+        'vue/attribute-hyphenation': [
+          'warn',
+          'always',
+          {},
+        ],
+      },
+    },
+    {
+      files: [
+        '**/views/**/*.vue',
+      ],
+      rules: {
+        'vue/no-multiple-template-root': ['error'],
+      },
+    },
+  ];
+}

package/src/eslint/factory.ts

@@ -0,0 +1,20 @@
+import type { TypedFlatConfigItem } from '@antfu/eslint-config';
+
+import antfu from '@antfu/eslint-config';
+import { ignores } from './config/ignores';
+import { stylistic } from './config/stylistic';
+import { vue } from './config/vue';
+
+export async function pubinfo(
+  ...userConfigs: Parameters<typeof antfu>[1][]
+): Promise<TypedFlatConfigItem[]> {
+  return antfu(
+    {
+      unocss: false,
+    },
+    vue(),
+    stylistic(),
+    ignores(),
+    ...userConfigs,
+  );
+}

package/src/eslint/globs.ts

@@ -0,0 +1,86 @@
+export const GLOB_SRC_EXT = '?([cm])[jt]s?(x)';
+export const GLOB_SRC = '**/*.?([cm])[jt]s?(x)';
+
+export const GLOB_JS = '**/*.?([cm])js';
+export const GLOB_JSX = '**/*.?([cm])jsx';
+
+export const GLOB_TS = '**/*.?([cm])ts';
+export const GLOB_TSX = '**/*.?([cm])tsx';
+
+export const GLOB_STYLE = '**/*.{c,le,sc}ss';
+export const GLOB_CSS = '**/*.css';
+export const GLOB_POSTCSS = '**/*.{p,post}css';
+export const GLOB_LESS = '**/*.less';
+export const GLOB_SCSS = '**/*.scss';
+
+export const GLOB_JSON = '**/*.json';
+export const GLOB_JSON5 = '**/*.json5';
+export const GLOB_JSONC = '**/*.jsonc';
+
+export const GLOB_MARKDOWN = '**/*.md';
+export const GLOB_MARKDOWN_IN_MARKDOWN = '**/*.md/*.md';
+export const GLOB_SVELTE = '**/*.svelte';
+export const GLOB_VUE = '**/*.vue';
+export const GLOB_YAML = '**/*.y?(a)ml';
+export const GLOB_TOML = '**/*.toml';
+export const GLOB_HTML = '**/*.htm?(l)';
+
+export const GLOB_MARKDOWN_CODE = `${GLOB_MARKDOWN}/${GLOB_SRC}`;
+
+export const GLOB_TESTS = [
+  `**/__tests__/**/*.${GLOB_SRC_EXT}`,
+  `**/*.spec.${GLOB_SRC_EXT}`,
+  `**/*.test.${GLOB_SRC_EXT}`,
+  `**/*.bench.${GLOB_SRC_EXT}`,
+  `**/*.benchmark.${GLOB_SRC_EXT}`,
+];
+
+export const GLOB_ALL_SRC = [
+  GLOB_SRC,
+  GLOB_STYLE,
+  GLOB_JSON,
+  GLOB_JSON5,
+  GLOB_MARKDOWN,
+  GLOB_SVELTE,
+  GLOB_VUE,
+  GLOB_YAML,
+  GLOB_HTML,
+];
+
+export const GLOB_EXCLUDE = [
+  '**/node_modules',
+  '**/dist',
+  '**/package-lock.json',
+  '**/yarn.lock',
+  '**/pnpm-lock.yaml',
+  '**/bun.lockb',
+
+  '**/output',
+  '**/coverage',
+  '**/temp',
+  '**/.temp',
+  '**/tmp',
+  '**/.tmp',
+  '**/.history',
+  '**/.vitepress/cache',
+  '**/.nuxt',
+  '**/.next',
+  '**/.vercel',
+  '**/.changeset',
+  '**/.idea',
+  '**/.cache',
+  '**/.output',
+  '**/.vite-inspect',
+  '**/es',
+  '**/lib',
+
+  '**/CHANGELOG*.md',
+  '**/*.min.*',
+  '**/LICENSE*',
+  '**/__snapshots__',
+  '**/auto-import?(s).d.ts',
+  '**/components.d.ts',
+  '**/*.cjs',
+  '**/*.mjs',
+  '**/assets/**/*.json',
+];

package/src/eslint/index.ts

@@ -0,0 +1,3 @@
+import { pubinfo } from './factory';
+
+export default pubinfo;

package/src/index.ts

@@ -0,0 +1,4 @@
+export { default as eslint } from './eslint';
+export { default as stylelint } from './stylelint';
+export * from './themes';
+export { default as presetPubinfo } from './unocss';

package/src/stylelint.ts

@@ -0,0 +1,135 @@
+export default {
+  extends: [
+    'stylelint-config-recess-order',
+  ],
+  plugins: [
+    'stylelint-scss',
+    '@stylistic/stylelint-plugin',
+  ],
+  overrides: [
+    {
+      files: ['**/*.(css|html|vue)'],
+      customSyntax: 'postcss-html',
+    },
+    {
+      files: ['*.less', '**/*.less'],
+      customSyntax: 'postcss-less',
+      extends: ['stylelint-config-standard-less', 'stylelint-config-standard-vue'],
+    },
+    {
+      files: ['*.scss', '**/*.scss'],
+      customSyntax: 'postcss-scss',
+      extends: ['stylelint-config-standard-scss', 'stylelint-config-standard-vue/scss'],
+      rule: {
+        'scss/double-slash-comment-empty-line-before': null,
+        'scss/no-global-function-names': null,
+      },
+    },
+  ],
+  rules: {
+    'at-rule-no-unknown': null,
+    'no-descending-specificity': null,
+    'property-no-unknown': null,
+    'font-family-no-missing-generic-family-keyword': null,
+    'selector-class-pattern': null,
+    'function-no-unknown': [
+      true,
+      {
+        ignoreFunctions: [
+          'v-bind',
+          'map-get',
+          'lighten',
+          'darken',
+        ],
+      },
+    ],
+    'selector-pseudo-element-no-unknown': [
+      true,
+      {
+        ignorePseudoElements: [
+          '/^view-transition/',
+        ],
+      },
+    ],
+    // 提取自 https://github.com/elirasza/stylelint-stylistic/blob/main/config/index.js
+    '@stylistic/at-rule-name-case': 'lower',
+    '@stylistic/at-rule-name-space-after': 'always-single-line',
+    '@stylistic/at-rule-semicolon-newline-after': 'always',
+    '@stylistic/block-closing-brace-empty-line-before': 'never',
+    '@stylistic/block-closing-brace-newline-before': 'always-multi-line',
+    '@stylistic/block-closing-brace-space-before': 'always-single-line',
+    '@stylistic/block-opening-brace-newline-after': 'always-multi-line',
+    '@stylistic/block-opening-brace-space-after': 'always-single-line',
+    '@stylistic/block-opening-brace-space-before': 'always',
+    '@stylistic/color-hex-case': 'lower',
+    '@stylistic/declaration-bang-space-after': 'never',
+    '@stylistic/declaration-bang-space-before': 'always',
+    '@stylistic/declaration-block-semicolon-newline-after': 'always-multi-line',
+    '@stylistic/declaration-block-semicolon-space-after': 'always-single-line',
+    '@stylistic/declaration-block-semicolon-space-before': 'never',
+    '@stylistic/declaration-block-trailing-semicolon': 'always',
+    '@stylistic/declaration-colon-newline-after': 'always-multi-line',
+    '@stylistic/declaration-colon-space-after': 'always-single-line',
+    '@stylistic/declaration-colon-space-before': 'never',
+    '@stylistic/function-comma-newline-after': 'always-multi-line',
+    '@stylistic/function-comma-space-after': 'always-single-line',
+    '@stylistic/function-comma-space-before': 'never',
+    '@stylistic/function-max-empty-lines': 0,
+    '@stylistic/function-parentheses-newline-inside': 'always-multi-line',
+    '@stylistic/function-parentheses-space-inside': 'never-single-line',
+    '@stylistic/function-whitespace-after': 'always',
+    '@stylistic/indentation': 2,
+    '@stylistic/max-empty-lines': 1,
+    '@stylistic/media-feature-colon-space-after': 'always',
+    '@stylistic/media-feature-colon-space-before': 'never',
+    '@stylistic/media-feature-name-case': 'lower',
+    '@stylistic/media-feature-parentheses-space-inside': 'never',
+    '@stylistic/media-feature-range-operator-space-after': 'always',
+    '@stylistic/media-feature-range-operator-space-before': 'always',
+    '@stylistic/media-query-list-comma-newline-after': 'always-multi-line',
+    '@stylistic/media-query-list-comma-space-after': 'always-single-line',
+    '@stylistic/media-query-list-comma-space-before': 'never',
+    '@stylistic/no-empty-first-line': true,
+    '@stylistic/no-eol-whitespace': true,
+    '@stylistic/no-extra-semicolons': true,
+    '@stylistic/no-missing-end-of-source-newline': true,
+    '@stylistic/number-leading-zero': 'always',
+    '@stylistic/number-no-trailing-zeros': true,
+    '@stylistic/property-case': 'lower',
+    '@stylistic/selector-attribute-brackets-space-inside': 'never',
+    '@stylistic/selector-attribute-operator-space-after': 'never',
+    '@stylistic/selector-attribute-operator-space-before': 'never',
+    '@stylistic/selector-combinator-space-after': 'always',
+    '@stylistic/selector-combinator-space-before': 'always',
+    '@stylistic/selector-descendant-combinator-no-non-space': true,
+    '@stylistic/selector-list-comma-newline-after': 'always',
+    '@stylistic/selector-list-comma-space-before': 'never',
+    '@stylistic/selector-max-empty-lines': 0,
+    '@stylistic/selector-pseudo-class-case': 'lower',
+    '@stylistic/selector-pseudo-class-parentheses-space-inside': 'never',
+    '@stylistic/selector-pseudo-element-case': 'lower',
+    '@stylistic/string-quotes': 'double',
+    '@stylistic/unit-case': 'lower',
+    '@stylistic/value-list-comma-newline-after': 'always-multi-line',
+    '@stylistic/value-list-comma-space-after': 'always-single-line',
+    '@stylistic/value-list-comma-space-before': 'never',
+    '@stylistic/value-list-max-empty-lines': 0,
+    // 根据需要覆盖部分规则
+    '@stylistic/max-line-length': null,
+    '@stylistic/block-closing-brace-newline-after': [
+      'always',
+      {
+        ignoreAtRules: ['if', 'else'],
+      },
+    ],
+  },
+  allowEmptyInput: true,
+  ignoreFiles: [
+    '**/node_modules/**/*',
+    '**/dist*/**/*',
+    '**/src/assets/fonts/**/*',
+    '**/*.cjs',
+    '**/*.ejs',
+    '**/.pubinfo/**/*',
+  ],
+};

package/src/themes/index.ts

@@ -0,0 +1,3 @@
+import './theme';
+
+export * from './utils';