@modern-js/plugin-worker 2.14.0 → 2.16.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @modern-js/plugin-worker
 
+## 2.16.0
+
+### Patch Changes
+
+- 4e876ab: chore: package.json include the monorepo-relative directory
+
+  chore: 在 package.json 中声明 monorepo 的子路径
+
+- Updated dependencies [5954330]
+- Updated dependencies [7596520]
+- Updated dependencies [4e876ab]
+  - @modern-js/utils@2.16.0
+  - @modern-js/prod-server@2.16.0
+  - @modern-js/server-utils@2.16.0
+
+## 2.15.0
+
+### Patch Changes
+
+- @modern-js/prod-server@2.15.0
+- @modern-js/server-utils@2.15.0
+- @modern-js/utils@2.15.0
+
 ## 2.14.0
 
 ### Patch Changes

package/dist/cjs/code.js

@@ -1,25 +1,11 @@
-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
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "worker", {
+  enumerable: true,
+  get: () => worker
 });
-module.exports = __toCommonJS(code_exports);
 const worker = () => `
 // work entry code
 import { createHandler, handleUrl } from "@modern-js/prod-server/worker";
@@ -50,7 +36,3 @@ 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,39 +1,23 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _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 constants_exports = {};
-__export(constants_exports, {
-  MANIFEST_FILE: () => MANIFEST_FILE,
-  PKG_FILE: () => PKG_FILE,
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
   WORKER_SERVER: () => WORKER_SERVER,
   WORKER_SERVER_ENTRY: () => WORKER_SERVER_ENTRY,
+  MANIFEST_FILE: () => MANIFEST_FILE,
+  PKG_FILE: () => PKG_FILE,
   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";
 const PKG_FILE = "package.json";
 const WRANGLER_FILE = "wrangler.toml";
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  MANIFEST_FILE,
-  PKG_FILE,
-  WORKER_SERVER,
-  WORKER_SERVER_ENTRY,
-  WRANGLER_FILE
-});

package/dist/cjs/index.js

@@ -1,40 +1,21 @@
-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)
-    __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
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: () => _default
 });
-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");
-var src_default = () => ({
+const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _utils = require("@modern-js/utils");
+const _constants = require("./constants");
+const _code = require("./code");
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+const _default = () => ({
   name: "@modern-js/plugin-worker",
   setup: (ctx) => {
     return {
@@ -43,26 +24,15 @@ var src_default = () => ({
           output: {
             disableNodePolyfill: false
           }
-          // TODO
-          // tools: {
-          //   webpackChain: (chain, { isServiceWorker }) => {
-          //     if (isServiceWorker) {
-          //       chain.resolve.alias.set(
-          //         'async_hooks',
-          //         path.resolve(__dirname, './async_hooks'),
-          //       );
-          //     }
-          //   },
-          // },
         };
       },
       validateSchema() {
-        return import_utils.PLUGIN_SCHEMAS["@modern-js/plugin-worker"];
+        return _utils.PLUGIN_SCHEMAS["@modern-js/plugin-worker"];
       },
       async afterDev() {
         const { appDirectory, distDirectory } = ctx.useAppContext();
         const configContext = ctx.useResolvedConfigContext();
-        if (!(0, import_utils.isServiceWorker)(configContext)) {
+        if (!(0, _utils.isServiceWorker)(configContext)) {
           return;
         }
         writeWorkerServerFile(appDirectory, distDirectory);
@@ -70,7 +40,7 @@ var src_default = () => ({
       async afterBuild() {
         const { appDirectory, distDirectory } = ctx.useAppContext();
         const configContext = ctx.useResolvedConfigContext();
-        if (!(0, import_utils.isServiceWorker)(configContext)) {
+        if (!(0, _utils.isServiceWorker)(configContext)) {
           return;
         }
         writeWorkerServerFile(appDirectory, distDirectory);
@@ -79,37 +49,35 @@ var src_default = () => ({
   }
 });
 const writeWorkerServerFile = (appDirectory, distDirectory) => {
-  const workServerDir = import_path.default.join(distDirectory, import_constants.WORKER_SERVER);
-  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);
+  const workServerDir = _path.default.join(distDirectory, _constants.WORKER_SERVER);
+  _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);
   let importStr = ``;
   let pageStr = ``;
   const routeArr = [];
-  routes.forEach(
-    (route) => {
-      if (route.isSSR) {
-        importStr += `import { serverRender as ${route.entryName}ServerRender } from "../${route.worker}";
+  routes.forEach((route) => {
+    if (route.isSSR) {
+      importStr += `import { serverRender as ${route.entryName}ServerRender } from "../${route.worker}";
 `;
-      }
-      if (!route.isApi) {
-        importStr += `import ${route.entryName}template from "../${route.entryPath}";
+    }
+    if (!route.isApi) {
+      importStr += `import ${route.entryName}template from "../${route.entryPath}";
 `;
-        pageStr += `"${route.urlPath}": {
+      pageStr += `"${route.urlPath}": {
         entryName: "${route.entryName}",
         template: ${route.entryName}template,
         serverRender: ${route.isSSR ? `${route.entryName}ServerRender` : void 0},
       },`;
-        routeArr.push({
-          entryName: route.entryName,
-          isSSR: route.isSSR,
-          urlPath: route.urlPath
-        });
-      }
+      routeArr.push({
+        entryName: route.entryName,
+        isSSR: route.isSSR,
+        urlPath: route.urlPath
+      });
     }
-  );
+  });
   const manifest = `
 ${importStr}
 
@@ -120,15 +88,10 @@ export const manifest = {
   routes: ${JSON.stringify(routeArr, null, "   ")}
 }
         `;
