From 293c339f2d6a30151c775da8bfe18f909cbe93b0 Mon Sep 17 00:00:00 2001 From: "keisuke.karino" Date: Wed, 10 Nov 2021 01:55:09 +0900 Subject: [PATCH 1/2] Bump version to 1.0.6 --- package-lock.json | 2 +- package.json | 2 +- src/css.ts | 13 ++++++++++++- src/index.ts | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21c3cf7..f037c9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ts-css-modules-vite-plugin", - "version": "1.0.5", + "version": "1.0.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 21b7930..91fa4f9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ts-css-modules-vite-plugin", - "version": "1.0.5", + "version": "1.0.6", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/css.ts b/src/css.ts index f98f770..278effa 100644 --- a/src/css.ts +++ b/src/css.ts @@ -1,7 +1,7 @@ import sass from "sass"; import type { ResolvedConfig } from "vite"; import { getPreprocessorOptions } from "./options"; -import { AdditionalData } from "./type"; +import { AdditionalData, Log } from "./type"; const SPLIT_STR = `/* vite-plugin-sass-dts */\n`; @@ -9,6 +9,7 @@ const SPLIT_STR = `/* vite-plugin-sass-dts */\n`; let loadedSassPreprocessor: any; export const parseCss = ( + log: Log, file: string, fileName: string, config: ResolvedConfig @@ -46,6 +47,14 @@ export const parseCss = ( : finalImporter.push(options.importer); } + log( + `getData(file, fileName, options.additionalData):${getData( + file, + fileName, + options.additionalData + )}` + ); + const result = sass.renderSync({ ...options, data: getData(file, fileName, options.additionalData), @@ -54,6 +63,8 @@ export const parseCss = ( importer: finalImporter, }); + log(`result.css.toString():${result.css.toString()}`); + return result.css.toString(); }; diff --git a/src/index.ts b/src/index.ts index 05bfeb9..e6cd9d4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -54,7 +54,7 @@ const factory: ts.server.PluginModuleFactory = (mod: { if (fileName.endsWith(".css")) { } else { try { - css = parseCss(css, fileName, config); + css = parseCss(log, css, fileName, config); } catch (e) { log(`${e}`); } @@ -92,7 +92,7 @@ const factory: ts.server.PluginModuleFactory = (mod: { if (fileName.endsWith(".css")) { } else { try { - css = parseCss(css, fileName, config); + css = parseCss(log, css, fileName, config); } catch (e) { log(`${e}`); } From 6dda9adffb2cbfa76dcd1ed3d4b12fa8056bdffe Mon Sep 17 00:00:00 2001 From: "keisuke.karino" Date: Wed, 10 Nov 2021 01:56:34 +0900 Subject: [PATCH 2/2] Add logs --- src/index.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/index.ts b/src/index.ts index e6cd9d4..6c1041e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -55,6 +55,7 @@ const factory: ts.server.PluginModuleFactory = (mod: { } else { try { css = parseCss(log, css, fileName, config); + log(`css${css}`); } catch (e) { log(`${e}`); } @@ -63,6 +64,9 @@ const factory: ts.server.PluginModuleFactory = (mod: { postcssJs.objectify(postcss.parse(css)) ); + for (const classNameKey of classNameKeys) { + log(`classNameKey${classNameKey}`); + } scriptSnapshot = ts.ScriptSnapshot.fromString( formatClassNames(classNameKeys) ); @@ -93,6 +97,7 @@ const factory: ts.server.PluginModuleFactory = (mod: { } else { try { css = parseCss(log, css, fileName, config); + log(`css${css}`); } catch (e) { log(`${e}`); } @@ -101,6 +106,10 @@ const factory: ts.server.PluginModuleFactory = (mod: { postcssJs.objectify(postcss.parse(css)) ); + for (const classNameKey of classNameKeys) { + log(`classNameKey${classNameKey}`); + } + scriptSnapshot = ts.ScriptSnapshot.fromString( formatClassNames(classNameKeys) );