@modern-js/plugin-data-loader 2.0.1 → 2.0.3-alpha.0

package/dist/js/modern/cli/generate-client.js

@@ -1,22 +1,32 @@
 import path from "path";
-const generateClient = ({ mapFile }) => {
+const generateClient = ({ mapFile, loaderId }) => {
   delete require.cache[mapFile];
   const loadersMap = require(mapFile);
-  const requestCode = Object.keys(loadersMap).map((loaderId) => {
-    const routeId = loadersMap[loaderId];
-    return `
-      const ${loaderId} = createRequest('${routeId}');
-    `;
-  }).join("");
-  let exportsCode = `export {`;
-  for (const loader of Object.keys(loadersMap)) {
-    exportsCode += `${loader},`;
-  }
-  exportsCode += "}";
+  let requestCode = ``;
+  let exportsCode = ``;
   const requestCreatorPath = path.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';
   `;
+  if (!loaderId) {
+    requestCode = Object.keys(loadersMap).map((loaderId2) => {
+      const routeId = loadersMap[loaderId2].routeId;
+      return `
+      const ${loaderId2} = createRequest('${routeId}');
+    `;
+    }).join("");
+    exportsCode = `export {`;
+    for (const loader of Object.keys(loadersMap)) {
+      exportsCode += `${loader},`;
+    }
+    exportsCode += "}";
+  } else {
+    const loader = loadersMap[loaderId];
+    requestCode = `
+      const loader = createRequest('${loader.routeId}');
+    `;
+    exportsCode = `export default loader;`;
+  }
   const generatedCode = `
     ${importCode}
     ${requestCode}

package/dist/js/modern/cli/loader.js

@@ -29,7 +29,8 @@ function loader(source) {
     }
     const options = this.getOptions();
     const code = generateClient({
-      mapFile: options.mapFile
+      mapFile: options.mapFile,
+      loaderId: options.loaderId
     });
     return code;
   });

package/dist/js/modern/server/index.js

@@ -46,7 +46,7 @@ import {
 import {
   matchRoutes
 } from "react-router-dom";
-import { LOADER_ROUTES_DIR, MAIN_ENTRY_NAME } from "@modern-js/utils";
+import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
 import { LOADER_ID_PARAM } from "../common/constants";
 installGlobals();
 const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
@@ -160,8 +160,8 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   }
   const routesPath = path.join(
     distDir,
-    LOADER_ROUTES_DIR,
-    entry.entryName || MAIN_ENTRY_NAME
+    SERVER_BUNDLE_DIRECTORY,
+    `${entry.entryName || MAIN_ENTRY_NAME}-server-loaders`
   );
   const { routes } = yield import(routesPath);
   if (!routes) {

package/dist/js/node/cli/generate-client.js

@@ -27,24 +27,34 @@ __export(generate_client_exports, {
 });
 module.exports = __toCommonJS(generate_client_exports);
 var import_path = __toESM(require("path"));
-const generateClient = ({ mapFile }) => {
+const generateClient = ({ mapFile, loaderId }) => {
   delete require.cache[mapFile];
   const loadersMap = require(mapFile);
-  const requestCode = Object.keys(loadersMap).map((loaderId) => {
-    const routeId = loadersMap[loaderId];
-    return `
-      const ${loaderId} = createRequest('${routeId}');
-    `;
-  }).join("");
-  let exportsCode = `export {`;
-  for (const loader of Object.keys(loadersMap)) {
-    exportsCode += `${loader},`;
-  }
-  exportsCode += "}";
+  let requestCode = ``;
+  let exportsCode = ``;
   const requestCreatorPath = import_path.default.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';
   `;
+  if (!loaderId) {
+    requestCode = Object.keys(loadersMap).map((loaderId2) => {
+      const routeId = loadersMap[loaderId2].routeId;
+      return `
+      const ${loaderId2} = createRequest('${routeId}');
+    `;
+    }).join("");
+    exportsCode = `export {`;
+    for (const loader of Object.keys(loadersMap)) {
+      exportsCode += `${loader},`;
+    }
+    exportsCode += "}";
+  } else {
+    const loader = loadersMap[loaderId];
+    requestCode = `
+      const loader = createRequest('${loader.routeId}');
+    `;
+    exportsCode = `export default loader;`;
+  }
   const generatedCode = `
     ${importCode}
     ${requestCode}

package/dist/js/node/cli/loader.js

@@ -51,7 +51,8 @@ function loader(source) {
     }
     const options = this.getOptions();
     const code = (0, import_generate_client.generateClient)({
-      mapFile: options.mapFile
+      mapFile: options.mapFile,
+      loaderId: options.loaderId
     });
     return code;
   });

package/dist/js/node/server/index.js

@@ -184,8 +184,8 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   }
   const routesPath = import_path.default.join(
     distDir,
-    import_utils.LOADER_ROUTES_DIR,
-    entry.entryName || import_utils.MAIN_ENTRY_NAME
+    import_utils.SERVER_BUNDLE_DIRECTORY,
+    `${entry.entryName || import_utils.MAIN_ENTRY_NAME}-server-loaders`
   );
   const { routes } = yield Promise.resolve().then(() => __toESM(require(routesPath)));
   if (!routes) {

package/dist/js/treeshaking/cli/generate-client.js

@@ -1,36 +1,44 @@
 import path from "path";
 var generateClient = function(param) {
-    var mapFile = param.mapFile;
+    var mapFile = param.mapFile, loaderId = param.loaderId;
     delete require.cache[mapFile];
     var loadersMap = require(mapFile);
-    var requestCode = Object.keys(loadersMap).map(function(loaderId) {
-        var routeId = loadersMap[loaderId];
-        return "\n      const ".concat(loaderId, " = createRequest('").concat(routeId, "');\n    ");
-    }).join("");
-    var exportsCode = "export {";
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = Object.keys(loadersMap)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var loader = _step.value;
-            exportsCode += "".concat(loader, ",");
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
+    var requestCode = "";
+    var exportsCode = "";
+    var requestCreatorPath = path.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
+    var importCode = "\n    import { createRequest } from '".concat(requestCreatorPath, "';\n  ");
+    if (!loaderId) {
+        requestCode = Object.keys(loadersMap).map(function(loaderId2) {
+            var routeId = loadersMap[loaderId2].routeId;
+            return "\n      const ".concat(loaderId2, " = createRequest('").concat(routeId, "');\n    ");
+        }).join("");
+        exportsCode = "export {";
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
+            for(var _iterator = Object.keys(loadersMap)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var loader = _step.value;
+                exportsCode += "".concat(loader, ",");
             }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
         } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
             }
         }
+        exportsCode += "}";
+    } else {
+        var loader1 = loadersMap[loaderId];
+        requestCode = "\n      const loader = createRequest('".concat(loader1.routeId, "');\n    ");
+        exportsCode = "export default loader;";
     }
-    exportsCode += "}";
-    var requestCreatorPath = path.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
-    var importCode = "\n    import { createRequest } from '".concat(requestCreatorPath, "';\n  ");
     var generatedCode = "\n    ".concat(importCode, "\n    ").concat(requestCode, "\n    ").concat(exportsCode, "\n  ");
     return generatedCode;
 };

