@bleedingdev/modern-js-app-tools 3.2.0-ultramodern.63 → 3.2.0-ultramodern.65

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.
Files changed (7) hide show
  1. package/dist/cjs/plugins/deploy/platforms/cloudflare.js +2 -2
  2. package/dist/cjs/plugins/deploy/platforms/templates/cloudflare-entry.mjs +14 -7
  3. package/dist/esm/plugins/deploy/platforms/cloudflare.mjs +2 -2
  4. package/dist/esm/plugins/deploy/platforms/templates/cloudflare-entry.mjs +14 -7
  5. package/dist/esm-node/plugins/deploy/platforms/cloudflare.mjs +2 -2
  6. package/dist/esm-node/plugins/deploy/platforms/templates/cloudflare-entry.mjs +14 -7
  7. package/package.json +11 -11
package/dist/cjs/plugins/deploy/platforms/cloudflare.js CHANGED
@@ -106,7 +106,7 @@ const createWorkerManifest = async (outputDirectory, modernConfig)=>{
106
106
  },
107
107
  workerBundles: {
108
108
  directory: WORKER_BUNDLE_DIRECTORY,
109
- format: 'esm',
109
+ format: 'commonjs',
110
110
  importableFromModuleWorker: true,
111
111
  requestHandlerExport: 'requestHandler'
112
112
  },
@@ -201,7 +201,7 @@ const createCloudflarePreset = ({ appContext, modernConfig })=>{
201
201
  spaces: 2
202
202
  });
203
203
  await utils_namespaceObject.fs.writeJSON(external_node_path_default().join(outputDirectory, 'package.json'), {
204
- type: 'module'
204
+ type: 'commonjs'
205
205
  });
206
206
  },
