fix(cli): fix commonjs compiler

affects: @varlet/cli
varletjs · Nov 20, 2021 · c5c2b12 · c5c2b12
1 parent c51625b
commit c5c2b12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/varlet-cli/src/compiler/compileScript.ts b/packages/varlet-cli/src/compiler/compileScript.ts
@@ -169,7 +169,7 @@ export async function compileCommonJSEntry(dir: string, publicDirs: string[]) {
     const publicComponent = bigCamelize(dirname)
 
     publicComponents.push(publicComponent)
-    requires.push(`const ${publicComponent} = require('./${dirname}')`)
+    requires.push(`var ${publicComponent} = require('./${dirname}')['default']`)
     plugins.push(`${publicComponent}.install && app.use(${publicComponent})`)
     cssRequires.push(`require('./${dirname}/style')`)
     lessRequires.push(`require('./${dirname}/style/less')`)

diff --git a/packages/varlet-cli/src/config/vite.config.ts b/packages/varlet-cli/src/config/vite.config.ts
@@ -5,6 +5,7 @@ import { injectHtml } from 'vite-plugin-html'
 import {
   CWD,
   ES_DIR,
+  LIB_DIR,
   SITE_CONFIG,
   SITE_DIR,
   SITE_MOBILE_ROUTES,
@@ -17,7 +18,7 @@ import {
 import { InlineConfig, PluginOption } from 'vite'
 import { get, kebabCase } from 'lodash'
 import { resolve } from 'path'
-import { readFileSync, removeSync, writeFileSync } from 'fs-extra'
+import { copyFileSync, readFileSync, removeSync, writeFileSync } from 'fs-extra'
 
 export function getDevConfig(varletConfig: Record<string, any>): InlineConfig {
   const defaultLanguage = get(varletConfig, 'defaultLanguage')
@@ -88,6 +89,7 @@ function inlineCSS(fileName: string, dir: string): PluginOption {
       const injectCode = `;(function(){var style=document.createElement('style');style.type='text/css';\
 style.rel='stylesheet';style.appendChild(document.createTextNode(\`${cssCode.replace(/\\/g, '\\\\')}\`));\
 var head=document.querySelector('head');head.appendChild(style)})();`
+      copyFileSync(cssFile, resolve(LIB_DIR, 'style.css'))
       removeSync(cssFile)
       writeFileSync(jsFile, `${injectCode}${jsCode}`)
     },