@modern-js/plugin-worker 2.35.0 → 2.36.0

package/dist/cjs/code.js

@@ -1,13 +1,26 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "worker", {
-  enumerable: true,
-  get: function() {
-    return worker;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var code_exports = {};
+__export(code_exports, {
+  worker: () => worker
 });
+module.exports = __toCommonJS(code_exports);
 const worker = () => `
 // work entry code
 import { createHandler } from "@modern-js/prod-server/worker";
@@ -36,3 +49,7 @@ addEventListener("fetch", (event) => {
   event.respondWith(handleRequest(event.request));
 });
 `;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  worker
+});

package/dist/cjs/constants.js

@@ -1,37 +1,32 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  WORKER_SERVER: function() {
-    return WORKER_SERVER;
-  },
-  WORKER_SERVER_ENTRY: function() {
-    return WORKER_SERVER_ENTRY;
-  },
-  MANIFEST_FILE: function() {
-    return MANIFEST_FILE;
-  },
-  PKG_FILE: function() {
-    return PKG_FILE;
-  },
-  WRANGLER_FILE: function() {
-    return WRANGLER_FILE;
-  },
-  WEB_APP_NAME: function() {
-    return WEB_APP_NAME;
-  },
-  SERVER_HOOKS: function() {
-    return SERVER_HOOKS;
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var constants_exports = {};
+__export(constants_exports, {
+  MANIFEST_FILE: () => MANIFEST_FILE,
+  PKG_FILE: () => PKG_FILE,
+  SERVER_HOOKS: () => SERVER_HOOKS,
+  WEB_APP_NAME: () => WEB_APP_NAME,
+  WORKER_SERVER: () => WORKER_SERVER,
+  WORKER_SERVER_ENTRY: () => WORKER_SERVER_ENTRY,
+  WRANGLER_FILE: () => WRANGLER_FILE
 });
+module.exports = __toCommonJS(constants_exports);
 const WORKER_SERVER = "worker-server";
 const WORKER_SERVER_ENTRY = "index.js";
 const MANIFEST_FILE = "manifest.js";
@@ -39,3 +34,13 @@ const PKG_FILE = "package.json";
 const WRANGLER_FILE = "wrangler.toml";
 const WEB_APP_NAME = "index";
 const SERVER_HOOKS = "serverHooks";
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  MANIFEST_FILE,
+  PKG_FILE,
+  SERVER_HOOKS,
+  WEB_APP_NAME,
+  WORKER_SERVER,
+  WORKER_SERVER_ENTRY,
+  WRANGLER_FILE
+});

package/dist/cjs/index.js

