dumi 2.0.0-rc.6 → 2.0.0-rc.8

package/compiled/@umijs/plugins/index.js

@@ -0,0 +1 @@
+(function(){var e={226:function(e){var n=Object.defineProperty;var t=Object.getOwnPropertyDescriptor;var r=Object.getOwnPropertyNames;var a=Object.prototype.hasOwnProperty;var __export=(e,t)=>{for(var r in t)n(e,r,{get:t[r],enumerable:true})};var __copyProps=(e,o,i,c)=>{if(o&&typeof o==="object"||typeof o==="function"){for(let s of r(o))if(!a.call(e,s)&&s!==i)n(e,s,{get:()=>o[s],enumerable:!(c=t(o,s))||c.enumerable})}return e};var __toCommonJS=e=>__copyProps(n({},"__esModule",{value:true}),e);var o={};__export(o,{default:()=>analytics_default});e.exports=__toCommonJS(o);var analytics_default=e=>{const n=process.env.GA_KEY;const t=process.env.GA_V2_KEY;const enableBy=e=>e.config.analytics||n;e.describe({key:"analytics",config:{schema(e){return e.alternatives().try(e.object({baidu:e.string(),ga:e.string(),ga_v2:e.string()}),e.boolean().invalid(true))},onChange:e.ConfigChangeType.reload},enableBy:enableBy});const baiduTpl=e=>`\n    (function() {\n      var hm = document.createElement('script');\n      hm.src = '//hm.baidu.com/hm.js?${e}';\n      var s = document.getElementsByTagName('script')[0];\n      s.parentNode.insertBefore(hm, s);\n    })();\n  `;const gaTpl=e=>`\n    (function(){\n      if (!location.port) {\n        (function (i, s, o, g, r, a, m) {\n          i['GoogleAnalyticsObject'] = r;\n          i[r] = i[r] || function () {\n              (i[r].q = i[r].q || []).push(arguments)\n            }, i[r].l = 1 * new Date();\n          a = s.createElement(o),\n            m = s.getElementsByTagName(o)[0];\n          a.async = 1;\n          a.src = g;\n          m.parentNode.insertBefore(a, m)\n        })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');\n        ga('create', '${e}', 'auto');\n        ga('send', 'pageview');\n      }\n    })();\n  `;const gaV2Tpl=e=>`\n      window.dataLayer = window.dataLayer || [];\n      function gtag(){dataLayer.push(arguments);}\n      gtag('js', new Date());\n      gtag('config', '${e}');\n    `.trim();e.addHTMLHeadScripts((()=>{const r=e.config.analytics||{};const{baidu:a,ga:o=n,ga_v2:i=t}=r;const c=[];if(a){c.push({content:"var _hmt = _hmt || [];"})}if(e.env!=="development"){if(a){c.push({content:baiduTpl(a)})}if(o){c.push({content:gaTpl(o)})}if(i){c.push({async:true,src:`//www.googletagmanager.com/gtag/js?id=${i}`},{content:gaV2Tpl(i)})}}return c.filter(Boolean)}))};0&&0}};var n={};function __nccwpck_require__(t){var r=n[t];if(r!==undefined){return r.exports}var a=n[t]={exports:{}};var o=true;try{e[t](a,a.exports,__nccwpck_require__);o=false}finally{if(o)delete n[t]}return a.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(226);module.exports=t})();

package/compiled/@umijs/plugins/package.json

@@ -0,0 +1 @@
+{"name":"@umijs/plugins","version":"4.0.30","authors":["chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"],"license":"MIT","_lastModified":"2022-11-13T07:05:33.094Z"}

package/dist/features/derivative.js

@@ -118,7 +118,7 @@ var derivative_default = (api) => {
       }
     }
   });
-  api.registerPlugins([require.resolve("@umijs/plugins/dist/analytics")]);
+  api.registerPlugins([require.resolve("../../compiled/@umijs/plugins")]);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/features/routes.js

@@ -44,10 +44,10 @@ function localizeUmiRoute(route, locales) {
     route.absPath = route.path !== "/" ? `/${route.path}` : route.path;
   }
 }
