@varlet/cli 1.23.4-alpha.4 → 1.23.4-alpha.8

package/README.en-US.md

@@ -55,6 +55,32 @@ The `varlet.config.js` in the project root directory is used to manage the speci
 | `analysis` | Document statistics related | _SiteAnalysis_ | `-` |
 | `pc` | PC-side document structure configuration | _SitePC_ | `-` |
 | `mobile` | Mobile document structure configuration | _SiteMobile_ | `-` |
+| `moduleCompatible` | Module compatible config | _Record<string, string>_ | `-` |
+
+#### Module Compatible
+
+Some external dependencies may need to be compatible with module syntax to achieve the purpose of compiling correctly to `commonjs` and `esmodule`. For example, the wording of `esmodule` of `dayjs` is
+
+```js
+import dayjs from 'dayjs/esm'
+```
+
+In order to build `commonjs`, the writing method is
+
+```js
+import * as dayjs from 'dayjs'
+```
+
+In the project, we embrace the first way of writing the `esmodule` module, and make the following configuration for adaptation
+
+```js
+// varlet.config.js
+module.exports = {
+  moduleCompatible: {
+    "import dayjs from 'dayjs/esm'\n": "import * as dayjs from 'dayjs'\n"
+  }
+}
+```
 
 #### SiteThemes
 
@@ -93,7 +119,7 @@ Code snippets are highlighted, based on [highlight.js](https://highlightjs.org/)
 
 | Parameter | Description | Type | Default |
 | ----- | -------------- | -------- | ---------- |
-| `style` | highlight的css地址 | _string_ | `-` |
+| `style` | highlight css link | _string_ | `-` |
 
 #### SiteAnalysis
 
@@ -101,7 +127,7 @@ Statistics related to buried points
 
 | Parameter | Description | Type | Default |
 | ----- | -------------- | -------- | ---------- |
-| `baidu` | 百度统计脚本地址 | _string_ | `-` |
+| `baidu` | Baidu statistics script address | _string_ | `-` |
 
 #### SitePC, SiteMobile
 

package/README.md

@@ -53,6 +53,32 @@ yarn dev
 | `analysis` | 文档统计相关 | _SiteAnalysis_ | `-` |
 | `pc` | pc端文档结构配置 | _SitePC_ | `-` |
 | `mobile` | mobile端文档结构配置 | _SiteMobile_ | `-` |
+| `moduleCompatible` | 模块兼容配置 | _Record<string, string>_ | `-` |
+
+#### 模块适配对象
+
+一些外部依赖可能需要进行模块语法的适配，以达到可以正确编译到`commonjs`和`esmodule`的目的，例如`dayjs`的`esmodule`写法是
+
+```js
+import dayjs from 'dayjs/esm'
+```
+
+而为了构建`commonjs`时的写法是
+
+```js
+import * as dayjs from 'dayjs'
+```
+
+在项目中我们拥抱`esmodule`模块使用第一种写法，并做如下配置进行适配
+
+```js
+// varlet.config.js
+module.exports = {
+  moduleCompatible: {
+    "import dayjs from 'dayjs/esm'\n": "import * as dayjs from 'dayjs'\n"
+  }
+}
+```
 
 #### SiteThemes
 

package/lib/compiler/compileScript.js

@@ -177,7 +177,7 @@ function compileCommonJSEntry(dir, publicDirs) {
                     publicDirs.forEach(function (dirname) {
                         var publicComponent = (0, fsUtils_1.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')");

package/lib/config/vite.config.js

@@ -84,6 +84,7 @@ function inlineCSS(fileName, dir) {
             var cssCode = (0, fs_extra_1.readFileSync)(cssFile, 'utf-8');
             var jsCode = (0, fs_extra_1.readFileSync)(jsFile, 'utf-8');
             var 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)})();";
+            (0, fs_extra_1.copyFileSync)(cssFile, (0, path_1.resolve)(constant_1.LIB_DIR, 'style.css'));
             (0, fs_extra_1.removeSync)(cssFile);
             (0, fs_extra_1.writeFileSync)(jsFile, "" + injectCode + jsCode);
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "1.23.4-alpha.4+0b1d95fc",
+  "version": "1.23.4-alpha.8+c5c2b12f",
   "description": "cli of varlet",
   "bin": {
     "varlet-cli": "./lib/index.js"
@@ -31,7 +31,7 @@
     "dev": "tsc --watch",
     "build": "tsc"
   },
-  "gitHead": "0b1d95fc740a225240ee3f28e06015f4538b2304",
+  "gitHead": "c5c2b12f163bed130b3c6c0ee0eb805fe4a015f1",
   "dependencies": {
     "@babel/core": "^7.14.8",
     "@babel/preset-env": "^7.14.8",