-  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)}"
+  _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)}"
 compatibility_date = "${(/* @__PURE__ */ new Date()).toISOString().substring(0, 10)}"
-        `
-  );
+        `);
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/esm/code.js

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

package/dist/esm/constants.js

@@ -1,12 +1,5 @@
-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";
-export {
-  MANIFEST_FILE,
-  PKG_FILE,
-  WORKER_SERVER,
-  WORKER_SERVER_ENTRY,
-  WRANGLER_FILE
-};
+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";

package/dist/esm/index.js

@@ -1,19 +1,8 @@
 import path from "path";
-import {
-  fs,
-  isServiceWorker,
-  PLUGIN_SCHEMAS,
-  ROUTE_SPEC_FILE
-} from "@modern-js/utils";
-import {
-  MANIFEST_FILE,
-  PKG_FILE,
-  WORKER_SERVER,
-  WORKER_SERVER_ENTRY,
-  WRANGLER_FILE
-} from "./constants";
+import { fs, isServiceWorker, PLUGIN_SCHEMAS, ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { MANIFEST_FILE, PKG_FILE, WORKER_SERVER, WORKER_SERVER_ENTRY, WRANGLER_FILE } from "./constants";
 import { worker } from "./code";
-var src_default = () => ({
+export default () => ({
   name: "@modern-js/plugin-worker",
   setup: (ctx) => {
     return {
@@ -22,17 +11,6 @@ var src_default = () => ({
           output: {
             disableNodePolyfill: false
           }
-          // TODO
-          // tools: {
-          //   webpackChain: (chain, { isServiceWorker }) => {
-          //     if (isServiceWorker) {
-          //       chain.resolve.alias.set(
-          //         'async_hooks',
-          //         path.resolve(__dirname, './async_hooks'),
-          //       );
-          //     }
-          //   },
-          // },
         };
       },
       validateSchema() {
@@ -67,28 +45,26 @@ const writeWorkerServerFile = (appDirectory, distDirectory) => {
   let importStr = ``;
   let pageStr = ``;
   const routeArr = [];
-  routes.forEach(
-    (route) => {
-      if (route.isSSR) {
-        importStr += `import { serverRender as ${route.entryName}ServerRender } from "../${route.worker}";
+  routes.forEach((route) => {
+    if (route.isSSR) {
+      importStr += `import { serverRender as ${route.entryName}ServerRender } from "../${route.worker}";
 `;
-      }
-      if (!route.isApi) {
-        importStr += `import ${route.entryName}template from "../${route.entryPath}";
+    }
+    if (!route.isApi) {
+      importStr += `import ${route.entryName}template from "../${route.entryPath}";
 `;
-        pageStr += `"${route.urlPath}": {
+      pageStr += `"${route.urlPath}": {
         entryName: "${route.entryName}",
         template: ${route.entryName}template,
         serverRender: ${route.isSSR ? `${route.entryName}ServerRender` : void 0},
       },`;
-        routeArr.push({
-          entryName: route.entryName,
-          isSSR: route.isSSR,
-          urlPath: route.urlPath
-        });
-      }
+      routeArr.push({
+        entryName: route.entryName,
+        isSSR: route.isSSR,
+        urlPath: route.urlPath
+      });
     }
-  );
+  });
   const manifest = `
 ${importStr}
 
@@ -101,14 +77,8 @@ export const manifest = {
         `;
   fs.writeFileSync(path.join(workServerDir, MANIFEST_FILE), manifest);
   const pkg = fs.readJSONSync(path.join(appDirectory, PKG_FILE));
-  fs.writeFileSync(
-    path.join(distDirectory, WRANGLER_FILE),
-    `name = "${pkg.name}"
+  fs.writeFileSync(path.join(distDirectory, WRANGLER_FILE), `name = "${pkg.name}"
 main = "${path.join(WORKER_SERVER, WORKER_SERVER_ENTRY)}"
 compatibility_date = "${(/* @__PURE__ */ new Date()).toISOString().substring(0, 10)}"
-        `
-  );
-};
-export {
-  src_default as default
+        `);
 };

package/package.json

@@ -3,7 +3,11 @@
   "description": "The meta-framework suite designed from scratch for frontend-focused modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/web-infra-dev/modern.js/issues",
-  "repository": "web-infra-dev/modern.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/server/plugin-worker"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.14.0",
+  "version": "2.16.0",
   "types": "./dist/types/index.d.ts",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/cjs/index.js",
@@ -39,20 +43,20 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/server-utils": "2.14.0",
-    "@modern-js/utils": "2.14.0",
-    "@modern-js/prod-server": "2.14.0"
+    "@modern-js/server-utils": "2.16.0",
+    "@modern-js/utils": "2.16.0",
+    "@modern-js/prod-server": "2.16.0"
   },
   "devDependencies": {
     "typescript": "^4",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
-    "@modern-js/app-tools": "2.14.0",
-    "@modern-js/core": "2.14.0",
-    "@scripts/build": "2.14.0",
-    "@modern-js/types": "2.14.0",
-    "@scripts/jest-config": "2.14.0"
+    "@modern-js/app-tools": "2.16.0",
+    "@modern-js/core": "2.16.0",
+    "@scripts/build": "2.16.0",
+    "@modern-js/types": "2.16.0",
+    "@scripts/jest-config": "2.16.0"
   },
   "sideEffects": [
     "*.css",