@@ -1,27 +1,41 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  workerPlugin: function() {
-    return workerPlugin;
-  },
-  default: function() {
-    return _default;
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var src_exports = {};
+__export(src_exports, {
+  default: () => src_default,
+  workerPlugin: () => workerPlugin
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _utils = require("@modern-js/utils");
-const _constants = require("./constants");
-const _code = require("./code");
+module.exports = __toCommonJS(src_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_constants = require("./constants");
+var import_code = require("./code");
 const workerPlugin = () => ({
   name: "@modern-js/plugin-worker",
   setup: (ctx) => {
@@ -49,7 +63,7 @@ const workerPlugin = () => ({
         var _configContext_deploy_worker;
         const { appDirectory, distDirectory } = ctx.useAppContext();
         const configContext = ctx.useResolvedConfigContext();
-        if (!(0, _utils.isServiceWorker)(configContext)) {
+        if (!(0, import_utils.isServiceWorker)(configContext)) {
           return;
         }
         const enableWorkerInWeb = configContext.deploy.enableWorker || ((_configContext_deploy_worker = configContext.deploy.worker) === null || _configContext_deploy_worker === void 0 ? void 0 : _configContext_deploy_worker.web);
@@ -59,7 +73,7 @@ const workerPlugin = () => ({
         var _configContext_deploy_worker;
         const { appDirectory, distDirectory } = ctx.useAppContext();
         const configContext = ctx.useResolvedConfigContext();
-        if (!(0, _utils.isServiceWorker)(configContext)) {
+        if (!(0, import_utils.isServiceWorker)(configContext)) {
           return;
         }
         const enableWorkerInWeb = configContext.deploy.enableWorker || ((_configContext_deploy_worker = configContext.deploy.worker) === null || _configContext_deploy_worker === void 0 ? void 0 : _configContext_deploy_worker.web);
@@ -69,20 +83,20 @@ const workerPlugin = () => ({
   }
 });
 const writeWorkerServerFile = (appDirectory, distDirectory, enableWorkerInWeb) => {
-  const workServerDir = _path.default.join(distDirectory, _constants.WORKER_SERVER);
-  const serverHookDir = _path.default.join(appDirectory, _utils.SERVER_DIR, _constants.WEB_APP_NAME);
-  const isExistsServerHook = _utils.fs.existsSync(`${serverHookDir}.ts`) || _utils.fs.existsSync(`${serverHookDir}.js`);
-  const relativePath = _path.default.relative(workServerDir, serverHookDir);
-  _utils.fs.removeSync(workServerDir);
-  _utils.fs.mkdirSync(workServerDir);
-  _utils.fs.writeFileSync(_path.default.join(workServerDir, _constants.WORKER_SERVER_ENTRY), (0, _code.worker)());
-  const routeJSON = _path.default.join(distDirectory, _utils.ROUTE_SPEC_FILE);
-  const { routes } = _utils.fs.readJSONSync(routeJSON);
+  const workServerDir = import_path.default.join(distDirectory, import_constants.WORKER_SERVER);
+  const serverHookDir = import_path.default.join(appDirectory, import_utils.SERVER_DIR, import_constants.WEB_APP_NAME);
+  const isExistsServerHook = import_utils.fs.existsSync(`${serverHookDir}.ts`) || import_utils.fs.existsSync(`${serverHookDir}.js`);
+  const relativePath = import_path.default.relative(workServerDir, serverHookDir);
+  import_utils.fs.removeSync(workServerDir);
+  import_utils.fs.mkdirSync(workServerDir);
+  import_utils.fs.writeFileSync(import_path.default.join(workServerDir, import_constants.WORKER_SERVER_ENTRY), (0, import_code.worker)());
+  const routeJSON = import_path.default.join(distDirectory, import_utils.ROUTE_SPEC_FILE);
+  const { routes } = import_utils.fs.readJSONSync(routeJSON);
   let importStr = ``;
   let pageStr = ``;
   const routeArr = [];
   if (isExistsServerHook && !enableWorkerInWeb) {
-    importStr += `import * as ${_constants.SERVER_HOOKS} from '${relativePath}'
+    importStr += `import * as ${import_constants.SERVER_HOOKS} from '${relativePath}'
 `;
   }
   routes.forEach((route) => {
@@ -94,7 +108,7 @@ const writeWorkerServerFile = (appDirectory, distDirectory, enableWorkerInWeb) =
       importStr += `import ${route.entryName}template from "../${route.entryPath}";
 `;
       pageStr += `"${route.urlPath}": {
-        ${isExistsServerHook && !enableWorkerInWeb ? `${_constants.SERVER_HOOKS},` : ""}
+        ${isExistsServerHook && !enableWorkerInWeb ? `${import_constants.SERVER_HOOKS},` : ""}
         entryName: "${route.entryName}",
         template: ${route.entryName}template,
         serverRender: ${route.isSSR ? `${route.entryName}ServerRender` : void 0},
@@ -116,11 +130,15 @@ export const manifest = {
   routes: ${JSON.stringify(routeArr, null, "   ")}
 }
         `;
-  _utils.fs.writeFileSync(_path.default.join(workServerDir, _constants.MANIFEST_FILE), manifest);
-  const pkg = _utils.fs.readJSONSync(_path.default.join(appDirectory, _constants.PKG_FILE));
-  _utils.fs.writeFileSync(_path.default.join(distDirectory, _constants.WRANGLER_FILE), `name = "${pkg.name}"
-main = "${_path.default.join(_constants.WORKER_SERVER, _constants.WORKER_SERVER_ENTRY)}"
+  import_utils.fs.writeFileSync(import_path.default.join(workServerDir, import_constants.MANIFEST_FILE), manifest);
+  const pkg = import_utils.fs.readJSONSync(import_path.default.join(appDirectory, import_constants.PKG_FILE));
+  import_utils.fs.writeFileSync(import_path.default.join(distDirectory, import_constants.WRANGLER_FILE), `name = "${pkg.name}"
+main = "${import_path.default.join(import_constants.WORKER_SERVER, import_constants.WORKER_SERVER_ENTRY)}"
 compatibility_date = "${(/* @__PURE__ */ new Date()).toISOString().substring(0, 10)}"
         `);
 };
-const _default = workerPlugin;
+var src_default = workerPlugin;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  workerPlugin
+});

package/dist/esm/code.js

@@ -1,4 +1,4 @@
-export const worker = () => `
+const worker = () => `
 // work entry code
 import { createHandler } from "@modern-js/prod-server/worker";
 import loadableStats from "../loadable-stats.json";
@@ -26,3 +26,6 @@ addEventListener("fetch", (event) => {
   event.respondWith(handleRequest(event.request));
 });
 `;
+export {
+  worker
+};

package/dist/esm/constants.js

@@ -1,7 +1,16 @@
-export const WORKER_SERVER = "worker-server";
-export const WORKER_SERVER_ENTRY = "index.js";
-export const MANIFEST_FILE = "manifest.js";
-export const PKG_FILE = "package.json";
-export const WRANGLER_FILE = "wrangler.toml";
-export const WEB_APP_NAME = "index";
-export const SERVER_HOOKS = "serverHooks";
+const WORKER_SERVER = "worker-server";
+const WORKER_SERVER_ENTRY = "index.js";
+const MANIFEST_FILE = "manifest.js";
+const PKG_FILE = "package.json";
+const WRANGLER_FILE = "wrangler.toml";
+const WEB_APP_NAME = "index";
+const SERVER_HOOKS = "serverHooks";
+export {
+  MANIFEST_FILE,
+  PKG_FILE,
+  SERVER_HOOKS,
+  WEB_APP_NAME,
+  WORKER_SERVER,
+  WORKER_SERVER_ENTRY,
+  WRANGLER_FILE
+};

package/dist/esm/index.js

@@ -2,7 +2,7 @@ import path from "path";
 import { fs, isServiceWorker, ROUTE_SPEC_FILE, SERVER_DIR } from "@modern-js/utils";
 import { MANIFEST_FILE, PKG_FILE, SERVER_HOOKS, WEB_APP_NAME, WORKER_SERVER, WORKER_SERVER_ENTRY, WRANGLER_FILE } from "./constants";
 import { worker } from "./code";
-export const workerPlugin = () => ({
+const workerPlugin = () => ({
   name: "@modern-js/plugin-worker",
   setup: (ctx) => {
     return {
@@ -103,4 +103,8 @@ main = "${path.join(WORKER_SERVER, WORKER_SERVER_ENTRY)}"
 compatibility_date = "${(/* @__PURE__ */ new Date()).toISOString().substring(0, 10)}"
         `);
 };
-export default workerPlugin;
+var src_default = workerPlugin;
+export {
+  src_default as default,
+  workerPlugin
+};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.35.0",
+  "version": "2.36.0",
   "types": "./dist/types/index.d.ts",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/cjs/index.js",
@@ -43,20 +43,20 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.1",
-    "@modern-js/server-utils": "2.35.0",
-    "@modern-js/utils": "2.35.0",
-    "@modern-js/prod-server": "2.35.0"
+    "@modern-js/server-utils": "2.36.0",
+    "@modern-js/utils": "2.36.0",
+    "@modern-js/prod-server": "2.36.0"
   },
   "devDependencies": {
     "typescript": "^5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
-    "@modern-js/core": "2.35.0",
-    "@modern-js/types": "2.35.0",
-    "@modern-js/app-tools": "2.35.0",
-    "@scripts/jest-config": "2.35.0",
-    "@scripts/build": "2.35.0"
+    "@modern-js/app-tools": "2.36.0",
+    "@modern-js/core": "2.36.0",
+    "@scripts/build": "2.36.0",
+    "@modern-js/types": "2.36.0",
+    "@scripts/jest-config": "2.36.0"
   },
   "sideEffects": [
     "*.css",