dumi 2.3.0-alpha.8 → 2.3.0-alpha.9

package/dist/client/theme-api/evalCode.js

@@ -12,6 +12,6 @@ export var evalCode = function evalCode(code, scope) {
   var scopeValues = scopeKeys.map(function (key) {
     return scope[key];
   });
-  var importReg = /import.*from.*;/g;
+  var importReg = /import[\S\s]*?from.*;/g;
   return _construct(Function, scopeKeys.concat([code.replace(importReg, '').replace('export default', 'return').trim()])).apply(void 0, _toConsumableArray(scopeValues));
 };

package/dist/loaders/markdown/index.js

@@ -135,7 +135,7 @@ export const texts = {{{texts}}};`,
 }
 function emitScope(opts, ret) {
   const { demos } = ret.meta;
-  const importReg = /import(?!(\stype)).*from.*;/g;
+  const importReg = /import(?!(\stype|\s'))[\s\S]*?from.*;/g;
   return import_plugin_utils.Mustache.render(
     `{{#renderImport}}
 {{{.}}}
@@ -160,9 +160,9 @@ export const scopes = {
                 const fileImports = file.value.match(importReg) || [];
                 fileImports.forEach((item) => {
                   var _a;
-                  const scope = item.replace(/import(.*)from.*;/, "$1").trim();
-                  const dep = item.replace(/import.*from(.*);/, "$1").trim();
-                  const namedReg = /.*\{(.*)}/g;
+                  const scope = item.replace(/import([\s\S]*?)from.*;/, "$1").trim();
+                  const dep = item.replace(/import[\s\S]*?from(.*);/, "$1").trim();
+                  const namedReg = /.*\{([\s\S]*?)}/g;
                   const namedScope = namedReg.test(scope) ? scope.replace(namedReg, "$1").split(",").map((item2) => item2.trim()).filter(Boolean) : [];
                   const defaultReg = /(?:(?![,{]).)*/;
                   const defaultScope = (_a = scope.match(defaultReg)) == null ? void 0 : _a[0].trim();
@@ -198,8 +198,8 @@ export const scopes = {
           if (filename.endsWith(".tsx")) {
             const imports = file.value.match(importReg) || [];
             const scopes = imports.reduce((acc, item) => {
-              const scope = item.replace(/import(.*)from.*;/, "$1").trim();
-              const scopeList = scope.replace(/[{}]/g, "").trim();
+              const scope = item.replace(/import([\s\S]*?)from.*;/, "$1").trim();
+              const scopeList = scope.replace(/[{}]/g, "").trim().replace(/,$/g, "").replace(/\S+\sas\s(.*?)/g, "$1");
               return [...acc, scopeList];
             }, []);
             demoScopes.push(...scopes);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.3.0-alpha.8",
+  "version": "2.3.0-alpha.9",
   "description": "📖 Documentation Generator of React Component",
   "keywords": [
     "generator",