package/dist/js/treeshaking/cli/loader.js

@@ -140,7 +140,8 @@ function _loader() {
             }
             options = this.getOptions();
             code = generateClient({
-                mapFile: options.mapFile
+                mapFile: options.mapFile,
+                loaderId: options.loaderId
             });
             return [
                 2,

package/dist/js/treeshaking/server/index.js

@@ -223,7 +223,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
 import path from "path";
 import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
 import { matchRoutes } from "react-router-dom";
-import { LOADER_ROUTES_DIR, MAIN_ENTRY_NAME } from "@modern-js/utils";
+import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
 import { LOADER_ID_PARAM } from "../common/constants";
 installGlobals();
 var redirectStatusCodes = /* @__PURE__ */ new Set([
@@ -455,7 +455,7 @@ var handleRequest = function() {
                             2
                         ];
                     }
-                    routesPath = path.join(distDir, LOADER_ROUTES_DIR, entry.entryName || MAIN_ENTRY_NAME);
+                    routesPath = path.join(distDir, SERVER_BUNDLE_DIRECTORY, "".concat(entry.entryName || MAIN_ENTRY_NAME, "-server-loaders"));
                     return [
                         4,
                         import(routesPath)

package/dist/types/cli/generate-client.d.ts

@@ -1,5 +1,7 @@
 export declare const generateClient: ({
-  mapFile
+  mapFile,
+  loaderId
 }: {
   mapFile: string;
+  loaderId?: string | undefined;
 }) => string;

package/dist/types/cli/loader.d.ts

@@ -1,6 +1,5 @@
 import type { LoaderContext } from 'webpack';
 export default function loader(this: LoaderContext<{
-  routesDir: string;
-  entryName: string;
   mapFile: string;
+  loaderId?: string;
 }>, source: string): Promise<string>;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.1",
+  "version": "2.0.3-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -40,13 +40,18 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
+    "@modern-js/babel-compiler": "2.0.2",
+    "@modern-js/utils": "2.0.2",
     "@remix-run/node": "^1.9.0",
     "path-to-regexp": "^6.2.0",
-    "react-router-dom": "^6.6.0",
-    "@modern-js/utils": "2.0.1",
-    "@modern-js/babel-compiler": "2.0.1"
+    "react-router-dom": "^6.6.0"
   },
   "devDependencies": {
+    "@modern-js/core": "2.0.2",
+    "@modern-js/server-core": "2.0.2",
+    "@modern-js/types": "2.0.2",
+    "@scripts/build": "2.0.2",
+    "@scripts/jest-config": "2.0.2",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^27",
     "@types/node": "^14",
@@ -58,12 +63,7 @@
     "ts-jest": "^27.0.5",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "webpack-chain": "^6.5.1",
-    "@modern-js/core": "2.0.1",
-    "@modern-js/server-core": "2.0.1",
-    "@modern-js/types": "2.0.1",
-    "@scripts/jest-config": "2.0.1",
-    "@scripts/build": "2.0.1"
+    "webpack-chain": "^6.5.1"
   },
   "sideEffects": false,
   "publishConfig": {