Browse Source

fix: fix semicolon

代强 2 years ago
parent
commit
de72d714a5

+ 7 - 4
packages/semi-scss-to-css-var/src/index.ts

@@ -7,7 +7,7 @@ import destroyDeps from "./utils/destroyDeps";
 
 
 export interface Options {
-    sourcePath: string,
+    sourcePath: string
 }
 
 const getAllScssFilesInPath = (filePath: string) => {
@@ -81,14 +81,17 @@ const transScssToCSSVar = (scssFilePathList: string[]) => {
             // const scssVariableInSelectorSet = new Set<string>();
             // postcss([getScssVariableNotUsedInSelectorSetPlugin(scssVariableInSelectorSet)]).process(raw, { syntax: postcssScss }).css;
 
-            if (scssFilePath.includes('variables.scss')){
+            if (scssFilePath.includes('variables.scss')) {
                 raw = destroyDeps(raw);
             }
 
-            const cssDefine: { key: string, value: string }[] = [];
+            const cssDefine: { key: string; value: string }[] = [];
 
             const result = postcss([transVarPlugin(scssFilePath.includes('variables.scss')||scssFilePath.includes('animation.scss'), cssDefine)]).process(raw, { syntax: postcssScss });
-            const resultSCSS = result.css; //Real call postcss
+            let resultSCSS = result.css; //Real call postcss
+            if (!resultSCSS.endsWith(";")) {
+                resultSCSS+=";";
+            }
             const rawCSSDefine = `.allCSSVar{\n${cssDefine.map(({ key, value }) => {
                 return `${key}: #{${trimEnd(value, '!default')}};`;
             }).join('\n')}\n}`;

+ 11 - 11
packages/semi-scss-to-css-var/src/transVarPlugin/index.ts

@@ -37,40 +37,40 @@ import { trimStart } from "lodash";
 // };
 
 
-const transVarPlugin=(replaceScss=false,extraCssVarDefineList:{key:string,value:string}[])=>{
+const transVarPlugin=(replaceScss=false, extraCssVarDefineList: {key: string;value: string}[])=>{
 
     return {
-        postcssPlugin:"semi-scss-to-css-var-plugin",
-        Root(root:Root,postcss:Postcss){
+        postcssPlugin: "semi-scss-to-css-var-plugin",
+        Root(root: Root, postcss: Postcss) {
             //console.log(root)
         },
-        Once(root:Root){
+        Once(root: Root) {
             //  console.log(root)
         },
-        Comment(comment){
+        Comment(comment) {
 
         },
-        Declaration(decl:Declaration){
+        Declaration(decl: Declaration) {
 
-            if ( decl.source?.input.css.split('\n')[(decl.source?.start?.line ?? 1)-1].includes('ignore-semi-css-trans')){
+            if ( decl.source?.input.css.split('\n')[(decl.source?.start?.line ?? 1)-1].includes('ignore-semi-css-trans')) {
                 return;
             }
             //@ts-ignore
-            if (!decl.isVisited){
+            if (!decl.isVisited) {
                 let value = decl.value;
                 value = replaceOther(value);
                 value = replaceWithCalc(value);
                 decl.value=value;
 
                 //inject css variable define
-                if (/\$[\w\d_-]+$/.test(decl.prop) && replaceScss){
-                    const scssVariable=trimStart(decl.prop,'$');
+                if (/\$[\w\d_-]+$/.test(decl.prop) && replaceScss) {
+                    const scssVariable=trimStart(decl.prop, '$');
                     const cssVariable =`--semi-css-${scssVariable}`;
                     // const cssDeclaration=new Declaration({ prop:cssVariable,value:decl.value });
                     // //@ts-ignore
                     // cssDeclaration.isVisited=true;
                     // decl.after(cssDeclaration);
-                    extraCssVarDefineList.push({ key:cssVariable,value:decl.value });
+                    extraCssVarDefineList.push({ key: cssVariable, value: decl.value });
                     decl.value=`var(${cssVariable})`;
                 }
                 //@ts-ignore