@modern-js/plugin-data-loader 0.0.0-next-1692674328976 → 0.0.0-next-1692686860783

package/CHANGELOG.md

@@ -1,43 +1,10 @@
 # @modern-js/plugin-data-loader
 
-## 0.0.0-next-1692674328976
-
-### Minor Changes
-
-- a030aff285: feat: support loader context
-  feat: 支持 loader context
-- 4323e6880d: feat: support client-data file
-  feat: 支持 client-data 文件
-
-### Patch Changes
-
-- 6076166600: fix: packaging errors found by publint
-
-  fix: 修复 publint 检测到的 packaging 问题
-
-- Updated dependencies [6076166600]
-- Updated dependencies [a030aff285]
-  - @modern-js/utils@0.0.0-next-1692674328976
-
-## 2.31.2
-
-### Patch Changes
-
-- Updated dependencies [15d30abdc66]
-  - @modern-js/utils@2.31.2
-
-## 2.31.1
-
-### Patch Changes
-
-- @modern-js/utils@2.31.1
-
-## 2.31.0
+## 0.0.0-next-1692686860783
 
 ### Patch Changes
 
-- Updated dependencies [1882366]
-  - @modern-js/utils@2.31.0
+- @modern-js/utils@0.0.0-next-1692686860783
 
 ## 2.30.0
 

package/dist/cjs/cli/loader.js

@@ -8,8 +8,6 @@ Object.defineProperty(exports, "default", {
     return loader;
   }
 });
