fix(cli ui): 统一给每个包增加另一个style入口方便babel-import-plugin解析

affects: @varlet/cli, @varlet/ui
varletjs · Nov 27, 2020 · cd1ef49 · cd1ef49
1 parent 77b4174
commit cd1ef49
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/packages/varlet-cli/src/compiler/compileCJS.ts b/packages/varlet-cli/src/compiler/compileCJS.ts
@@ -4,14 +4,16 @@ import { CJS_DIR, SRC_DIR } from '../shared/constant'
 import { getComponentNames, getExportDirNames, isDir } from '../shared/fsUtils'
 import { compileComponent } from './compileComponent'
 import { compileLibraryEntry } from './compileScript'
+import { buildStyleEntry } from './compileStyle'
 
 export async function compileCJS() {
   await copy(SRC_DIR, CJS_DIR)
   const cjsDir: string[] = await readdir(CJS_DIR)
   await Promise.all(
     cjsDir.map((filename: string) => {
       const path: string = resolve(CJS_DIR, filename)
-      return isDir(path) ? compileComponent(path, 'cjs') : null
+      isDir(path) && buildStyleEntry(path)
+      return isDir(path) ? compileComponent(path) : null
     })
   )
   compileLibraryEntry(CJS_DIR, await getComponentNames(), await getExportDirNames(), 'cjs')

diff --git a/packages/varlet-cli/src/compiler/compileComponent.ts b/packages/varlet-cli/src/compiler/compileComponent.ts
@@ -6,11 +6,11 @@ import { resolve } from 'path'
 import { compileScriptFile } from './compileScript'
 import { compileLess } from './compileStyle'
 
-export async function compileComponent(path: string, modules: string | boolean = false) {
-  const dirs = await readdir(path)
+export async function compileComponent(dir: string, modules: string | boolean = false) {
+  const dirs = await readdir(dir)
   await Promise.all(
     dirs.map((filename) => {
-      const filePath = resolve(path, filename)
+      const filePath = resolve(dir, filename)
       ;[TESTS_DIR_NAME, EXAMPLE_DIR_NAME, DOCS_DIR_NAME].includes(filename) && removeSync(filePath)
       return compileFile(filePath, modules)
     })

diff --git a/packages/varlet-cli/src/compiler/compileES.ts b/packages/varlet-cli/src/compiler/compileES.ts
@@ -4,13 +4,16 @@ import { ES_DIR, SRC_DIR } from '../shared/constant'
 import { getComponentNames, getExportDirNames, isDir } from '../shared/fsUtils'
 import { compileComponent } from './compileComponent'
 import { compileLibraryEntry } from './compileScript'
+import { buildStyleEntry } from './compileStyle'
 
 export async function compileES() {
   await copy(SRC_DIR, ES_DIR)
   const esDir: string[] = await readdir(ES_DIR)
+
   await Promise.all(
     esDir.map((filename: string) => {
       const path: string = resolve(ES_DIR, filename)
+      isDir(path) && buildStyleEntry(path)
       return isDir(path) ? compileComponent(path) : null
     })
   )

diff --git a/packages/varlet-cli/src/compiler/compileStyle.ts b/packages/varlet-cli/src/compiler/compileStyle.ts
@@ -29,6 +29,14 @@ export async function compileLess(path: string) {
   writeFileSync(replaceExt(path, '.css'), clearEmptyLine(css), 'utf-8')
 }
 
+export function buildStyleEntry(dir: string) {
+  const styleDir: string = resolve(dir, './style')
+  const styleIndex: string = resolve(dir, './style/index.js')
+
+  !pathExistsSync(styleDir) && mkdirSync(styleDir)
+  !pathExistsSync(styleIndex) && writeFileSync(styleIndex, '', 'utf-8')
+}
+
 export function emitStyleEntry(path: string, modules: string | boolean = false) {
   const { ext, dir, base } = parse(path)
   const styleDir: string = resolve(dir, './style')

diff --git a/packages/varlet-ui/src/skeleton/Skeleton.vue b/packages/varlet-ui/src/skeleton/Skeleton.vue
@@ -35,7 +35,7 @@
           </div>
           <div
             class="varlet-skeleton__row"
-            v-for="(r, index) in row"
+            v-for="(r, index) in Array.from({ length: row - 1 })"
             :key="r"
             :style="{ width: rowWidth[index] }"
           >