-function flatRoute(route) {
-  if (route.parentId !== "DocLayout") {
-    route.parentId = "DocLayout";
-    route.path = route.path === "*" ? route.path.toLowerCase() : route.absPath.slice(1).toLowerCase();
+function flatRoute(route, docLayoutId) {
+  if (route.parentId !== docLayoutId) {
+    route.parentId = docLayoutId;
+    route.path = route.path === "*" ? route.path : route.absPath.slice(1);
   }
 }
 function getClientPageFile(file, cwd) {
@@ -121,8 +121,6 @@ var routes_default = (api) => {
     }
     Object.entries(pages).forEach(([, route]) => {
       route.file = (0, import_plugin_utils.winPath)(import_path.default.resolve(api.config.conventionRoutes.base, route.file));
-      flatRoute(route);
-      localizeUmiRoute(route, api.config.locales);
       routes[route.id] = route;
     });
     docDirs.map(normalizeDocDir).forEach(({ type, dir }) => {
@@ -133,14 +131,12 @@ var routes_default = (api) => {
       });
       Object.entries(dirRoutes).forEach(([key, route]) => {
         route.id = `${dir}/${key}`;
-        flatRoute(route);
         if (type) {
           const pluralType = (0, import_pluralize.plural)(type);
           route.path = `${pluralType}/${route.path}`.replace(/\/+$/, "/");
           route.absPath = `/${route.path}`;
         }
         route.file = (0, import_plugin_utils.winPath)(import_path.default.resolve(base, route.file));
-        localizeUmiRoute(route, api.config.locales);
         routes[route.id] = route;
       });
     });
@@ -148,7 +144,7 @@ var routes_default = (api) => {
       const base = import_path.default.join(api.cwd, dir);
       const atomFiles = import_plugin_utils.glob.sync("{*,*/index,*/index.*,*/README,*/README.*}.md", { cwd: base });
       atomFiles.forEach((file) => {
-        const routePath = (0, import_plugin_utils.winPath)(import_path.default.join((0, import_pluralize.plural)(type), file)).replace(/(\/index|\/README)?\.md$/, "").replace(/\./g, "/").toLowerCase();
+        const routePath = (0, import_plugin_utils.winPath)(import_path.default.join((0, import_pluralize.plural)(type), file)).replace(/(\/index|\/README)?\.md$/, "").replace(/\./g, "/");
         const routeId = (0, import_utils.createRouteId)(file);
         routes[routeId] = {
           id: routeId,
@@ -157,9 +153,19 @@ var routes_default = (api) => {
           parentId: docLayoutId,
           file: (0, import_plugin_utils.winPath)(import_path.default.resolve(base, file))
         };
-        localizeUmiRoute(routes[routeId], api.config.locales);
       });
     });
+    Object.values(routes).forEach((route) => {
+      if (route.path !== encodeURI(route.path)) {
+        throw new Error(`Invalid route path: ${route.path}, please rename it with only alphanumeric, dash and slash.
+    at ${route.file}`);
+      } else if (!route.isLayout) {
+        flatRoute(route, docLayoutId);
+        localizeUmiRoute(route, api.config.locales);
+        route.path = route.path.toLowerCase();
+        route.absPath = route.absPath.toLowerCase();
+      }
+    });
     if (Object.values(pages).every((route) => route.path !== "*")) {
       routes["404"] = {
         id: "404",
@@ -176,12 +182,6 @@ var routes_default = (api) => {
       parentId: demoLayoutId,
       file: getClientPageFile("client/pages/Demo", api.cwd)
     };
-    Object.values(routes).forEach((route) => {
-      if (route.path !== encodeURI(route.path)) {
-        throw new Error(`Invalid route path: ${route.path}, please rename it with only alphanumeric, dash and slash.
-    at ${route.file}`);
-      }
-    });
     return routes;
   });
   api.addLayouts(() => {

package/dist/features/theme/loader.js

@@ -30,10 +30,12 @@ var import_plugin_utils = require("umi/plugin-utils");
 function getComponentMapFromDir(globExp, dir) {
   return import_plugin_utils.glob.sync(globExp, { cwd: dir }).reduce((ret, file) => {
     const specifier = import_path.default.basename(file.replace(/(\/index)?\.[a-z]+$/, ""));
-    ret[specifier] = {
-      specifier,
-      source: (0, import_plugin_utils.winPath)(import_path.default.join(dir, file))
-    };
+    if (/^[A-Z\d]/.test(specifier)) {
+      ret[specifier] = {
+        specifier,
+        source: (0, import_plugin_utils.winPath)(import_path.default.join(dir, file))
+      };
+    }
     return ret;
   }, {});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dumi",
-  "version": "2.0.0-rc.6",
+  "version": "2.0.0-rc.8",
   "description": "Framework for developing UI components",
   "keywords": [],
   "license": "MIT",
@@ -59,7 +59,6 @@
     "@types/mdast": "^3.0.10",
     "@umijs/bundler-utils": "^4.0.30",
     "@umijs/core": "^4.0.30",
-    "@umijs/plugins": "^4.0.30",
     "codesandbox": "^2.2.3",
     "deepmerge": "^4.2.2",
     "dumi-afx-deps": "^1.0.0-alpha.1",
@@ -118,6 +117,7 @@
     "@types/react-copy-to-clipboard": "^5.0.4",
     "@types/react-helmet": "^6.1.5",
     "@umijs/lint": "^4.0.30",
+    "@umijs/plugins": "^4.0.30",
     "eslint": "^8.20.0",
     "father": "^4.1.0",
     "husky": "^8.0.1",