-const _util = require("util");
-const _logger = require("@modern-js/utils/logger");
 const _generateClient = require("./generateClient");
 async function loader(source) {
   var _this__compiler;
@@ -35,18 +33,6 @@ async function loader(source) {
   if (!options.mapFile) {
     return source;
   }
-  if (options.clientData) {
-    const readFile = (0, _util.promisify)(this.fs.readFile);
-    try {
-      const clientDataPath = this.resourcePath.includes(".loader.") ? this.resourcePath.replace(".loader.", ".data.client.") : this.resourcePath.replace(".data.", ".data.client.");
-      const clientDataContent = await readFile(clientDataPath);
-      return clientDataContent;
-    } catch (error) {
-      if (process.env.NODE_ENV === "development") {
-        _logger.logger.error(`Failed to read the clientData file ${options.clientData}`);
-      }
-    }
-  }
   const code = (0, _generateClient.generateClient)({
     mapFile: options.mapFile,
     loaderId: options.loaderId

package/dist/cjs/runtime/index.js

@@ -107,15 +107,12 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
   const { queryRoute } = (0, _remixrouter.createStaticHandler)(routes, {
     basename
   });
-  const { res, logger, reporter } = context;
+  const { res, logger } = context;
   const request = createLoaderRequest(context);
-  const requestContext = (0, _runtimenode.createRequestContext)();
-  requestContext.set(_runtimenode.reporterCtx, reporter);
   let response;
   try {
     response = await queryRoute(request, {
-      routeId,
-      requestContext
+      routeId
     });
     if (isResponse(response) && isRedirectResponse(response.status)) {
       response = convertModernRedirectResponse(response.headers, basename);

package/dist/esm/cli/loader.js

@@ -1,93 +1,53 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { promisify } from "util";
-import { logger } from "@modern-js/utils/logger";
 import { generateClient } from "./generateClient";
 export default function loader(source) {
   return _loader.apply(this, arguments);
 }
 function _loader() {
   _loader = _async_to_generator(function(source) {
-    var _this__compiler, target, resourceQuery, options, readFile, clientDataPath, clientDataContent, error, code;
+    var _this__compiler, target, resourceQuery, options, code;
     return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          this.cacheable();
-          target = (_this__compiler = this._compiler) === null || _this__compiler === void 0 ? void 0 : _this__compiler.options.target;
-          if (target === "node") {
-            return [
-              2,
-              source
-            ];
-          }
-          if (target === "webworker") {
-            return [
-              2,
-              source
-            ];
-          }
-          resourceQuery = this.resourceQuery;
-          options = resourceQuery.slice(1).split("&").map(function(item) {
-            return item.split("=");
-          }).reduce(function(pre, cur) {
-            var _cur = _sliced_to_array(cur, 2), key = _cur[0], value = _cur[1];
-            if (!key || !value) {
-              return pre;
-            }
-            pre[key] = value;
-            return pre;
-          }, {});
-          if (!options.mapFile) {
-            return [
-              2,
-              source
-            ];
-          }
-          if (!options.clientData)
-            return [
-              3,
-              4
-            ];
-          readFile = promisify(this.fs.readFile);
-          _state.label = 1;
-        case 1:
-          _state.trys.push([
-            1,
-            3,
-            ,
-            4
-          ]);
-          clientDataPath = this.resourcePath.includes(".loader.") ? this.resourcePath.replace(".loader.", ".data.client.") : this.resourcePath.replace(".data.", ".data.client.");
-          return [
-            4,
-            readFile(clientDataPath)
-          ];
-        case 2:
-          clientDataContent = _state.sent();
-          return [
-            2,
-            clientDataContent
-          ];
-        case 3:
-          error = _state.sent();
-          if (process.env.NODE_ENV === "development") {
-            logger.error("Failed to read the clientData file ".concat(options.clientData));
-          }
-          return [
-            3,
-            4
-          ];
-        case 4:
-          code = generateClient({
-            mapFile: options.mapFile,
-            loaderId: options.loaderId
-          });
-          return [
-            2,
-            code
-          ];
+      this.cacheable();
+      target = (_this__compiler = this._compiler) === null || _this__compiler === void 0 ? void 0 : _this__compiler.options.target;
+      if (target === "node") {
+        return [
+          2,
+          source
+        ];
       }
+      if (target === "webworker") {
+        return [
+          2,
+          source
+        ];
+      }
+      resourceQuery = this.resourceQuery;
+      options = resourceQuery.slice(1).split("&").map(function(item) {
+        return item.split("=");
+      }).reduce(function(pre, cur) {
+        var _cur = _sliced_to_array(cur, 2), key = _cur[0], value = _cur[1];
+        if (!key || !value) {
+          return pre;
+        }
+        pre[key] = value;
+        return pre;
+      }, {});
+      if (!options.mapFile) {
+        return [
+          2,
+          source
+        ];
+      }
+      code = generateClient({
+        mapFile: options.mapFile,
+        loaderId: options.loaderId
+      });
+      return [
+        2,
+        code
+      ];
     });
   });
   return _loader.apply(this, arguments);

package/dist/esm/runtime/index.js

@@ -6,7 +6,7 @@ import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse
 import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/runtime/remix-router";
 import { transformNestedRoutes } from "@modern-js/utils/runtime/nested-routes";
 import { isPlainObject } from "@modern-js/utils/lodash";
-import { matchEntry, createRequestContext, reporterCtx } from "@modern-js/utils/runtime-node";
+import { matchEntry } from "@modern-js/utils/runtime-node";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
 import { createDeferredReadableStream } from "./response";
 installGlobals();
@@ -155,7 +155,7 @@ var sendLoaderResponse = function() {
 }();
 export var handleRequest = function() {
   var _ref = _async_to_generator(function(param) {
-    var context, serverRoutes, routesConfig, method, query, routeId, entry, basename, routes, queryRoute, res, logger, reporter, request, requestContext, response, deferredData, body, init, headers, error, _logger, message;
+    var context, serverRoutes, routesConfig, method, query, routeId, entry, basename, routes, queryRoute, res, logger, request, response, deferredData, body, init, headers, error, _logger, message;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -176,10 +176,8 @@ export var handleRequest = function() {
           queryRoute = createStaticHandler(routes, {
             basename: basename
           }).queryRoute;
-          res = context.res, logger = context.logger, reporter = context.reporter;
+          res = context.res, logger = context.logger;
           request = createLoaderRequest(context);
-          requestContext = createRequestContext();
-          requestContext.set(reporterCtx, reporter);
           _state.label = 1;
         case 1:
           _state.trys.push([
@@ -191,8 +189,7 @@ export var handleRequest = function() {
           return [
             4,
             queryRoute(request, {
-              routeId: routeId,
-              requestContext: requestContext
+              routeId: routeId
             })
           ];
         case 2:

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

@@ -1,5 +1,3 @@
-import { promisify } from "util";
-import { logger } from "@modern-js/utils/logger";
 import { generateClient } from "./generateClient";
 export default async function loader(source) {
   var _this__compiler;
@@ -25,18 +23,6 @@ export default async function loader(source) {
   if (!options.mapFile) {
     return source;
   }
-  if (options.clientData) {
-    const readFile = promisify(this.fs.readFile);
-    try {
-      const clientDataPath = this.resourcePath.includes(".loader.") ? this.resourcePath.replace(".loader.", ".data.client.") : this.resourcePath.replace(".data.", ".data.client.");
-      const clientDataContent = await readFile(clientDataPath);
-      return clientDataContent;
-    } catch (error) {
-      if (process.env.NODE_ENV === "development") {
-        logger.error(`Failed to read the clientData file ${options.clientData}`);
-      }
-    }
-  }
   const code = generateClient({
     mapFile: options.mapFile,
     loaderId: options.loaderId

package/dist/esm-node/runtime/index.js

@@ -2,7 +2,7 @@ import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse
 import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/runtime/remix-router";
 import { transformNestedRoutes } from "@modern-js/utils/runtime/nested-routes";
 import { isPlainObject } from "@modern-js/utils/lodash";
-import { matchEntry, createRequestContext, reporterCtx } from "@modern-js/utils/runtime-node";
+import { matchEntry } from "@modern-js/utils/runtime-node";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
 import { createDeferredReadableStream } from "./response";
 installGlobals();
@@ -85,15 +85,12 @@ export const handleRequest = async ({ context, serverRoutes, routes: routesConfi
   const { queryRoute } = createStaticHandler(routes, {
     basename
   });
-  const { res, logger, reporter } = context;
+  const { res, logger } = context;
   const request = createLoaderRequest(context);
-  const requestContext = createRequestContext();
-  requestContext.set(reporterCtx, reporter);
   let response;
   try {
     response = await queryRoute(request, {
-      routeId,
-      requestContext
+      routeId
     });
     if (isResponse(response) && isRedirectResponse(response.status)) {
       response = convertModernRedirectResponse(response.headers, basename);

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

@@ -1,9 +1,5 @@
-/// <reference types="node" />
 import type { LoaderContext } from 'webpack';
-type Context = {
+export default function loader(this: LoaderContext<{
   mapFile: string;
   loaderId?: string;
-  clientData?: boolean;
-};
-export default function loader(this: LoaderContext<Context>, source: string): Promise<string | Buffer | undefined>;
-export {};
+}>, source: string): Promise<string>;

package/package.json

@@ -15,28 +15,28 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-next-1692674328976",
+  "version": "0.0.0-next-1692686860783",
   "engines": {
     "node": ">=14.17.6"
   },
-  "jsnext:source": "./src/runtime/index.ts",
-  "types": "./dist/types/runtime/index.d.ts",
-  "main": "./dist/cjs/runtime/index.js",
-  "module": "./dist/esm/runtime/index.js",
+  "jsnext:source": "./src/index.ts",
+  "types": "./dist/types/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     "./loader": {
-      "types": "./dist/types/cli/loader.d.ts",
       "jsnext:source": "./src/cli/loader.ts",
+      "types": "./dist/types/cli/loader.d.ts",
       "default": "./dist/cjs/cli/loader.js"
     },
     "./server": {
-      "types": "./dist/types/server/index.d.ts",
       "jsnext:source": "./src/server/index.ts",
+      "types": "./dist/types/server/index.d.ts",
       "default": "./dist/cjs/server/index.js"
     },
     "./runtime": {
-      "types": "./dist/types/runtime/index.d.ts",
       "jsnext:source": "./src/runtime/index.ts",
+      "types": "./dist/types/runtime/index.d.ts",
       "default": "./dist/esm/runtime/index.js"
     }
   },
@@ -58,7 +58,7 @@
     "@remix-run/node": "^1.12.0",
     "path-to-regexp": "^6.2.0",
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "0.0.0-next-1692674328976"
+    "@modern-js/utils": "0.0.0-next-1692686860783"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
@@ -75,11 +75,11 @@
     "webpack-chain": "^6.5.1",
     "react": "^18",
     "react-dom": "^18",
-    "@modern-js/types": "0.0.0-next-1692674328976",
-    "@modern-js/core": "0.0.0-next-1692674328976",
-    "@modern-js/server-core": "0.0.0-next-1692674328976",
-    "@scripts/build": "0.0.0-next-1692674328976",
-    "@scripts/jest-config": "0.0.0-next-1692674328976"
+    "@modern-js/types": "0.0.0-next-1692686860783",
+    "@modern-js/core": "0.0.0-next-1692686860783",
+    "@modern-js/server-core": "0.0.0-next-1692686860783",
+    "@scripts/build": "0.0.0-next-1692686860783",
+    "@scripts/jest-config": "0.0.0-next-1692686860783"
   },
   "peerDependencies": {
     "react": ">=17.0.0"