@bamboocss/config 1.31.0 → 1.33.0

package/dist/diff-config.cjs

@@ -51,14 +51,12 @@ function createMatcher(id, patterns) {
 const all = [
 	"clean",
 	"cwd",
-	"eject",
 	"outdir",
 	"forceConsistentTypeExtension",
 	"outExtension",
 	"emitTokensOnly",
 	"presets",
-	"plugins",
-	"hooks"
+	"plugins"
 ];
 const format = [
 	"hash",
@@ -103,7 +101,7 @@ const artifactConfigDeps = {
 	"types-entry": [],
 	"types-gen": [],
 	"types-gen-system": [],
-	themes: ["themes"].concat(tokens),
+	themes: ["theme.variants"].concat(tokens),
 	"static-css": [
 		"staticCss",
 		"patterns",
@@ -117,6 +115,7 @@ const artifactMatchers = Object.entries(artifactConfigDeps).map(([key, paths]) =
 	if (!paths.length) return () => void 0;
 	return createMatcher(key, paths.concat(all));
 });
+Array.from(new Set([...all, ...Object.values(artifactConfigDeps).flat()]));
 //#endregion
 //#region src/diff-config.ts
 const runIfFn = (fn) => typeof fn === "function" ? fn() : fn;

package/dist/diff-config.mjs

@@ -27,14 +27,12 @@ function createMatcher(id, patterns) {
 const all = [
 	"clean",
 	"cwd",
-	"eject",
 	"outdir",
 	"forceConsistentTypeExtension",
 	"outExtension",
 	"emitTokensOnly",
 	"presets",
-	"plugins",
-	"hooks"
+	"plugins"
 ];
 const format = [
 	"hash",
@@ -79,7 +77,7 @@ const artifactConfigDeps = {
 	"types-entry": [],
 	"types-gen": [],
 	"types-gen-system": [],
-	themes: ["themes"].concat(tokens),
+	themes: ["theme.variants"].concat(tokens),
 	"static-css": [
 		"staticCss",
 		"patterns",
@@ -93,6 +91,7 @@ const artifactMatchers = Object.entries(artifactConfigDeps).map(([key, paths]) =
 	if (!paths.length) return () => void 0;
 	return createMatcher(key, paths.concat(all));
 });
+Array.from(new Set([...all, ...Object.values(artifactConfigDeps).flat()]));
 //#endregion
 //#region src/diff-config.ts
 const runIfFn = (fn) => typeof fn === "function" ? fn() : fn;

package/dist/index.cjs

@@ -132,14 +132,12 @@ function createMatcher(id, patterns) {
 const all = [
 	"clean",
 	"cwd",
-	"eject",
 	"outdir",
 	"forceConsistentTypeExtension",
 	"outExtension",
 	"emitTokensOnly",
 	"presets",
-	"plugins",
-	"hooks"
+	"plugins"
 ];
 const format = [
 	"hash",
@@ -184,7 +182,7 @@ const artifactConfigDeps = {
 	"types-entry": [],
 	"types-gen": [],
 	"types-gen-system": [],
-	themes: ["themes"].concat(tokens),
+	themes: ["theme.variants"].concat(tokens),
 	"static-css": [
 		"staticCss",
 		"patterns",
@@ -198,6 +196,7 @@ const artifactMatchers = Object.entries(artifactConfigDeps).map(([key, paths]) =
 	if (!paths.length) return () => void 0;
 	return createMatcher(key, paths.concat(all));
 });
+Array.from(new Set([...all, ...Object.values(artifactConfigDeps).flat()]));
 //#endregion
 //#region src/diff-config.ts
 const runIfFn = (fn) => typeof fn === "function" ? fn() : fn;
@@ -652,12 +651,6 @@ function mergeScalarShorthand(key, records) {
 * Merge all configs into a single config
 */
 function mergeConfigs(configs) {
-	const userConfig = configs.at(-1);
-	const pluginHooks = userConfig.plugins ?? [];
-	if (userConfig.hooks) pluginHooks.push({
-		name: _bamboocss_shared.BAMBOO_CONFIG_NAME,
-		hooks: userConfig.hooks
-	});
 	const reversed = Array.from(configs).reverse();
 	const theme = mergeExtensions(reversed.map((config) => config.theme ?? {}));
 	const themeVariants = mergeExtensions(reversed.map((config) => config.theme?.variants ?? {}));
@@ -679,8 +672,7 @@ function mergeConfigs(configs) {
 		prune: mergeExtensions(reversed.map((config) => config.prune ?? {})),
 		hash: mergeScalarShorthand("hash", reversed),
 		prefix: mergeScalarShorthand("prefix", reversed),
-		preflight: mergeScalarShorthand("preflight", reversed),
-		hooks: mergeHooks(pluginHooks)
+		preflight: mergeScalarShorthand("preflight", reversed)
 	}, ...reversed));
 	/**
 	* Properly merge tokens between flat/nested forms by setting the flat form as the default
@@ -875,19 +867,58 @@ const validateRecipes = (options) => {
 const REMOVED = {
 	pruneUnusedTokens: (value) => value === "strict" ? `\`pruneUnusedTokens: 'strict'\` is now \`prune: { tokens: 'accounted', unresolvedPath: 'error' }\`.` : `\`pruneUnusedTokens\` is now \`prune: { tokens: '${value === false ? "off" : "reachable"}' }\`.`,
 	pruneUnusedKeyframes: (value) => `\`pruneUnusedKeyframes\` is now \`prune: { keyframes: ${value === false ? "false" : "true"} }\`.`,
-	prunePreflight: (value) => `\`prunePreflight\` is now \`prune: { preflight: ${value === false ? "false" : "true"} }\`.`,
+	prunePreflight: (value) => `\`prunePreflight\` is now \`preflight: { prune: ${value === false ? "false" : "true"} }\`.`,
 	globalCss: () => `\`globalCss\` is now \`global: { css }\`.`,
 	globalFontface: () => `\`globalFontface\` is now \`global: { fontface }\`.`,
 	globalPositionTry: () => `\`globalPositionTry\` is now \`global: { positionTry }\`.`,
 	globalVars: () => `\`globalVars\` is now \`global: { vars }\`.`,
 	themes: () => `\`themes\` is now \`theme.variants\`. One character from \`theme\`, both spellings valid, so the typo resolved to a different feature instead of an error.`,
-	eject: (value) => value ? `\`eject: true\` is now \`presets: []\`. \`presets\` is the complete list — an unset \`presets\` loads \`defaultPresets\`, and listing your own no longer keeps a default underneath it.` : `\`eject: false\` is the default and can be removed. \`presets\` is now the complete list.`,
-	lightningcss: (value) => value ? `\`lightningcss: true\` is now \`plugins: [pluginLightningcss()]\` from \`@bamboocss/plugin-lightningcss\`, which you install yourself. The flag forced a static import, so every project carried the native binary whether or not it was on.` : `\`lightningcss: false\` is the default and can be removed.`
+	eject: (value) => value ? `\`eject: true\` is now \`presets: []\`. \`presets\` is the complete list — an unset \`presets\` loads \`defaultPresets\`, and listing your own no longer keeps a default underneath it.` : `\`eject: false\` was the default and no longer exists — delete it. \`presets\` is now the complete list.`,
+	hooks: () => `\`hooks\` is now a plugin: \`plugins: [{ name: 'my-app', hooks: { ... } }]\`. One mechanism had two spellings, and the nameless one left every diagnostic about a hook with nothing to print. Ordering is now just the order of the array, rather than "plugins in sequence, then the config's own last".`,
+	lightningcss: (value) => value ? `\`lightningcss: true\` is now \`plugins: [pluginLightningcss()]\` from \`@bamboocss/plugin-lightningcss\`, which you install yourself. The flag forced a static import, so every project carried the native binary whether or not it was on.` : `\`lightningcss: false\` was the default and no longer exists — delete it.`
 };
 /** Values that no longer exist for an option that does. Keyed by option, then by old value. */
 const RETIRED_VALUES = { validation: { none: `\`validation: 'none'\` is now \`validation: 'off'\`, matching \`prune.unresolvedPath\`.` } };
 /** Removed keys nested one level down, keyed by their parent. */
-const REMOVED_NESTED = { prune: { unresolved: (value) => `\`prune.unresolved\` is now \`prune.unresolvedPath\`, and the accounting pass it used to switch on is now \`prune.tokens: 'accounted'\` — write \`prune: { tokens: 'accounted', unresolvedPath: '${value === "error" ? "error" : "warn"}' }\`. They are separate because \`'off'\` used to mean two things at once: no accounting, and no report.` } };
+const COMPOSITION_MOVED = (old, prop) => () => `\`theme.${old}\` is now \`theme.mixins\`, applied through \`css({ mixin: '…' })\` rather than \`css({ ${prop}: '…' })\`. The three keys ran through one registration and differed only in which properties the value could set — an arbitrary partition that cost a bundle spanning two of them a second key and a second application.`;
+const REMOVED_NESTED = {
+	prune: {
+		preflight: (value) => `\`prune.preflight\` is now \`preflight: { prune: ${value === false ? "false" : "true"} }\`. It was a second key named \`preflight\` one level away from the one that emits the reset, so a config asked for a reset in one place and reshaped it in another — and pruning a scoped reset already had to read \`preflight.scope\` to work at all.`,
+		unresolved: (value) => `\`prune.unresolved\` is now \`prune.unresolvedPath\`, and the accounting pass it used to switch on is now \`prune.tokens: 'accounted'\` — write \`prune: { tokens: 'accounted', unresolvedPath: '${value === "error" ? "error" : "warn"}' }\`. They are separate because \`'off'\` used to mean two things at once: no accounting, and no report.`
+	},
+	theme: {
+		textStyles: COMPOSITION_MOVED("textStyles", "textStyle"),
+		layerStyles: COMPOSITION_MOVED("layerStyles", "layerStyle"),
+		animationStyles: COMPOSITION_MOVED("animationStyles", "animationStyle")
+	}
+};
+/**
+* Options a config still sets that no longer exist — a hard error, and not silenceable.
+*
+* Runs ahead of `validation` and ignores it, for the reason `assertNoRetiredSyntax` does. The
+* rest of `validateConfig` reports opinions about a config that will still build; this reports a
+* config that is *provably* not the one being read. An unknown key might be forward-compatible —
+* a setting for a version you have not installed yet — but a key on this list is only reachable
+* by a config written against a version that is behind the one running it.
+*
+* It used to warn, which is the wrong severity for exactly the upgrade this exists to catch. A
+* warning scrolls past in CI, and a removed option is silent in every other way: the build
+* reverts to the default and the assertion the user asked for stops being enforced. These
+* removals ship in minor versions, so a Renovate auto-merge sails through a warning without a
+* person ever reading it — the one case where nothing else can catch it.
+*
+* Every occurrence is collected before throwing, because the point is to fix a config once
+* rather than to be told about it one key at a time. Delete this a release or two after removal,
+* along with `validate-retired-syntax.ts`.
+*/
+function assertNoRemovedOptions(config) {
+	const found = [];
+	validateRemovedOptions(config, (scope, message) => {
+		found.push(`- [${scope}] ${message}`);
+	});
+	if (!found.length) return;
+	throw new _bamboocss_shared.BambooError("CONFIG_ERROR", `${found.length} config option(s) no longer exist:\n\n${found.join("\n")}\n\nNothing walks a config for keys it does not recognise, so an option left in place here is reported nowhere else — the build reverts to the default in silence, and any assertion the option asked for stops being enforced. Make the edits above and the build proceeds. This is not governed by \`validation\`, which grades a config that still builds.\n\nThis reads the config after presets are merged, so a key you cannot find in your own file came from one of them — upgrade that preset, or drop the key with a \`config:resolved\` hook.`);
+}
 function validateRemovedOptions(config, addError) {
 	const dict = config;
 	for (const [name, describe] of Object.entries(REMOVED)) {
@@ -1082,16 +1113,21 @@ const validateTokens = (options) => {
 * - Check for missing tokens references
 * - Check for conditions selectors (must contain '&')
 * - Check for breakpoints units (must be the same)
-* - Check for options that have been removed, which are otherwise ignored in silence
+* - Throw on options that have been removed, which are otherwise ignored in silence
 * - Throw on token values still written in the retired curly reference syntax
+*
+* The two throwing checks run first and answer to nothing below them. `validation` grades
+* *opinions about a config that still builds*; those two are evidence that the config is not
+* the one being read, which is a different question and not one a severity setting should
+* decide.
 */
 const validateConfig = (config) => {
 	assertNoRetiredSyntax(config);
+	assertNoRemovedOptions(config);
 	const warnings = /* @__PURE__ */ new Set();
 	const addError = (scope, message) => {
 		warnings.add(`[${scope}] ` + message);
 	};
-	validateRemovedOptions(config, addError);
 	const report = () => {
 		if (!warnings.size) return;
 		const errors = `⚠️ Invalid config:\n${Array.from(warnings).map((err) => "- " + err).join("\n")}\n`;
@@ -1170,15 +1206,8 @@ async function resolveConfig(result, cwd) {
 	const listed = result.config.presets;
 	result.config.presets = listed ? Array.from(new Set(listed.map((preset) => getBundledPreset(preset) ?? preset))) : [...defaultPresets];
 	warnIfBaseDropped(listed, result.config.presets);
-	const userConfig = result.config;
-	const pluginHooks = userConfig.plugins ?? [];
-	if (userConfig.hooks) pluginHooks.push({
-		name: _bamboocss_shared.BAMBOO_CONFIG_NAME,
-		hooks: userConfig.hooks
-	});
-	const earlyHooks = mergeHooks(pluginHooks);
-	const mergedConfig = await getResolvedConfig(result.config, cwd, earlyHooks);
-	const hooks = mergedConfig.hooks ?? {};
+	const hooks = mergeHooks(result.config.plugins ?? []);
+	const mergedConfig = await getResolvedConfig(result.config, cwd, hooks);
 	if (mergedConfig.logLevel) _bamboocss_logger.logger.level = mergedConfig.logLevel;
 	if (mergedConfig.logFilter) _bamboocss_logger.logger.filter = mergedConfig.logFilter;
 	validateConfig(mergedConfig);

package/dist/index.d.cts

@@ -183,93 +183,6 @@ declare const defaultPresets: ({
         flexShrink: any;
       };
     };
-    stack: {
-      properties: {
-        align: {
-          type: "property";
-          value: "alignItems";
-        };
-        justify: {
-          type: "property";
-          value: "justifyContent";
-        };
-        direction: {
-          type: "property";
-          value: "flexDirection";
-        };
-        gap: {
-          type: "property";
-          value: "gap";
-        };
-      };
-      defaultValues: {
-        direction: string;
-        gap: string;
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        display: "flex";
-        flexDirection: any;
-        alignItems: any;
-        justifyContent: any;
-        gap: any;
-      };
-    };
-    vstack: {
-      properties: {
-        justify: {
-          type: "property";
-          value: "justifyContent";
-        };
-        gap: {
-          type: "property";
-          value: "gap";
-        };
-      };
-      defaultValues: {
-        gap: string;
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        display: "flex";
-        alignItems: "center";
-        justifyContent: any;
-        gap: any;
-        flexDirection: "column";
-      };
-    };
-    hstack: {
-      properties: {
-        justify: {
-          type: "property";
-          value: "justifyContent";
-        };
-        gap: {
-          type: "property";
-          value: "gap";
-        };
-      };
-      defaultValues: {
-        gap: string;
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        display: "flex";
-        alignItems: "center";
-        justifyContent: any;
-        gap: any;
-        flexDirection: "row";
-      };
-    };
     spacer: {
       properties: {
         size: {
@@ -292,28 +205,11 @@ declare const defaultPresets: ({
         flex: any;
       };
     };
-    square: {
+    center: {
       properties: {
-        size: {
-          type: "property";
-          value: "width";
+        inline: {
+          type: "boolean";
         };
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        display: "flex";
-        alignItems: "center";
-        justifyContent: "center";
-        flex: "0 0 auto";
-        width: any;
-        height: any;
-      };
-    };
-    circle: {
-      properties: {
         size: {
           type: "property";
           value: "width";
@@ -324,29 +220,12 @@ declare const defaultPresets: ({
         [x: number]: any;
         [x: string & Record<never, never>]: any;
       }): {
-        display: "flex";
+        display: "flex" | "inline-flex";
         alignItems: "center";
         justifyContent: "center";
-        flex: "0 0 auto";
+        flex: "0 0 auto" | undefined;
         width: any;
         height: any;
-        borderRadius: "9999px";
-      };
-    };
-    center: {
-      properties: {
-        inline: {
-          type: "boolean";
-        };
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        display: "flex" | "inline-flex";
-        alignItems: "center";
-        justifyContent: "center";
       };
     };
     linkOverlay: {
@@ -478,43 +357,6 @@ declare const defaultPresets: ({
         gridRowEnd: any;
       };
     };
-    wrap: {
-      properties: {
-        gap: {
-          type: "property";
-          value: "gap";
-        };
-        rowGap: {
-          type: "property";
-          value: "gap";
-        };
-        columnGap: {
-          type: "property";
-          value: "gap";
-        };
-        align: {
-          type: "property";
-          value: "alignItems";
-        };
-        justify: {
-          type: "property";
-          value: "justifyContent";
-        };
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        display: "flex";
-        flexWrap: "wrap";
-        alignItems: any;
-        justifyContent: any;
-        gap: any;
-        columnGap: any;
-        rowGap: any;
-      };
-    };
     container: {
       transform(props: {
         [x: string]: any;
@@ -648,30 +490,6 @@ declare const defaultPresets: ({
         marginBlock: "calc(var(--bleed-y, 0) * -1)";
       };
     };
-    cq: {
-      properties: {
-        name: {
-          type: "token";
-          value: "containerNames";
-          property: "containerName";
-        };
-        type: {
-          type: "property";
-          value: "containerType";
-        };
-      };
-      defaultValues: {
-        type: string;
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        containerType: any;
-        containerName: any;
-      };
-    };
   };
 } | {
   name: string;
@@ -1936,7 +1754,7 @@ declare const defaultPresets: ({
         };
       };
     };
-    textStyles: import("@bamboocss/types").TextStyles;
+    mixins: import("@bamboocss/types").Mixins;
     containerSizes: {
       xs: string;
       sm: string;

package/dist/index.d.mts

@@ -183,93 +183,6 @@ declare const defaultPresets: ({
         flexShrink: any;
       };
     };
-    stack: {
-      properties: {
-        align: {
-          type: "property";
-          value: "alignItems";
-        };
-        justify: {
-          type: "property";
-          value: "justifyContent";
-        };
-        direction: {
-          type: "property";
-          value: "flexDirection";
-        };
-        gap: {
-          type: "property";
-          value: "gap";
-        };
-      };
-      defaultValues: {
-        direction: string;
-        gap: string;
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        display: "flex";
-        flexDirection: any;
-        alignItems: any;
-        justifyContent: any;
-        gap: any;
-      };
-    };
-    vstack: {
-      properties: {
-        justify: {
-          type: "property";
-          value: "justifyContent";
-        };
-        gap: {
-          type: "property";
-          value: "gap";
-        };
-      };
-      defaultValues: {
-        gap: string;
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        display: "flex";
-        alignItems: "center";
-        justifyContent: any;
-        gap: any;
-        flexDirection: "column";
-      };
-    };
-    hstack: {
-      properties: {
-        justify: {
-          type: "property";
-          value: "justifyContent";
-        };
-        gap: {
-          type: "property";
-          value: "gap";
-        };
-      };
-      defaultValues: {
-        gap: string;
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        display: "flex";
-        alignItems: "center";
-        justifyContent: any;
-        gap: any;
-        flexDirection: "row";
-      };
-    };
     spacer: {
       properties: {
         size: {
@@ -292,28 +205,11 @@ declare const defaultPresets: ({
         flex: any;
       };
     };
-    square: {
+    center: {
       properties: {
-        size: {
-          type: "property";
-          value: "width";
+        inline: {
+          type: "boolean";
         };
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        display: "flex";
-        alignItems: "center";
-        justifyContent: "center";
-        flex: "0 0 auto";
-        width: any;
-        height: any;
-      };
-    };
-    circle: {
-      properties: {
         size: {
           type: "property";
           value: "width";
@@ -324,29 +220,12 @@ declare const defaultPresets: ({
         [x: number]: any;
         [x: string & Record<never, never>]: any;
       }): {
-        display: "flex";
+        display: "flex" | "inline-flex";
         alignItems: "center";
         justifyContent: "center";
-        flex: "0 0 auto";
+        flex: "0 0 auto" | undefined;
         width: any;
         height: any;
-        borderRadius: "9999px";
-      };
-    };
-    center: {
-      properties: {
-        inline: {
-          type: "boolean";
-        };
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        display: "flex" | "inline-flex";
-        alignItems: "center";
-        justifyContent: "center";
       };
     };
     linkOverlay: {
@@ -478,43 +357,6 @@ declare const defaultPresets: ({
         gridRowEnd: any;
       };
     };
-    wrap: {
-      properties: {
-        gap: {
-          type: "property";
-          value: "gap";
-        };
-        rowGap: {
-          type: "property";
-          value: "gap";
-        };
-        columnGap: {
-          type: "property";
-          value: "gap";
-        };
-        align: {
-          type: "property";
-          value: "alignItems";
-        };
-        justify: {
-          type: "property";
-          value: "justifyContent";
-        };
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        display: "flex";
-        flexWrap: "wrap";
-        alignItems: any;
-        justifyContent: any;
-        gap: any;
-        columnGap: any;
-        rowGap: any;
-      };
-    };
     container: {
       transform(props: {
         [x: string]: any;
@@ -648,30 +490,6 @@ declare const defaultPresets: ({
         marginBlock: "calc(var(--bleed-y, 0) * -1)";
       };
     };
-    cq: {
-      properties: {
-        name: {
-          type: "token";
-          value: "containerNames";
-          property: "containerName";
-        };
-        type: {
-          type: "property";
-          value: "containerType";
-        };
-      };
-      defaultValues: {
-        type: string;
-      };
-      transform(props: {
-        [x: string]: any;
-        [x: number]: any;
-        [x: string & Record<never, never>]: any;
-      }): {
-        containerType: any;
-        containerName: any;
-      };
-    };
   };
 } | {
   name: string;
@@ -1936,7 +1754,7 @@ declare const defaultPresets: ({
         };
       };
     };
-    textStyles: import("@bamboocss/types").TextStyles;
+    mixins: import("@bamboocss/types").Mixins;
     containerSizes: {
       xs: string;
       sm: string;

package/dist/index.mjs

@@ -104,14 +104,12 @@ function createMatcher(id, patterns) {
 const all = [
 	"clean",
 	"cwd",
-	"eject",
 	"outdir",
 	"forceConsistentTypeExtension",
 	"outExtension",
 	"emitTokensOnly",
 	"presets",
-	"plugins",
-	"hooks"
+	"plugins"
 ];
 const format = [
 	"hash",
@@ -156,7 +154,7 @@ const artifactConfigDeps = {
 	"types-entry": [],
 	"types-gen": [],
 	"types-gen-system": [],
-	themes: ["themes"].concat(tokens),
+	themes: ["theme.variants"].concat(tokens),
 	"static-css": [
 		"staticCss",
 		"patterns",
@@ -170,6 +168,7 @@ const artifactMatchers = Object.entries(artifactConfigDeps).map(([key, paths]) =
 	if (!paths.length) return () => void 0;
 	return createMatcher(key, paths.concat(all));
 });
+Array.from(new Set([...all, ...Object.values(artifactConfigDeps).flat()]));
 //#endregion
 //#region src/diff-config.ts
 const runIfFn = (fn) => typeof fn === "function" ? fn() : fn;
@@ -624,12 +623,6 @@ function mergeScalarShorthand(key, records) {
 * Merge all configs into a single config
 */
 function mergeConfigs(configs) {
-	const userConfig = configs.at(-1);
-	const pluginHooks = userConfig.plugins ?? [];
-	if (userConfig.hooks) pluginHooks.push({
-		name: BAMBOO_CONFIG_NAME,
-		hooks: userConfig.hooks
-	});
 	const reversed = Array.from(configs).reverse();
 	const theme = mergeExtensions(reversed.map((config) => config.theme ?? {}));
 	const themeVariants = mergeExtensions(reversed.map((config) => config.theme?.variants ?? {}));
@@ -651,8 +644,7 @@ function mergeConfigs(configs) {
 		prune: mergeExtensions(reversed.map((config) => config.prune ?? {})),
 		hash: mergeScalarShorthand("hash", reversed),
 		prefix: mergeScalarShorthand("prefix", reversed),
-		preflight: mergeScalarShorthand("preflight", reversed),
-		hooks: mergeHooks(pluginHooks)
+		preflight: mergeScalarShorthand("preflight", reversed)
 	}, ...reversed));
 	/**
 	* Properly merge tokens between flat/nested forms by setting the flat form as the default
@@ -847,19 +839,58 @@ const validateRecipes = (options) => {
 const REMOVED = {
 	pruneUnusedTokens: (value) => value === "strict" ? `\`pruneUnusedTokens: 'strict'\` is now \`prune: { tokens: 'accounted', unresolvedPath: 'error' }\`.` : `\`pruneUnusedTokens\` is now \`prune: { tokens: '${value === false ? "off" : "reachable"}' }\`.`,
 	pruneUnusedKeyframes: (value) => `\`pruneUnusedKeyframes\` is now \`prune: { keyframes: ${value === false ? "false" : "true"} }\`.`,
-	prunePreflight: (value) => `\`prunePreflight\` is now \`prune: { preflight: ${value === false ? "false" : "true"} }\`.`,
+	prunePreflight: (value) => `\`prunePreflight\` is now \`preflight: { prune: ${value === false ? "false" : "true"} }\`.`,
 	globalCss: () => `\`globalCss\` is now \`global: { css }\`.`,
 	globalFontface: () => `\`globalFontface\` is now \`global: { fontface }\`.`,
 	globalPositionTry: () => `\`globalPositionTry\` is now \`global: { positionTry }\`.`,
 	globalVars: () => `\`globalVars\` is now \`global: { vars }\`.`,
 	themes: () => `\`themes\` is now \`theme.variants\`. One character from \`theme\`, both spellings valid, so the typo resolved to a different feature instead of an error.`,
-	eject: (value) => value ? `\`eject: true\` is now \`presets: []\`. \`presets\` is the complete list — an unset \`presets\` loads \`defaultPresets\`, and listing your own no longer keeps a default underneath it.` : `\`eject: false\` is the default and can be removed. \`presets\` is now the complete list.`,
-	lightningcss: (value) => value ? `\`lightningcss: true\` is now \`plugins: [pluginLightningcss()]\` from \`@bamboocss/plugin-lightningcss\`, which you install yourself. The flag forced a static import, so every project carried the native binary whether or not it was on.` : `\`lightningcss: false\` is the default and can be removed.`
+	eject: (value) => value ? `\`eject: true\` is now \`presets: []\`. \`presets\` is the complete list — an unset \`presets\` loads \`defaultPresets\`, and listing your own no longer keeps a default underneath it.` : `\`eject: false\` was the default and no longer exists — delete it. \`presets\` is now the complete list.`,
+	hooks: () => `\`hooks\` is now a plugin: \`plugins: [{ name: 'my-app', hooks: { ... } }]\`. One mechanism had two spellings, and the nameless one left every diagnostic about a hook with nothing to print. Ordering is now just the order of the array, rather than "plugins in sequence, then the config's own last".`,
+	lightningcss: (value) => value ? `\`lightningcss: true\` is now \`plugins: [pluginLightningcss()]\` from \`@bamboocss/plugin-lightningcss\`, which you install yourself. The flag forced a static import, so every project carried the native binary whether or not it was on.` : `\`lightningcss: false\` was the default and no longer exists — delete it.`
 };
 /** Values that no longer exist for an option that does. Keyed by option, then by old value. */
 const RETIRED_VALUES = { validation: { none: `\`validation: 'none'\` is now \`validation: 'off'\`, matching \`prune.unresolvedPath\`.` } };
 /** Removed keys nested one level down, keyed by their parent. */
-const REMOVED_NESTED = { prune: { unresolved: (value) => `\`prune.unresolved\` is now \`prune.unresolvedPath\`, and the accounting pass it used to switch on is now \`prune.tokens: 'accounted'\` — write \`prune: { tokens: 'accounted', unresolvedPath: '${value === "error" ? "error" : "warn"}' }\`. They are separate because \`'off'\` used to mean two things at once: no accounting, and no report.` } };
+const COMPOSITION_MOVED = (old, prop) => () => `\`theme.${old}\` is now \`theme.mixins\`, applied through \`css({ mixin: '…' })\` rather than \`css({ ${prop}: '…' })\`. The three keys ran through one registration and differed only in which properties the value could set — an arbitrary partition that cost a bundle spanning two of them a second key and a second application.`;
+const REMOVED_NESTED = {
+	prune: {
+		preflight: (value) => `\`prune.preflight\` is now \`preflight: { prune: ${value === false ? "false" : "true"} }\`. It was a second key named \`preflight\` one level away from the one that emits the reset, so a config asked for a reset in one place and reshaped it in another — and pruning a scoped reset already had to read \`preflight.scope\` to work at all.`,
+		unresolved: (value) => `\`prune.unresolved\` is now \`prune.unresolvedPath\`, and the accounting pass it used to switch on is now \`prune.tokens: 'accounted'\` — write \`prune: { tokens: 'accounted', unresolvedPath: '${value === "error" ? "error" : "warn"}' }\`. They are separate because \`'off'\` used to mean two things at once: no accounting, and no report.`
+	},
+	theme: {
+		textStyles: COMPOSITION_MOVED("textStyles", "textStyle"),
+		layerStyles: COMPOSITION_MOVED("layerStyles", "layerStyle"),
+		animationStyles: COMPOSITION_MOVED("animationStyles", "animationStyle")
+	}
+};
+/**
+* Options a config still sets that no longer exist — a hard error, and not silenceable.
+*
+* Runs ahead of `validation` and ignores it, for the reason `assertNoRetiredSyntax` does. The
+* rest of `validateConfig` reports opinions about a config that will still build; this reports a
+* config that is *provably* not the one being read. An unknown key might be forward-compatible —
+* a setting for a version you have not installed yet — but a key on this list is only reachable
+* by a config written against a version that is behind the one running it.
+*
+* It used to warn, which is the wrong severity for exactly the upgrade this exists to catch. A
+* warning scrolls past in CI, and a removed option is silent in every other way: the build
+* reverts to the default and the assertion the user asked for stops being enforced. These
+* removals ship in minor versions, so a Renovate auto-merge sails through a warning without a
+* person ever reading it — the one case where nothing else can catch it.
+*
+* Every occurrence is collected before throwing, because the point is to fix a config once
+* rather than to be told about it one key at a time. Delete this a release or two after removal,
+* along with `validate-retired-syntax.ts`.
+*/
+function assertNoRemovedOptions(config) {
+	const found = [];
+	validateRemovedOptions(config, (scope, message) => {
+		found.push(`- [${scope}] ${message}`);
+	});
+	if (!found.length) return;
+	throw new BambooError("CONFIG_ERROR", `${found.length} config option(s) no longer exist:\n\n${found.join("\n")}\n\nNothing walks a config for keys it does not recognise, so an option left in place here is reported nowhere else — the build reverts to the default in silence, and any assertion the option asked for stops being enforced. Make the edits above and the build proceeds. This is not governed by \`validation\`, which grades a config that still builds.\n\nThis reads the config after presets are merged, so a key you cannot find in your own file came from one of them — upgrade that preset, or drop the key with a \`config:resolved\` hook.`);
+}
 function validateRemovedOptions(config, addError) {
 	const dict = config;
 	for (const [name, describe] of Object.entries(REMOVED)) {
@@ -1054,16 +1085,21 @@ const validateTokens = (options) => {
 * - Check for missing tokens references
 * - Check for conditions selectors (must contain '&')
 * - Check for breakpoints units (must be the same)
-* - Check for options that have been removed, which are otherwise ignored in silence
+* - Throw on options that have been removed, which are otherwise ignored in silence
 * - Throw on token values still written in the retired curly reference syntax
+*
+* The two throwing checks run first and answer to nothing below them. `validation` grades
+* *opinions about a config that still builds*; those two are evidence that the config is not
+* the one being read, which is a different question and not one a severity setting should
+* decide.
 */
 const validateConfig = (config) => {
 	assertNoRetiredSyntax(config);
+	assertNoRemovedOptions(config);
 	const warnings = /* @__PURE__ */ new Set();
 	const addError = (scope, message) => {
 		warnings.add(`[${scope}] ` + message);
 	};
-	validateRemovedOptions(config, addError);
 	const report = () => {
 		if (!warnings.size) return;
 		const errors = `⚠️ Invalid config:\n${Array.from(warnings).map((err) => "- " + err).join("\n")}\n`;
@@ -1142,15 +1178,8 @@ async function resolveConfig(result, cwd) {
 	const listed = result.config.presets;
 	result.config.presets = listed ? Array.from(new Set(listed.map((preset) => getBundledPreset(preset) ?? preset))) : [...defaultPresets];
 	warnIfBaseDropped(listed, result.config.presets);
-	const userConfig = result.config;
-	const pluginHooks = userConfig.plugins ?? [];
-	if (userConfig.hooks) pluginHooks.push({
-		name: BAMBOO_CONFIG_NAME,
-		hooks: userConfig.hooks
-	});
-	const earlyHooks = mergeHooks(pluginHooks);
-	const mergedConfig = await getResolvedConfig(result.config, cwd, earlyHooks);
-	const hooks = mergedConfig.hooks ?? {};
+	const hooks = mergeHooks(result.config.plugins ?? []);
+	const mergedConfig = await getResolvedConfig(result.config, cwd, hooks);
 	if (mergedConfig.logLevel) logger.level = mergedConfig.logLevel;
 	if (mergedConfig.logFilter) logger.filter = mergedConfig.logFilter;
 	validateConfig(mergedConfig);

package/dist/merge-config.cjs

@@ -215,12 +215,6 @@ function mergeScalarShorthand(key, records) {
 * Merge all configs into a single config
 */
 function mergeConfigs(configs) {
-	const userConfig = configs.at(-1);
-	const pluginHooks = userConfig.plugins ?? [];
-	if (userConfig.hooks) pluginHooks.push({
-		name: _bamboocss_shared.BAMBOO_CONFIG_NAME,
-		hooks: userConfig.hooks
-	});
 	const reversed = Array.from(configs).reverse();
 	const theme = mergeExtensions(reversed.map((config) => config.theme ?? {}));
 	const themeVariants = mergeExtensions(reversed.map((config) => config.theme?.variants ?? {}));
@@ -242,8 +236,7 @@ function mergeConfigs(configs) {
 		prune: mergeExtensions(reversed.map((config) => config.prune ?? {})),
 		hash: mergeScalarShorthand("hash", reversed),
 		prefix: mergeScalarShorthand("prefix", reversed),
-		preflight: mergeScalarShorthand("preflight", reversed),
-		hooks: mergeHooks(pluginHooks)
+		preflight: mergeScalarShorthand("preflight", reversed)
 	}, ...reversed));
 	/**
 	* Properly merge tokens between flat/nested forms by setting the flat form as the default

package/dist/merge-config.mjs

@@ -1,4 +1,4 @@
-import { BAMBOO_CONFIG_NAME, assign, isObject, mergeAndConcat, mergeWith, walkObject } from "@bamboocss/shared";
+import { assign, isObject, mergeAndConcat, mergeWith, walkObject } from "@bamboocss/shared";
 import { logger } from "@bamboocss/logger";
 //#region src/merge-hooks.ts
 const mergeHooks = (plugins) => {
@@ -214,12 +214,6 @@ function mergeScalarShorthand(key, records) {
 * Merge all configs into a single config
 */
 function mergeConfigs(configs) {
-	const userConfig = configs.at(-1);
-	const pluginHooks = userConfig.plugins ?? [];
-	if (userConfig.hooks) pluginHooks.push({
-		name: BAMBOO_CONFIG_NAME,
-		hooks: userConfig.hooks
-	});
 	const reversed = Array.from(configs).reverse();
 	const theme = mergeExtensions(reversed.map((config) => config.theme ?? {}));
 	const themeVariants = mergeExtensions(reversed.map((config) => config.theme?.variants ?? {}));
@@ -241,8 +235,7 @@ function mergeConfigs(configs) {
 		prune: mergeExtensions(reversed.map((config) => config.prune ?? {})),
 		hash: mergeScalarShorthand("hash", reversed),
 		prefix: mergeScalarShorthand("prefix", reversed),
-		preflight: mergeScalarShorthand("preflight", reversed),
-		hooks: mergeHooks(pluginHooks)
+		preflight: mergeScalarShorthand("preflight", reversed)
 	}, ...reversed));
 	/**
 	* Properly merge tokens between flat/nested forms by setting the flat form as the default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/config",
-  "version": "1.31.0",
+  "version": "1.33.0",
   "description": "Find and load bamboo config",
   "homepage": "https://bamboocss.com",
   "license": "MIT",
@@ -64,11 +64,11 @@
     "escalade": "3.2.0",
     "microdiff": "1.5.0",
     "typescript": "6.0.2",
-    "@bamboocss/logger": "1.31.0",
-    "@bamboocss/preset-bamboo": "1.31.0",
-    "@bamboocss/preset-base": "1.31.0",
-    "@bamboocss/shared": "1.31.0",
-    "@bamboocss/types": "1.31.0"
+    "@bamboocss/logger": "1.33.0",
+    "@bamboocss/preset-bamboo": "1.33.0",
+    "@bamboocss/preset-base": "1.33.0",
+    "@bamboocss/shared": "1.33.0",
+    "@bamboocss/types": "1.33.0"
   },
   "devDependencies": {
     "pkg-types": "2.3.0"