CS fixes

stylify · Jan 14, 2023 · 2b596de · 2b596de
1 parent 7f61748
commit 2b596de
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/packages/bundler/src/Bundler.ts b/packages/bundler/src/Bundler.ts
@@ -659,7 +659,7 @@ export class Bundler {
 				'bundler:beforeCssFileCreated', { content: generatedCss, bundleConfig }
 			);
 
-			let outputFileContent = hookData.content as string;
+			let outputFileContent = hookData.content;
 			const isDev = bundleBuildCache.compiler.dev;
 			const whiteSpace = isDev ? '\n' : '';
 
@@ -669,7 +669,7 @@ export class Bundler {
 					typeof exportLayerName === 'undefined' || !exportLayerName.includes(bundleConfig.cssLayer)
 						? ''
 						: `@layer ${this.cssLayersOrder.order};${whiteSpace.repeat(2)}`;
-				layerContent += `@layer ${bundleConfig.cssLayer} {${whiteSpace}${outputFileContent}${whiteSpace}}`;
+				layerContent += `@layer ${bundleConfig.cssLayer} {${whiteSpace + outputFileContent + whiteSpace}}`;
 				outputFileContent = layerContent;
 			}
 

diff --git a/packages/bundler/tests/jest/css-layers.test.ts b/packages/bundler/tests/jest/css-layers.test.ts
@@ -16,16 +16,16 @@ if (!fs.existsSync(buildTmpDir)) {
 
 fse.copySync(path.join(bundleTestDir, 'input'), buildTmpDir);
 
-test('Single file', (): void => {
-	return;
-	new Bundler({
+test('Single file', async (): void => {
+	const bundler = new Bundler({
 		dev: true,
 		cssLayersOrder: {
 			order: ['layout', 'page'].join(','),
 			exportLayer: ['layout'],
 			exportFile: path.join(buildTmpDir, 'stylify-css-layers.css')
 		}
-	}).bundle([
+	})
+	bundler.bundle([
 		{
 			outputFile: path.join(buildTmpDir, 'layout.css'),
 			files: [ path.join(buildTmpDir, 'layout.html') ],
@@ -38,6 +38,8 @@ test('Single file', (): void => {
 		},
 	]);
 
+	await bundler.waitOnBundlesProcessed();
+
 	const layoutCssOutput = testUtils.readFile(path.join(buildTmpDir, 'layout.css'));
 	const pageCssOutput = testUtils.readFile(path.join(buildTmpDir, 'page.css'));
 	const layersCssOutput = testUtils.readFile(path.join(buildTmpDir, 'stylify-css-layers.css'));

diff --git a/packages/unplugin/src/index.ts b/packages/unplugin/src/index.ts
@@ -149,7 +149,9 @@ export const unplugin = createUnplugin((config: UnpluginConfigInterface|Unplugin
 		await bundlerRunner.waitOnBundlesProcessed();
 	};
 
-	const shouldMangleSelectors = () => pluginConfig?.compiler?.mangleSelectors
+
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+	const shouldMangleSelectors = (): boolean => pluginConfig?.compiler?.mangleSelectors
 		?? pluginConfig?.bundler?.compiler?.mangleSelectors
 		?? (!pluginConfig.dev && !pluginConfig.bundler.watchFiles);