@douyinfe/semi-scss-compile 2.1.3 → 2.2.0-beta.0

package/README.md

@@ -15,11 +15,11 @@ There are mainly the following two usage scenarios:
 ```shell
 npm i -g @douyinfe/semi-scss-compile
 
-semi-build-scss --foundation="path/to/foundation" --theme="path/to/theme" --icon="path/to/'@douyinfe/semi-icons'" --output="path/to/output.css" --min=true
+semi-build-scss --foundation="path/to/foundation" --theme="path/to/theme" --icon="path/to/'@douyinfe/semi-icons'" --output="path/to/output.css" --min
 
 # or for short
 
-semi-build-scss -f "path/to/foundation" -t "path/to/theme" -i "path/to/'@douyinfe/semi-icons'" -o "path/to/output.css" -m true
+semi-build-scss -f "path/to/foundation" -t "path/to/theme" -i "path/to/'@douyinfe/semi-icons'" -o "path/to/output.css" -m
 
 ```
 

package/lib/bin.js

@@ -8,18 +8,18 @@ const arg_1 = __importDefault(require("arg"));
 const index_1 = require("./index");
 const main = () => {
     const userArgs = (0, arg_1.default)({
-        "--foundation": String,
-        "--theme": String,
-        "--output": String,
-        "--icon": String,
-        "--min": Boolean,
-        "-f": "--foundation",
-        "-t": "--theme",
-        "-i": "--icon",
-        "-o": "--output",
-        "-m": "--min"
+        '--foundation': String,
+        '--theme': String,
+        '--output': String,
+        '--icon': String,
+        '--min': Boolean,
+        '-f': '--foundation',
+        '-t': '--theme',
+        '-i': '--icon',
+        '-o': '--output',
+        '-m': '--min'
     }, { permissive: true });
-    const { "--foundation": foundationPath, '--theme': themePath, '--output': outputPath, '--icon': iconPath, '--min': isMin } = userArgs;
+    const { '--foundation': foundationPath, '--theme': themePath, '--output': outputPath, '--icon': iconPath, '--min': isMin } = userArgs;
     console.log(`foundationPath: ${foundationPath},\nthemePath: ${themePath},\noutputPath: ${outputPath}\n`);
     if (foundationPath && themePath && iconPath && outputPath) {
         (0, index_1.compile)({

package/lib/bin.js.map

@@ -1 +1 @@
-{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";;;;;;AAEA,8CAAsB;AACtB,mCAAkC;AAElC,MAAM,IAAI,GAAG,GAAG,EAAE;IACd,MAAM,QAAQ,GAAG,IAAA,aAAG,EAAC;QACjB,cAAc,EAAE,MAAM;QACtB,SAAS,EAAE,MAAM;QACjB,UAAU,EAAE,MAAM;QAClB,QAAQ,EAAC,MAAM;QACf,OAAO,EAAE,OAAO;QAEhB,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,SAAS;QACf,IAAI,EAAC,QAAQ;QACb,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,OAAO;KAChB,EAAE,EAAC,UAAU,EAAE,IAAI,EAAC,CAAC,CAAC;IACvB,MAAM,EAAC,cAAc,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAC,QAAQ,EAAC,QAAQ,EAAC,OAAO,EAAE,KAAK,EAAC,GAAG,QAAQ,CAAC;IACjI,OAAO,CAAC,GAAG,CAAC,mBAAmB,cAAc,iBAAiB,SAAS,kBAAkB,UAAU,IAAI,CAAC,CAAC;IACzG,IAAI,cAAc,IAAI,SAAS,IAAI,QAAQ,IAAI,UAAU,EAAE;QACvD,IAAA,eAAO,EAAC;YACJ,cAAc,EAAC,SAAS,EAAC,QAAQ,EAAC,UAAU,EAAC,KAAK;SACrD,CAAC,CAAC;KACN;SAAM;QACH,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;AACL,CAAC,CAAC;AAEF,IAAI,EAAE,CAAC"}
+{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";;;;;;AAEA,8CAAsB;AACtB,mCAAkC;AAElC,MAAM,IAAI,GAAG,GAAG,EAAE;IACd,MAAM,QAAQ,GAAG,IAAA,aAAG,EAAC;QACjB,cAAc,EAAE,MAAM;QACtB,SAAS,EAAE,MAAM;QACjB,UAAU,EAAE,MAAM;QAClB,QAAQ,EAAE,MAAM;QAChB,OAAO,EAAE,OAAO;QAEhB,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,OAAO;KAChB,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IACzB,MAAM,EACF,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,KAAK,EACjB,GAAG,QAAQ,CAAC;IACb,OAAO,CAAC,GAAG,CAAC,mBAAmB,cAAc,iBAAiB,SAAS,kBAAkB,UAAU,IAAI,CAAC,CAAC;IACzG,IAAI,cAAc,IAAI,SAAS,IAAI,QAAQ,IAAI,UAAU,EAAE;QACvD,IAAA,eAAO,EAAC;YACJ,cAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK;SACzD,CAAC,CAAC;KACN;SAAM;QACH,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;AACL,CAAC,CAAC;AAEF,IAAI,EAAE,CAAC"}

package/lib/index.d.ts

@@ -1,6 +1,6 @@
-import generateScssMap from "./utils/generateSCSSMap";
-import writeFile from "./utils/writeFile";
-import compilerFromScssMap from "./utils/compiler";
+import generateScssMap from './utils/generateSCSSMap';
+import writeFile from './utils/writeFile';
+import compilerFromScssMap from './utils/compiler';
 export interface Options {
     foundationPath: string;
     themePath: string;

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,8EAAsD;AAyBlD,0BAzBG,yBAAe,CAyBH;AAxBnB,kEAA0C;AA0BtC,oBA1BG,mBAAS,CA0BH;AAzBb,gEAAmD;AAwB/C,8BAxBG,kBAAmB,CAwBH;AAvBvB,gDAAwB;AACxB,wDAA0B;AAW1B,MAAM,OAAO,GAAG,CAAC,EAAC,cAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,GAAG,KAAK,EAAU,EAAE,EAAE;IAC1F,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,cAAc,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IACrE,MAAM,OAAO,GAAG,IAAA,mBAAS,EAAC,OAAO,CAAC,CAAA;IAClC,MAAM,MAAM,GAAG,IAAA,kBAAmB,EAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5E,kBAAE,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;AAC9C,CAAC,CAAC;AAIE,0BAAO"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,8EAAsD;AAyBlD,0BAzBG,yBAAe,CAyBH;AAxBnB,kEAA0C;AA0BtC,oBA1BG,mBAAS,CA0BH;AAzBb,gEAAmD;AAwB/C,8BAxBG,kBAAmB,CAwBH;AAvBvB,gDAAwB;AACxB,wDAA0B;AAW1B,MAAM,OAAO,GAAG,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,GAAG,KAAK,EAAW,EAAE,EAAE;IAC5F,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,cAAc,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IACrE,MAAM,OAAO,GAAG,IAAA,mBAAS,EAAC,OAAO,CAAC,CAAC;IACnC,MAAM,MAAM,GAAG,IAAA,kBAAmB,EAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5E,kBAAE,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;AAC9C,CAAC,CAAC;AAIE,0BAAO"}

package/lib/utils/compiler.d.ts

@@ -1,3 +1,3 @@
 import sass from 'sass';
-declare const compile: (entryScssPath: string, isMin?: boolean) => sass.Result;
+declare const compile: (entryScssPath: string, isMin?: boolean) => sass.LegacyResult;
 export default compile;

package/lib/utils/compiler.js

@@ -5,7 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const sass_1 = __importDefault(require("sass"));
 const compile = (entryScssPath, isMin = false) => {
-    const result = sass_1.default.renderSync({ file: entryScssPath, outputStyle: isMin ? 'compressed' : 'expanded' });
+    const result = sass_1.default.renderSync({
+        file: entryScssPath,
+        outputStyle: isMin ? 'compressed' : 'expanded',
+        charset: false
+    });
     return result;
 };
 exports.default = compile;

package/lib/utils/compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../src/utils/compiler.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAGxB,MAAM,OAAO,GAAG,CAAC,aAAqB,EAAE,QAAiB,KAAK,EAAE,EAAE;IAC9D,MAAM,MAAM,GAAG,cAAI,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;IACxG,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../src/utils/compiler.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AAGxB,MAAM,OAAO,GAAG,CAAC,aAAqB,EAAE,QAAiB,KAAK,EAAE,EAAE;IAC9D,MAAM,MAAM,GAAG,cAAI,CAAC,UAAU,CAAC;QAC3B,IAAI,EAAE,aAAa;QACnB,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAAU;QAC9C,OAAO,EAAE,KAAK;KACjB,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/lib/utils/generateSCSSMap.js

@@ -42,7 +42,7 @@ const generateThemeScssMap = (themePath) => {
         const scssAbsolutePath = path_1.default.join(themePath, 'scss', fileName);
         if (fs_extra_1.default.existsSync(scssAbsolutePath)) {
             //in theme folder
-            themeScssMap[fileName] = fs_extra_1.default.readFileSync(scssAbsolutePath, { encoding: "utf8" });
+            themeScssMap[fileName] = fs_extra_1.default.readFileSync(scssAbsolutePath, { encoding: 'utf8' });
         }
     }
     // console.log(themeScssMap)

package/lib/utils/writeFile.d.ts

@@ -1,3 +1,3 @@
-import generateScssMap from "./generateSCSSMap";
+import generateScssMap from './generateSCSSMap';
 declare const writeFile: (scssMap: ReturnType<typeof generateScssMap>, tempDir?: string) => string;
 export default writeFile;

package/lib/utils/writeFile.js

@@ -22,7 +22,7 @@ const writeThemeScss = (scssMap, tempDir) => {
     const themeDirPath = path_1.default.join(tempDir, 'theme');
     fs_extra_1.default.emptyDirSync(themeDirPath);
     for (const scssFileName of Object.keys(scssMap)) {
-        fs_extra_1.default.writeFileSync(path_1.default.join(themeDirPath, scssFileName), scssMap[scssFileName], { encoding: "utf8" });
+        fs_extra_1.default.writeFileSync(path_1.default.join(themeDirPath, scssFileName), scssMap[scssFileName], { encoding: 'utf8' });
     }
     return;
 };
@@ -48,27 +48,27 @@ const preProcessScssMap = (scssMapOrigin) => {
     compilerEntryContent += `@import "./components/input/textarea.scss";\n`;
     //----- generate entry end -----
     //----- inject component token file local.scss to component's variables.scss -----
-    const themeLocalRaw = scssMap.theme["local.scss"];
+    const themeLocalRaw = scssMap.theme['local.scss'];
     if (themeLocalRaw) {
         for (const componentName of Object.keys(scssMap['components'])) {
-            if (scssMap["components"][componentName]['variables.scss']) {
-                scssMap["components"][componentName]['variables.scss'] += `\n\n\n\n//inject custom theme variables\n${themeLocalRaw}`;
+            if (scssMap['components'][componentName]['variables.scss']) {
+                scssMap['components'][componentName]['variables.scss'] += `\n\n\n\n//inject custom theme variables\n${themeLocalRaw}`;
             }
         }
     }
     //----- inject end -----
     return Object.assign({
-        components: scssMap["components"],
+        components: scssMap['components'],
         theme: lodash.omit(scssMap['theme'], 'local.scss')
     }, { index: compilerEntryContent });
 };
 const writeFile = (scssMap, tempDir = path_1.default.join(os_1.default.tmpdir(), `semi_scss_compile_${Date.now()}`)) => {
     fs_extra_1.default.emptyDirSync(tempDir);
     const finalScssMapWaitForCompiling = preProcessScssMap(scssMap);
-    writeComponentScss(finalScssMapWaitForCompiling["components"], tempDir);
+    writeComponentScss(finalScssMapWaitForCompiling['components'], tempDir);
     writeThemeScss(finalScssMapWaitForCompiling['theme'], tempDir);
     //write compile entry
-    fs_extra_1.default.writeFileSync(path_1.default.join(tempDir, 'index.scss'), finalScssMapWaitForCompiling['index'], { encoding: "utf8" });
+    fs_extra_1.default.writeFileSync(path_1.default.join(tempDir, 'index.scss'), finalScssMapWaitForCompiling['index'], { encoding: 'utf8' });
     return tempDir;
 };
 exports.default = writeFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@douyinfe/semi-scss-compile",
-  "version": "2.1.3",
+  "version": "2.2.0-beta.0",
   "description": "compile semi scss to css",
   "author": "daiqiang@bytedance.com",
   "license": "MIT",
@@ -25,13 +25,12 @@
     "arg": "^5.0.1",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.21",
-    "sass": "^1.43.4"
+    "sass": "^1.45.0"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.176",
-    "@types/sass": "^1.43.0",
     "rimraf": "^3.0.2",
     "typescript": "^4.4.4"
   },
-  "gitHead": "a11f15ed646efd74e254932f9ee63ad557bb1e80"
+  "gitHead": "e8ea6a96a5ddd73a178a797548497cd6a64eb14b"
 }

package/src/bin.ts

@@ -1,27 +1,33 @@
 #!/usr/bin/env node
 
-import arg from "arg";
-import { compile } from "./index";
+import arg from 'arg';
+import { compile } from './index';
 
 const main = () => {
     const userArgs = arg({
-        "--foundation": String,
-        "--theme": String,
-        "--output": String,
-        "--icon":String,
-        "--min": Boolean,
+        '--foundation': String,
+        '--theme': String,
+        '--output': String,
+        '--icon': String,
+        '--min': Boolean,
 
-        "-f": "--foundation",
-        "-t": "--theme",
-        "-i":"--icon",
-        "-o": "--output",
-        "-m": "--min"
-    }, {permissive: true});
-    const {"--foundation": foundationPath, '--theme': themePath, '--output': outputPath,'--icon':iconPath,'--min': isMin} = userArgs;
+        '-f': '--foundation',
+        '-t': '--theme',
+        '-i': '--icon',
+        '-o': '--output',
+        '-m': '--min'
+    }, { permissive: true });
+    const {
+        '--foundation': foundationPath,
+        '--theme': themePath,
+        '--output': outputPath,
+        '--icon': iconPath,
+        '--min': isMin
+    } = userArgs;
     console.log(`foundationPath: ${foundationPath},\nthemePath: ${themePath},\noutputPath: ${outputPath}\n`);
     if (foundationPath && themePath && iconPath && outputPath) {
         compile({
-            foundationPath,themePath,iconPath,outputPath,isMin
+            foundationPath, themePath, iconPath, outputPath, isMin
         });
     } else {
         console.error('Error: lack of args.');

package/src/index.ts

@@ -1,7 +1,7 @@
-import generateScssMap from "./utils/generateSCSSMap";
-import writeFile from "./utils/writeFile";
-import compilerFromScssMap from "./utils/compiler";
-import path from "path";
+import generateScssMap from './utils/generateSCSSMap';
+import writeFile from './utils/writeFile';
+import compilerFromScssMap from './utils/compiler';
+import path from 'path';
 import fs from 'fs-extra';
 
 
@@ -13,9 +13,9 @@ export interface Options {
     isMin?: boolean,
 }
 
-const compile = ({foundationPath, themePath, iconPath, outputPath, isMin = false}: Options) => {
+const compile = ({ foundationPath, themePath, iconPath, outputPath, isMin = false }: Options) => {
     const scssMap = generateScssMap(foundationPath, themePath, iconPath);
-    const tempDir = writeFile(scssMap)
+    const tempDir = writeFile(scssMap);
     const result = compilerFromScssMap(path.join(tempDir, 'index.scss'), isMin);
     fs.outputFileSync(outputPath, result.css);
 };

package/src/utils/compiler.ts

@@ -2,7 +2,11 @@ import sass from 'sass';
 
 
 const compile = (entryScssPath: string, isMin: boolean = false) => {
-    const result = sass.renderSync({ file: entryScssPath, outputStyle: isMin ? 'compressed' : 'expanded' });
+    const result = sass.renderSync({
+        file: entryScssPath,
+        outputStyle: isMin ? 'compressed' : 'expanded',
+        charset: false
+    });
     return result;
 };
 

package/src/utils/generateSCSSMap.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import fs from "fs-extra";
+import fs from 'fs-extra';
 import { set } from 'lodash';
 
 const lodash = { set };
@@ -44,7 +44,7 @@ const generateThemeScssMap = (themePath: string) => {
         const scssAbsolutePath = path.join(themePath, 'scss', fileName);
         if (fs.existsSync(scssAbsolutePath)) {
             //in theme folder
-            themeScssMap[fileName] = fs.readFileSync(scssAbsolutePath, { encoding: "utf8" });
+            themeScssMap[fileName] = fs.readFileSync(scssAbsolutePath, { encoding: 'utf8' });
         }
     }
     // console.log(themeScssMap)

package/src/utils/writeFile.ts

@@ -1,8 +1,8 @@
 import fs from 'fs-extra';
 import path from 'path';
 import os from 'os';
-import generateScssMap from "./generateSCSSMap";
-import { cloneDeep, omit } from "lodash";
+import generateScssMap from './generateSCSSMap';
+import { cloneDeep, omit } from 'lodash';
 
 const lodash = { cloneDeep, omit };
 
@@ -22,7 +22,7 @@ const writeThemeScss = (scssMap: (ReturnType<typeof generateScssMap>)['theme'],
     fs.emptyDirSync(themeDirPath);
 
     for (const scssFileName of Object.keys(scssMap)) {
-        fs.writeFileSync(path.join(themeDirPath, scssFileName), scssMap[scssFileName as keyof typeof scssMap] as string, { encoding: "utf8" });
+        fs.writeFileSync(path.join(themeDirPath, scssFileName), scssMap[scssFileName as keyof typeof scssMap] as string, { encoding: 'utf8' });
     }
     return;
 };
@@ -52,11 +52,11 @@ const preProcessScssMap = (scssMapOrigin: ReturnType<typeof generateScssMap>) =>
 
 
     //----- inject component token file local.scss to component's variables.scss -----
-    const themeLocalRaw = scssMap.theme["local.scss"];
+    const themeLocalRaw = scssMap.theme['local.scss'];
     if (themeLocalRaw) {
         for (const componentName of Object.keys(scssMap['components'])) {
-            if (scssMap["components"][componentName]['variables.scss']) {
-                scssMap["components"][componentName]['variables.scss'] += `\n\n\n\n//inject custom theme variables\n${themeLocalRaw}`;
+            if (scssMap['components'][componentName]['variables.scss']) {
+                scssMap['components'][componentName]['variables.scss'] += `\n\n\n\n//inject custom theme variables\n${themeLocalRaw}`;
             }
         }
     }
@@ -64,7 +64,7 @@ const preProcessScssMap = (scssMapOrigin: ReturnType<typeof generateScssMap>) =>
 
     return {
         ...{
-            components: scssMap["components"],
+            components: scssMap['components'],
             theme: lodash.omit(scssMap['theme'], 'local.scss')
         },
         index: compilerEntryContent
@@ -76,10 +76,10 @@ const writeFile = (scssMap: ReturnType<typeof generateScssMap>, tempDir: string
     fs.emptyDirSync(tempDir);
 
     const finalScssMapWaitForCompiling = preProcessScssMap(scssMap);
-    writeComponentScss(finalScssMapWaitForCompiling["components"], tempDir);
+    writeComponentScss(finalScssMapWaitForCompiling['components'], tempDir);
     writeThemeScss(finalScssMapWaitForCompiling['theme'], tempDir);
     //write compile entry
-    fs.writeFileSync(path.join(tempDir, 'index.scss'), finalScssMapWaitForCompiling['index'], { encoding: "utf8" });
+    fs.writeFileSync(path.join(tempDir, 'index.scss'), finalScssMapWaitForCompiling['index'], { encoding: 'utf8' });
     return tempDir;
 };