@modern-js/plugin-data-loader 2.15.0 → 2.17.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,7 +4,7 @@ function isTrackedPromise(value) {
4
4
  return value != null && typeof value.then === "function" && value._tracked === true;
5
5
  }
6
6
  const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
7
- function createDeferredReadableStream(deferredData, signal) {
7
+ export function createDeferredReadableStream(deferredData, signal) {
8
8
  const encoder = new TextEncoder();
9
9
  const stream = new ReadableStream({
10
10
  async start(controller) {
@@ -24,21 +24,11 @@ function createDeferredReadableStream(deferredData, signal) {
24
24
 
25
25
  `));
26
26
  for (const preresolvedKey of preresolvedKeys) {
27
- enqueueTrackedPromise(
28
- controller,
29
- encoder,
30
- preresolvedKey,
31
- deferredData.data[preresolvedKey]
32
- );
27
+ enqueueTrackedPromise(controller, encoder, preresolvedKey, deferredData.data[preresolvedKey]);
33
28
  }
34
29
  const unsubscribe = deferredData.subscribe((aborted, settledKey) => {
35
30
  if (settledKey) {
36
- enqueueTrackedPromise(
37
- controller,
38
- encoder,
39
- settledKey,
40
- deferredData.data[settledKey]
41
- );
31
+ enqueueTrackedPromise(controller, encoder, settledKey, deferredData.data[settledKey]);
42
32
  }
43
33
  });
44
34
  await deferredData.resolveData(signal);
@@ -49,31 +39,22 @@ function createDeferredReadableStream(deferredData, signal) {
49
39
  return stream;
50
40
  }
51
41
  function enqueueTrackedPromise(controller, encoder, settledKey, promise) {
52
- var _a;
53
42
  if ("_error" in promise) {
54
43
  const { _error } = promise;
55
- controller.enqueue(
56
- encoder.encode(
57
- `error:${serializeJson({
58
- [settledKey]: {
59
- message: _error.message,
60
- stack: _error.stack
61
- }
62
- })}
44
+ controller.enqueue(encoder.encode(`error:${serializeJson({
45
+ [settledKey]: {
46
+ message: _error.message,
47
+ stack: _error.stack
48
+ }
49
+ })}
63
50
 
64
- `
65
- )
66
- );
51
+ `));
67
52
  } else {
68
- controller.enqueue(
69
- encoder.encode(
70
- `data:${JSON.stringify({ [settledKey]: (_a = promise._data) != null ? _a : null })}
53
+ var _promise__data;
54
+ controller.enqueue(encoder.encode(`data:${JSON.stringify({
55
+ [settledKey]: (_promise__data = promise._data) !== null && _promise__data !== void 0 ? _promise__data : null
56
+ })}
71
57
 
72
- `
73
- )
74
- );
58
+ `));
75
59
  }
76
60
  }
77
- export {
78
- createDeferredReadableStream
79
- };
@@ -1,27 +1,17 @@
1
1
  import path from "path";
2
2
  import fs from "fs";
3
- import {
4
- MAIN_ENTRY_NAME,
5
- SERVER_BUNDLE_DIRECTORY
6
- } from "@modern-js/utils/constants";
3
+ import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils/constants";
7
4
  import { matchEntry } from "../common/utils";
8
- var server_default = () => ({
5
+ export default () => ({
9
6
  name: "@modern-js/plugin-data-loader",
10
7
  setup: () => ({
11
- prepareLoaderHandler({
12
- serverRoutes,
13
- distDir
14
- }) {
8
+ prepareLoaderHandler({ serverRoutes, distDir }) {
15
9
  return async (context) => {
16
10
  const entry = matchEntry(context.path, serverRoutes);
17
11
  if (!entry) {
18
12
  return;
19
13
  }
20
- const routesPath = path.join(
21
- distDir,
22
- SERVER_BUNDLE_DIRECTORY,
23
- `${entry.entryName || MAIN_ENTRY_NAME}-server-loaders.js`
24
- );
14
+ const routesPath = path.join(distDir, SERVER_BUNDLE_DIRECTORY, `${entry.entryName || MAIN_ENTRY_NAME}-server-loaders.js`);
25
15
  if (!fs.existsSync(routesPath)) {
26
16
  return;
27
17
  }
@@ -38,6 +28,3 @@ var server_default = () => ({
38
28
  }
39
29
  })
40
30
  });
41
- export {
42
- server_default as default
43
- };
package/package.json CHANGED
@@ -3,7 +3,11 @@
3
3
  "description": "A Progressive React Framework for modern web development.",
4
4
  "homepage": "https://modernjs.dev",
5
5
  "bugs": "https://github.com/web-infra-dev/modern.js/issues",
6
- "repository": "web-infra-dev/modern.js",
6
+ "repository": {
7
+ "type": "git",
8
+ "url": "https://github.com/web-infra-dev/modern.js",
9
+ "directory": "packages/cli/plugin-data-loader"
10
+ },
7
11
  "license": "MIT",
8
12
  "keywords": [
9
13
  "react",
@@ -11,7 +15,7 @@
11
15
  "modern",
12
16
  "modern.js"
13
17
  ],
14
- "version": "2.15.0",
18
+ "version": "2.17.0",
15
19
  "engines": {
16
20
  "node": ">=14.17.6"
17
21
  },
@@ -55,7 +59,7 @@
55
59
  "@remix-run/node": "^1.12.0",
56
60
  "path-to-regexp": "^6.2.0",
57
61
  "react-router-dom": "^6.8.1",
58
- "@modern-js/utils": "2.15.0"
62
+ "@modern-js/utils": "2.17.0"
59
63
  },
60
64
  "devDependencies": {
61
65
  "@types/babel__core": "^7.1.15",
@@ -72,11 +76,11 @@
72
76
  "webpack-chain": "^6.5.1",
73
77
  "react": ">=17.0.0",
74
78
  "react-router-dom": "^6.8.1",
75
- "@modern-js/core": "2.15.0",
76
- "@modern-js/server-core": "2.15.0",
77
- "@modern-js/types": "2.15.0",
78
- "@scripts/build": "2.15.0",
79
- "@scripts/jest-config": "2.15.0"
79
+ "@modern-js/core": "2.17.0",
80
+ "@modern-js/server-core": "2.17.0",
81
+ "@modern-js/types": "2.17.0",
82
+ "@scripts/jest-config": "2.17.0",
83
+ "@scripts/build": "2.17.0"
80
84
  },
81
85
  "peerDependencies": {
82
86
  "react": ">=17.0.0",