@pubinfo/config 2.0.0-rc.2 → 2.0.0-rc.4

package/dist/eslint/index.js

@@ -1,3 +1,3 @@
-import { eslint_default } from "../eslint-B0bQR0lJ.js";
+import { eslint_default } from "../eslint-BHbhxuPS.js";
 
 export { eslint_default as default };

package/dist/{eslint-B0bQR0lJ.js → eslint-BHbhxuPS.js}

@@ -75,7 +75,6 @@ async function vue() {
 		rules: {
 			"vue/block-order": ["error", { order: [
 				"route",
-				"i18n",
 				"script",
 				"template",
 				"style"

package/dist/{index-DFGyu9wF.d.ts → index-jFh6rAwb.d.ts}

@@ -4,6 +4,7 @@ import * as unocss0 from "unocss";
 //#region src/unocss/index.d.ts
 declare const _default: unocss0.PresetFactory<object, {
   themes?: globalTheme[];
+  type?: "app" | "module";
 }>;
 //#endregion
 export { _default };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { pubinfo } from "./index-BlfMIrXI.js";
 import { _default as _default$1 } from "./stylelint-9CMQiIxC.js";
 import { colorScheme, cssVarKey, customColorKey, defineTheme, getThemes, globalTheme, themeOptions } from "./index-xzslCJW7.js";
-import { _default } from "./index-DFGyu9wF.js";
+import { _default } from "./index-jFh6rAwb.js";
 export { colorScheme, cssVarKey, customColorKey, defineTheme, pubinfo as eslint, getThemes, globalTheme, _default as presetPubinfo, _default$1 as stylelint, themeOptions };

package/dist/index.js

@@ -1,6 +1,6 @@
-import { eslint_default } from "./eslint-B0bQR0lJ.js";
+import { eslint_default } from "./eslint-BHbhxuPS.js";
 import { stylelint_default } from "./stylelint-QHUuft1u.js";
 import { customColorKey, defineTheme, getThemes } from "./themes-CL2YKvqM.js";
-import { unocss_default } from "./unocss-Be8qA77X.js";
+import { unocss_default } from "./unocss-D2qcMD6U.js";
 
 export { customColorKey, defineTheme, eslint_default as eslint, getThemes, unocss_default as presetPubinfo, stylelint_default as stylelint };

package/dist/unocss/index.d.ts

@@ -1,3 +1,3 @@
 import "../index-xzslCJW7.js";
-import { _default } from "../index-DFGyu9wF.js";
+import { _default } from "../index-jFh6rAwb.js";
 export { _default as default };

package/dist/unocss/index.js

@@ -1,4 +1,4 @@
 import "../themes-CL2YKvqM.js";
-import { unocss_default } from "../unocss-Be8qA77X.js";
+import { unocss_default } from "../unocss-D2qcMD6U.js";
 
 export { unocss_default as default };

package/dist/{unocss-Be8qA77X.js → unocss-D2qcMD6U.js}

@@ -13,7 +13,7 @@ function createCssVar(key, themeName) {
 	function createSuffixScheme(preSuffix, suffixMap = suffix) {
 		return suffixMap.reduce((acc, suffix$1) => acc.concat(suffix$1.map((s) => `${preSuffix}${s}`).join(",")), []);
 	}
-	const map = {
+	return {
 		light(key$1) {
 			const preSuffix = `[data-theme="${key$1}"]`;
 			return createSuffixScheme(preSuffix);
@@ -22,12 +22,10 @@ function createCssVar(key, themeName) {
 			const preSuffix = `html.dark [data-theme="${key$1}"]`;
 			return createSuffixScheme(preSuffix);
 		}
-	};
-	return map[key](themeName);
+	}[key](themeName);
 }
 function mergeTheme(themes) {
-	const themeColor = Object.assign({}, ...themes);
-	return themeColor;
+	return Object.assign({}, ...themes);
 }
 function normalizePreflights(_themes = []) {
 	return { getCSS: () => {
@@ -53,11 +51,11 @@ const presetThemes = definePreset$1((options) => {
 //#endregion
 //#region src/unocss/index.ts
 var unocss_default = definePreset((options) => {
+	const { themes, type = "app" } = options ?? {};
 	return {
 		name: "preset-pubinfo",
 		presets: [
-			presetThemes({ themes: options?.themes }),
-			presetUno(),
+			type === "app" ? [presetThemes({ themes }), presetUno({ preflight: true })] : [presetUno({ preflight: false })],
 			presetAttributify(),
 			presetTypography(),
 			presetIcons({ extraProperties: {
@@ -83,8 +81,7 @@ var unocss_default = definePreset((options) => {
 				"xl": "1600px",
 				"2xl": "1920px"
 			}
-		},
-		content: { pipeline: { include: [/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/, "src/routes/**/*.ts"] } }
+		}
 	};
 });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/config",
   "type": "module",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.4",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",

package/src/eslint/config/vue.ts

@@ -10,7 +10,6 @@ export async function vue(): Promise<TypedFlatConfigItem[]> {
         'vue/block-order': ['error', {
           order: [
             'route',
-            'i18n',
             'script',
             'template',
             'style',

package/src/unocss/index.ts

@@ -9,12 +9,23 @@ import {
 } from 'unocss';
 import { presetThemes } from './presetThemes';
 
-export default definePreset<{ themes?: globalTheme[] }>((options) => {
+export default definePreset<{ themes?: globalTheme[], type?: 'app' | 'module' }>((options) => {
+  const {
+    themes,
+    type = 'app',
+  } = options ?? {};
+
   return {
     name: 'preset-pubinfo',
     presets: [
-      presetThemes({ themes: options?.themes }),
-      presetUno(),
+      type === 'app'
+        ? [
+            presetThemes({ themes }),
+            presetUno({ preflight: true }),
+          ]
+        : [
+            presetUno({ preflight: false }),
+          ],
       presetAttributify(),
       presetTypography(),
       presetIcons({
@@ -47,15 +58,5 @@ export default definePreset<{ themes?: globalTheme[] }>((options) => {
         '2xl': '1920px',
       },
     },
-
-    // TOFIX 此文件中该配置不生效
-    content: {
-      pipeline: {
-        include: [
-          /\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/,
-          'src/routes/**/*.ts',
-        ],
-      },
-    },
   };
 });