207
207
  async genEntry () {
package/dist/cjs/plugins/deploy/platforms/templates/cloudflare-entry.mjs CHANGED
@@ -140,14 +140,24 @@ async function loadWorkerModule(workerPath) {
140
140
  if (!workerModulePromises.has(workerPath)) workerModulePromises.set(workerPath, loader());
141
141
  return workerModulePromises.get(workerPath);
142
142
  }
143
+ function getRuntimeModule(workerModule) {
144
+ const defaultExport = workerModule.default;
145
+ const nestedDefaultExport = defaultExport && 'object' == typeof defaultExport ? defaultExport.default : void 0;
146
+ return defaultExport && 'object' == typeof defaultExport ? {
147
+ ...workerModule,
148
+ ...defaultExport,
149
+ ...nestedDefaultExport && 'object' == typeof nestedDefaultExport ? nestedDefaultExport : {}
150
+ } : workerModule;
151
+ }
143
152
  function getFetchHandler(workerModule) {
144
153
  const defaultExport = workerModule.default;
145
- return defaultExport && 'object' == typeof defaultExport && 'function' == typeof defaultExport.fetch && defaultExport.fetch.bind(defaultExport) || 'function' == typeof workerModule.fetch && workerModule.fetch;
154
+ const runtime = getRuntimeModule(workerModule);
155
+ return 'function' == typeof runtime.fetch && runtime.fetch.bind(runtime) || 'function' == typeof defaultExport && defaultExport.fetch?.bind?.(defaultExport);
146
156
  }
147
157
  async function getRequestHandler(workerModule) {
148
158
  const defaultExport = workerModule.default;
149
- const defaultRequestHandler = defaultExport && 'object' == typeof defaultExport && 'requestHandler' in defaultExport ? defaultExport.requestHandler : void 0;
150
- return await workerModule.requestHandler || await defaultRequestHandler || ('function' == typeof defaultExport ? defaultExport : void 0);
159
+ const runtime = getRuntimeModule(workerModule);
160
+ return await workerModule.requestHandler || await runtime.requestHandler || ('function' == typeof defaultExport ? defaultExport : void 0);
151
161
  }
152
162
  async function dispatchRouteWorker(route, request, env, ctx) {
153
163
  const workerPath = route.worker;
@@ -223,10 +233,7 @@ async function dispatchBffRequest(request, env) {
223
233
  const mountedRequest = createRequestForMountedPrefix(request, bff.prefix);
224
234
  const effectContext = createEffectContext(request, mountedRequest, env);
225
235
  const defaultExport = workerModule.default;
226
- const runtime = defaultExport && 'object' == typeof defaultExport ? {
227
- ...workerModule,
228
- ...defaultExport
229
- } : workerModule;
236
+ const runtime = getRuntimeModule(workerModule);
230
237
  const directHandler = 'function' == typeof runtime.handler && runtime.handler || 'function' == typeof defaultExport && defaultExport;
231
238
  const createdHandler = 'function' == typeof runtime.createHandler ? runtime.createHandler().handler : void 0;
232
239
  const handler = directHandler || createdHandler;
package/dist/esm/plugins/deploy/platforms/cloudflare.mjs CHANGED
@@ -68,7 +68,7 @@ const createWorkerManifest = async (outputDirectory, modernConfig)=>{
68
68
  },
69
69
  workerBundles: {
70
70
  directory: WORKER_BUNDLE_DIRECTORY,
71
- format: 'esm',
71
+ format: 'commonjs',
72
72
  importableFromModuleWorker: true,
73
73
  requestHandlerExport: 'requestHandler'
74
74
  },
@@ -163,7 +163,7 @@ const createCloudflarePreset = ({ appContext, modernConfig })=>{
163
163
  spaces: 2
164
164
  });
165
165
  await fs.writeJSON(node_path.join(outputDirectory, 'package.json'), {
166
- type: 'module'
166
+ type: 'commonjs'
167
167
  });
168
168
  },
169
169
  async genEntry () {
package/dist/esm/plugins/deploy/platforms/templates/cloudflare-entry.mjs CHANGED
@@ -140,14 +140,24 @@ async function loadWorkerModule(workerPath) {
140
140
  if (!workerModulePromises.has(workerPath)) workerModulePromises.set(workerPath, loader());
141
141
  return workerModulePromises.get(workerPath);
142
142
  }
143
+ function getRuntimeModule(workerModule) {
144
+ const defaultExport = workerModule.default;
145
+ const nestedDefaultExport = defaultExport && 'object' == typeof defaultExport ? defaultExport.default : void 0;
146
+ return defaultExport && 'object' == typeof defaultExport ? {
147
+ ...workerModule,
148
+ ...defaultExport,
149
+ ...nestedDefaultExport && 'object' == typeof nestedDefaultExport ? nestedDefaultExport : {}
150
+ } : workerModule;
151
+ }
143
152
  function getFetchHandler(workerModule) {
144
153
  const defaultExport = workerModule.default;
145
- return defaultExport && 'object' == typeof defaultExport && 'function' == typeof defaultExport.fetch && defaultExport.fetch.bind(defaultExport) || 'function' == typeof workerModule.fetch && workerModule.fetch;
154
+ const runtime = getRuntimeModule(workerModule);
155
+ return 'function' == typeof runtime.fetch && runtime.fetch.bind(runtime) || 'function' == typeof defaultExport && defaultExport.fetch?.bind?.(defaultExport);
146
156
  }
147
157
  async function getRequestHandler(workerModule) {
148
158
  const defaultExport = workerModule.default;
149
- const defaultRequestHandler = defaultExport && 'object' == typeof defaultExport && 'requestHandler' in defaultExport ? defaultExport.requestHandler : void 0;
150
- return await workerModule.requestHandler || await defaultRequestHandler || ('function' == typeof defaultExport ? defaultExport : void 0);
159
+ const runtime = getRuntimeModule(workerModule);
160
+ return await workerModule.requestHandler || await runtime.requestHandler || ('function' == typeof defaultExport ? defaultExport : void 0);
151
161
  }
152
162
  async function dispatchRouteWorker(route, request, env, ctx) {
153
163
  const workerPath = route.worker;
@@ -223,10 +233,7 @@ async function dispatchBffRequest(request, env) {
223
233
  const mountedRequest = createRequestForMountedPrefix(request, bff.prefix);
224
234
  const effectContext = createEffectContext(request, mountedRequest, env);
225
235
  const defaultExport = workerModule.default;
226
- const runtime = defaultExport && 'object' == typeof defaultExport ? {
227
- ...workerModule,
228
- ...defaultExport
229
- } : workerModule;
236
+ const runtime = getRuntimeModule(workerModule);
230
237
  const directHandler = 'function' == typeof runtime.handler && runtime.handler || 'function' == typeof defaultExport && defaultExport;
231
238
  const createdHandler = 'function' == typeof runtime.createHandler ? runtime.createHandler().handler : void 0;
232
239
  const handler = directHandler || createdHandler;
package/dist/esm-node/plugins/deploy/platforms/cloudflare.mjs CHANGED
@@ -69,7 +69,7 @@ const createWorkerManifest = async (outputDirectory, modernConfig)=>{
69
69
  },
70
70
  workerBundles: {
71
71
  directory: WORKER_BUNDLE_DIRECTORY,
72
- format: 'esm',
72
+ format: 'commonjs',
73
73
  importableFromModuleWorker: true,
74
74
  requestHandlerExport: 'requestHandler'
75
75
  },
@@ -164,7 +164,7 @@ const createCloudflarePreset = ({ appContext, modernConfig })=>{
164
164
  spaces: 2
165
165
  });
166
166
  await fs.writeJSON(node_path.join(outputDirectory, 'package.json'), {
167
- type: 'module'
167
+ type: 'commonjs'
168
168
  });
169
169
  },
170
170
  async genEntry () {
package/dist/esm-node/plugins/deploy/platforms/templates/cloudflare-entry.mjs CHANGED
@@ -140,14 +140,24 @@ async function loadWorkerModule(workerPath) {
140
140
  if (!workerModulePromises.has(workerPath)) workerModulePromises.set(workerPath, loader());
141
141
  return workerModulePromises.get(workerPath);
142
142
  }
143
+ function getRuntimeModule(workerModule) {
144
+ const defaultExport = workerModule.default;
145
+ const nestedDefaultExport = defaultExport && 'object' == typeof defaultExport ? defaultExport.default : void 0;
146
+ return defaultExport && 'object' == typeof defaultExport ? {
147
+ ...workerModule,
148
+ ...defaultExport,
149
+ ...nestedDefaultExport && 'object' == typeof nestedDefaultExport ? nestedDefaultExport : {}
150
+ } : workerModule;
151
+ }
143
152
  function getFetchHandler(workerModule) {
144
153
  const defaultExport = workerModule.default;
145
- return defaultExport && 'object' == typeof defaultExport && 'function' == typeof defaultExport.fetch && defaultExport.fetch.bind(defaultExport) || 'function' == typeof workerModule.fetch && workerModule.fetch;
154
+ const runtime = getRuntimeModule(workerModule);
155
+ return 'function' == typeof runtime.fetch && runtime.fetch.bind(runtime) || 'function' == typeof defaultExport && defaultExport.fetch?.bind?.(defaultExport);
146
156
  }
147
157
  async function getRequestHandler(workerModule) {
148
158
  const defaultExport = workerModule.default;
149
- const defaultRequestHandler = defaultExport && 'object' == typeof defaultExport && 'requestHandler' in defaultExport ? defaultExport.requestHandler : void 0;
150
- return await workerModule.requestHandler || await defaultRequestHandler || ('function' == typeof defaultExport ? defaultExport : void 0);
159
+ const runtime = getRuntimeModule(workerModule);
160
+ return await workerModule.requestHandler || await runtime.requestHandler || ('function' == typeof defaultExport ? defaultExport : void 0);
151
161
  }
152
162
  async function dispatchRouteWorker(route, request, env, ctx) {
153
163
  const workerPath = route.worker;
@@ -223,10 +233,7 @@ async function dispatchBffRequest(request, env) {
223
233
  const mountedRequest = createRequestForMountedPrefix(request, bff.prefix);
224
234
  const effectContext = createEffectContext(request, mountedRequest, env);
225
235
  const defaultExport = workerModule.default;
226
- const runtime = defaultExport && 'object' == typeof defaultExport ? {
227
- ...workerModule,
228
- ...defaultExport
229
- } : workerModule;
236
+ const runtime = getRuntimeModule(workerModule);
230
237
  const directHandler = 'function' == typeof runtime.handler && runtime.handler || 'function' == typeof defaultExport && defaultExport;
231
238
  const createdHandler = 'function' == typeof runtime.createHandler ? runtime.createHandler().handler : void 0;
232
239
  const handler = directHandler || createdHandler;
package/package.json CHANGED
@@ -17,7 +17,7 @@
17
17
  "modern",
18
18
  "modern.js"
19
19
  ],
20
- "version": "3.2.0-ultramodern.63",
20
+ "version": "3.2.0-ultramodern.65",
21
21
  "types": "./dist/types/index.d.ts",
22
22
  "main": "./dist/cjs/index.js",
23
23
  "exports": {
@@ -99,16 +99,16 @@
99
99
  "ndepe": "^0.1.13",
100
100
  "pkg-types": "^2.3.1",
101
101
  "std-env": "4.1.0",
102
- "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.2.0-ultramodern.63",
103
- "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.2.0-ultramodern.63",
104
- "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.63",
105
- "@modern-js/server": "npm:@bleedingdev/modern-js-server@3.2.0-ultramodern.63",
106
- "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.2.0-ultramodern.63",
107
- "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.2.0-ultramodern.63",
108
- "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.2.0-ultramodern.63",
109
- "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.63",
110
- "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.2.0-ultramodern.63",
111
- "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.63"
102
+ "@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.2.0-ultramodern.65",
103
+ "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.65",
104
+ "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.2.0-ultramodern.65",
105
+ "@modern-js/server": "npm:@bleedingdev/modern-js-server@3.2.0-ultramodern.65",
106
+ "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.2.0-ultramodern.65",
107
+ "@modern-js/prod-server": "npm:@bleedingdev/modern-js-prod-server@3.2.0-ultramodern.65",
108
+ "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.2.0-ultramodern.65",
109
+ "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.65",
110
+ "@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.2.0-ultramodern.65",
111
+ "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.65"
112
112
  },
113
113
  "devDependencies": {
114
114
  "@rslib/core": "0.21.5",