@yak/react 10.0.0-rc.0 → 10.0.0-rc.1

package/dist/loaders/vite-plugin.js

@@ -47,7 +47,7 @@ async function uncachedParseModule(context, modulePath) {
 		path: modulePath,
 		js: transformed,
 		exports,
-		styledComponents: parseStyledComponents(transformed.code, context.transpilationMode),
+		styledComponents: parseStyledComponents(transformed.code),
 		mixins
 	};
 }
@@ -66,7 +66,7 @@ function parseMixins(sourceContents) {
 	}
 	return mixins;
 }
-function parseStyledComponents(sourceContents, transpilationMode) {
+function parseStyledComponents(sourceContents) {
 	const styledParts = sourceContents.split("/*YAK EXPORTED STYLED:");
 	let styledComponents = {};
 	for (let i = 1; i < styledParts.length; i++) {
@@ -75,7 +75,7 @@ function parseStyledComponents(sourceContents, transpilationMode) {
 		styledComponents[componentName] = {
 			type: "styled-component",
 			nameParts: componentName.split("."),
-			value: transpilationMode === "Css" ? `.${className}` : `:global(.${className})`
+			value: `.${className}`
 		};
 	}
 	return styledComponents;
@@ -444,7 +444,6 @@ function resolveYakContext(contextPath, cwd) {
 //#region ../yak-internals/loaders/lib/debugLogger.ts
 function createDebugLogger(debugOptions, rootPath) {
 	if (!debugOptions) return () => {};
-	throwOnDeprecatedDebugOptions(debugOptions);
 	const pattern = debugOptions === true ? void 0 : debugOptions.pattern;
 	const typesArray = debugOptions === true ? void 0 : debugOptions.types;
 	let compiledPattern = null;
@@ -460,28 +459,10 @@ function createDebugLogger(debugOptions, rootPath) {
 		if (!compiledPattern || compiledPattern.test(relativePath)) console.log("🐮 Yak", `[${messageType}]`, relativePath, "\n\n", message);
 	};
 }
-function throwOnDeprecatedDebugOptions(debugOptions) {
-	if (typeof debugOptions === "string") {
-		const suggestion = suggestTypesForExtensionPattern(debugOptions) ?? `debug: { pattern: "${debugOptions}" }`;
-		throw new Error(`The debug option no longer accepts a string. Please update your config:\n  Before: debug: "${debugOptions}"\n  After:  ${suggestion}`);
-	}
-	if (typeof debugOptions === "object" && "filter" in debugOptions) throw new Error("The debug option no longer accepts { filter, type }. Please update your config:\n  Before: debug: { filter: ..., type: \"...\" }\n  After:  debug: { pattern: \"...\", types: [\"ts\", \"css\", \"css-resolved\"] }");
-	if (typeof debugOptions === "object" && debugOptions.pattern) {
-		const suggestion = suggestTypesForExtensionPattern(debugOptions.pattern);
-		if (suggestion) throw new Error(`The debug pattern "${debugOptions.pattern}" looks like it's filtering by output type using the old file extension convention.\nThe pattern now only matches file paths. Use the "types" option to filter by output type:\n  Before: debug: { pattern: "${debugOptions.pattern}" }\n  After:  ${suggestion}`);
-	}
-}
-function suggestTypesForExtensionPattern(pattern) {
-	const extensionMatch = pattern.match(/\.\(?(?:css-resolved|css)\)?\$?$/);
-	if (!extensionMatch) return null;
-	const type = extensionMatch[0].includes("css-resolved") ? "css-resolved" : "css";
-	const remaining = pattern.slice(0, extensionMatch.index);
-	return remaining ? `debug: { pattern: "${remaining}", types: ["${type}"] }` : `debug: { types: ["${type}"] }`;
-}
 
 //#endregion
 //#region ../yak-internals/loaders/lib/extractCss.ts
-function extractCss(code, transpilationMode) {
+function extractCss(code) {
 	let codeString;
 	if (typeof code === "string") codeString = code;
 	else if (code instanceof Buffer) codeString = code.toString("utf-8");
@@ -493,7 +474,6 @@ function extractCss(code, transpilationMode) {
 		const codeUntilEnd = codeParts[i].split("*/")[0];
 		result += codeUntilEnd;
 	}
-	if (result && transpilationMode !== "Css") result = "/* cssmodules-pure-no-check */\n" + result;
 	return result;
 }
 
@@ -515,8 +495,26 @@ async function parseExports(sourceContents) {
 			all: []
 		};
 		const variableDeclarations = {};
+		const importBindings = {};
+		const localExportSpecifiers = [];
 		let defaultIdentifier = null;
 		for (const node of ast.program.body) {
+			if (node.type === "ImportDeclaration") {
+				for (const specifier of node.specifiers) if (specifier.type === "ImportSpecifier") importBindings[specifier.local.name] = {
+					type: "re-export",
+					from: node.source.value,
+					name: specifier.imported.type === "Identifier" ? specifier.imported.name : specifier.imported.value
+				};
+				else if (specifier.type === "ImportDefaultSpecifier") importBindings[specifier.local.name] = {
+					type: "re-export",
+					from: node.source.value,
+					name: "default"
+				};
+				else if (specifier.type === "ImportNamespaceSpecifier") importBindings[specifier.local.name] = {
+					type: "namespace-re-export",
+					from: node.source.value
+				};
+			}
 			if (node.type === "VariableDeclaration") {
 				for (const decl of node.declarations) if (decl.id.type === "Identifier" && decl.init) variableDeclarations[decl.id.name] = decl.init;
 			}
@@ -532,7 +530,12 @@ async function parseExports(sourceContents) {
 						from: node.source.value
 					};
 				}
-				else if (node.declaration?.type === "VariableDeclaration") {
+				else if (!node.declaration) {
+					for (const specifier of node.specifiers) if (specifier.type === "ExportSpecifier" && specifier.exported.type === "Identifier" && specifier.local.type === "Identifier") localExportSpecifiers.push({
+						local: specifier.local.name,
+						exported: specifier.exported.name
+					});
+				} else if (node.declaration.type === "VariableDeclaration") {
 					for (const declaration of node.declaration.declarations) if (declaration.id.type === "Identifier" && declaration.init) {
 						variableDeclarations[declaration.id.name] = declaration.init;
 						const parsed = parseExportValueExpression(declaration.init, sourceContents);
@@ -551,7 +554,18 @@ async function parseExports(sourceContents) {
 			}
 			if (node.type === "ExportAllDeclaration") moduleExports.all.push(node.source.value);
 		}
-		if (defaultIdentifier && variableDeclarations[defaultIdentifier]) moduleExports.named["default"] = parseExportValueExpression(variableDeclarations[defaultIdentifier], sourceContents);
+		const resolveIdentifier = (name) => {
+			if (variableDeclarations[name]) return parseExportValueExpression(variableDeclarations[name], sourceContents);
+			return importBindings[name];
+		};
+		for (const { local, exported } of localExportSpecifiers) {
+			const resolved = resolveIdentifier(local);
+			if (resolved) moduleExports.named[exported] = resolved;
+		}
+		if (defaultIdentifier) {
+			const resolved = resolveIdentifier(defaultIdentifier);
+			if (resolved) moduleExports.named["default"] = resolved;
+		}
 		return moduleExports;
 	} catch (error) {
 		throw new Error(`Error parsing exports: ${error.message}`);
@@ -659,11 +673,7 @@ function createViteYakPlugin(library) {
 }
 async function viteYakImpl(library, userOptions) {
 	const yakOptions = {
-		experiments: {
-			transpilationMode: "Css",
-			suppressDeprecationWarnings: false,
-			...userOptions.experiments
-		},
+		debug: userOptions.debug,
 		minify: userOptions.minify ?? process.env.NODE_ENV === "production",
 		prefix: userOptions.prefix,
 		foldStatic: userOptions.foldStatic ?? library.foldStatic,
@@ -705,7 +715,7 @@ async function viteYakImpl(library, userOptions) {
 		},
 		configResolved(config) {
 			basePath = basePath ? resolve(config.root, basePath) : config.root;
-			debugLog = createDebugLogger(yakOptions.experiments?.debug, basePath);
+			debugLog = createDebugLogger(yakOptions.debug, basePath);
 			isServe = config.command === "serve";
 		},
 		resolveId: {
@@ -730,12 +740,11 @@ async function viteYakImpl(library, userOptions) {
 				this.addWatchFile(originalId);
 				const code = await transform$1(sourceContent, originalId, basePath, yakSwcPath, yakOptions);
 				debugLog("ts", code.code, originalId);
-				const extractedCss = extractCss(code.code, "Css");
+				const extractedCss = extractCss(code.code);
 				debugLog("css", extractedCss, originalId);
 				const { resolved } = await resolveCrossFileConstant({
 					parse: (modulePath) => {
 						return parseModule({
-							transpilationMode: "Css",
 							extractExports: async (modulePath) => {
 								const sourceContent = await readSource(modulePath);
 								this.addWatchFile(modulePath);
@@ -840,12 +849,10 @@ function transform$1(data, modulePath, rootPath, yakSwcPath, yakOptions, reactRe
 					displayNames: yakOptions.displayNames,
 					foldStatic: yakOptions.foldStatic ?? true,
 					strictCssProp: yakOptions.strictCssProp ?? true,
-					suppressDeprecationWarnings: yakOptions.experiments?.suppressDeprecationWarnings,
 					...reactRefreshReg ? { reactRefreshReg: true } : {},
 					...emitCssComments === false ? { emitCssComments: false } : {},
 					importMode: {
 						value: "virtual:yak-css:{{__MODULE_PATH__}}.css",
-						transpilation: "Css",
 						encoding: "None"
 					}
 				}]]