@bleedingdev/modern-js-app-tools 3.2.0-ultramodern.9 → 3.2.0-ultramodern.91

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 (43) hide show
  1. package/dist/cjs/baseline.js +43 -1
  2. package/dist/cjs/builder/generator/getBuilderEnvironments.js +176 -8
  3. package/dist/cjs/builder/shared/builderPlugins/adapterBasic.js +41 -5
  4. package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js +3 -1
  5. package/dist/cjs/plugins/deploy/index.js +17 -6
  6. package/dist/cjs/plugins/deploy/platforms/cloudflare.js +222 -0
  7. package/dist/cjs/plugins/deploy/platforms/templates/cloudflare-entry.mjs +438 -0
  8. package/dist/cjs/plugins/deploy/platforms/templates/cloudflare-worker-fs-promises.mjs +7 -0
  9. package/dist/cjs/plugins/deploy/platforms/templates/cloudflare-worker-loadable-server.mjs +185 -0
  10. package/dist/cjs/plugins/deploy/platforms/templates/cloudflare-worker-path.mjs +59 -0
  11. package/dist/cjs/rsbuild.js +3 -0
  12. package/dist/esm/baseline.mjs +33 -1
  13. package/dist/esm/builder/generator/getBuilderEnvironments.mjs +165 -8
  14. package/dist/esm/builder/shared/builderPlugins/adapterBasic.mjs +41 -5
  15. package/dist/esm/builder/shared/builderPlugins/adapterSSR.mjs +3 -1
  16. package/dist/esm/plugins/deploy/index.mjs +10 -4
  17. package/dist/esm/plugins/deploy/platforms/cloudflare.mjs +178 -0
  18. package/dist/esm/plugins/deploy/platforms/templates/cloudflare-entry.mjs +438 -0
  19. package/dist/esm/plugins/deploy/platforms/templates/cloudflare-worker-fs-promises.mjs +7 -0
  20. package/dist/esm/plugins/deploy/platforms/templates/cloudflare-worker-loadable-server.mjs +185 -0
  21. package/dist/esm/plugins/deploy/platforms/templates/cloudflare-worker-path.mjs +59 -0
  22. package/dist/esm/rsbuild.mjs +5 -2
  23. package/dist/esm-node/baseline.mjs +33 -1
  24. package/dist/esm-node/builder/generator/getBuilderEnvironments.mjs +170 -9
  25. package/dist/esm-node/builder/shared/builderPlugins/adapterBasic.mjs +41 -5
  26. package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.mjs +3 -1
  27. package/dist/esm-node/plugins/deploy/index.mjs +10 -4
  28. package/dist/esm-node/plugins/deploy/platforms/cloudflare.mjs +179 -0
  29. package/dist/esm-node/plugins/deploy/platforms/templates/cloudflare-entry.mjs +438 -0
  30. package/dist/esm-node/plugins/deploy/platforms/templates/cloudflare-worker-fs-promises.mjs +7 -0
  31. package/dist/esm-node/plugins/deploy/platforms/templates/cloudflare-worker-loadable-server.mjs +185 -0
  32. package/dist/esm-node/plugins/deploy/platforms/templates/cloudflare-worker-path.mjs +59 -0
  33. package/dist/esm-node/rsbuild.mjs +5 -2
  34. package/dist/types/locale/en.d.ts +1 -1
  35. package/dist/types/locale/zh.d.ts +1 -1
  36. package/dist/types/plugins/deploy/index.d.ts +4 -1
  37. package/dist/types/plugins/deploy/platforms/cloudflare.d.ts +2 -0
  38. package/dist/types/plugins/deploy/platforms/templates/cloudflare-entry.d.mts +4 -0
  39. package/dist/types/plugins/deploy/platforms/templates/cloudflare-worker-fs-promises.d.mts +5 -0
  40. package/dist/types/plugins/deploy/platforms/templates/cloudflare-worker-loadable-server.d.mts +48 -0
  41. package/dist/types/plugins/deploy/platforms/templates/cloudflare-worker-path.d.mts +21 -0
  42. package/dist/types/types/config/deploy.d.ts +8 -0
  43. package/package.json +18 -17
@@ -42,9 +42,11 @@ var __webpack_exports__ = {};
42
42
  resolveModernRsbuildConfig: ()=>resolveModernRsbuildConfig
43
43
  });
44
44
  const builder_namespaceObject = require("@modern-js/builder");
45
+ const utils_namespaceObject = require("@modern-js/utils");
45
46
  const index_js_namespaceObject = require("./builder/shared/builderPlugins/index.js");
46
47
  const external_constants_js_namespaceObject = require("./constants.js");
47
48
  const getConfigFile_js_namespaceObject = require("./utils/getConfigFile.js");
49
+ const loadPlugins_js_namespaceObject = require("./utils/loadPlugins.js");
48
50
  const MODERN_META_NAME = 'modern-js';
49
51
  const { createConfigOptions } = __webpack_require__("@modern-js/plugin/cli");
50
52
  async function resolveModernRsbuildConfig(options) {
@@ -55,6 +57,7 @@ var __webpack_exports__ = {};
55
57
  command: options.command,
56
58
  cwd,
57
59
  configFile,
60
+ internalPlugins: await (0, loadPlugins_js_namespaceObject.loadInternalPlugins)(cwd, utils_namespaceObject.INTERNAL_RUNTIME_PLUGINS),
58
61
  metaName,
59
62
  modifyModernConfig: options.modifyModernConfig
60
63
  });
@@ -1,4 +1,33 @@
1
+ import { createRequire } from "node:module";
2
+ import node_path from "node:path";
1
3
  import { mergeConfig } from "@modern-js/plugin/cli";
4
+ const resolveReactRouterPackageDir = ()=>{
5
+ const localRequire = createRequire(node_path.join(process.cwd(), 'package.json'));
6
+ try {
7
+ const reactRouterDomPackageJson = localRequire.resolve('react-router-dom/package.json', {
8
+ paths: [
9
+ process.cwd()
10
+ ]
11
+ });
12
+ const reactRouterPackageJson = localRequire.resolve('react-router/package.json', {
13
+ paths: [
14
+ node_path.dirname(reactRouterDomPackageJson)
15
+ ]
16
+ });
17
+ return node_path.dirname(reactRouterPackageJson);
18
+ } catch {
19
+ return;
20
+ }
21
+ };
22
+ const setReactRouterBridgeSafeAliases = (chain)=>{
23
+ const reactRouterPackageDir = resolveReactRouterPackageDir();
24
+ if (!reactRouterPackageDir) return;
25
+ const productionEntry = node_path.join(reactRouterPackageDir, 'dist/production/index.mjs');
26
+ const developmentEntry = node_path.join(reactRouterPackageDir, 'dist/development/index.mjs');
27
+ chain.resolve.alias.set('react-router$', productionEntry);
28
+ chain.resolve.alias.set('react-router/dist/production/index.js', productionEntry);
29
+ chain.resolve.alias.set('react-router/dist/development/index.js', developmentEntry);
30
+ };
2
31
  const createAppBaselineConfig = (options = {})=>{
3
32
  const { appId = 'app', enableBffRequestId = true, enableTelemetry = true, enableTelemetryExporters = true, otlpEndpoint = process.env.MODERN_TELEMETRY_OTLP_ENDPOINT || 'http://127.0.0.1:4318/v1/logs', victoriaMetricsEndpoint = process.env.MODERN_TELEMETRY_VICTORIA_ENDPOINT || 'http://127.0.0.1:8428/api/v1/import/prometheus', telemetryFailLoudStartup = true, enableModuleFederationSSR = true } = options;
4
33
  const server = {};
@@ -32,7 +61,10 @@ const createAppBaselineConfig = (options = {})=>{
32
61
  disableClientServer: true
33
62
  }
34
63
  },
35
- server
64
+ server,
65
+ tools: {
66
+ bundlerChain: setReactRouterBridgeSafeAliases
67
+ }
36
68
  };
37
69
  if (enableBffRequestId) baselineConfig.bff = {
38
70
  requestId: appId
@@ -1,5 +1,56 @@
1
+ import node_fs from "node:fs";
2
+ import node_path from "node:path";
1
3
  import { SERVICE_WORKER_ENVIRONMENT_NAME } from "@modern-js/builder";
2
4
  import { isProd, isSSR, isServiceWorker, isUseRsc, isUseSSRBundle } from "@modern-js/utils";
5
+ const BFF_EFFECT_WORKER_ENTRY_NAME = '__modern_bff_effect';
6
+ const BFF_EFFECT_WORKER_RUNTIME_QUERY = 'modern-bff-runtime';
7
+ const JS_OR_TS_EXTS = [
8
+ '.ts',
9
+ '.tsx',
10
+ '.js',
11
+ '.jsx',
12
+ '.mjs',
13
+ '.cjs'
14
+ ];
15
+ const CLOUDFLARE_WORKER_COMPAT_TEMPLATE_DIR = node_path.resolve(__dirname, '../../plugins/deploy/platforms/templates');
16
+ function findExistingFile(candidates) {
17
+ return candidates.find((candidate)=>node_fs.existsSync(candidate));
18
+ }
19
+ function resolvePackageEntry(packageName, paths) {
20
+ try {
21
+ return node_fs.realpathSync(require.resolve(packageName, {
22
+ paths
23
+ }));
24
+ } catch {
25
+ return;
26
+ }
27
+ }
28
+ function resolvePackageFile(packageName, filePath, paths) {
29
+ try {
30
+ const packageJsonPath = require.resolve(`${packageName}/package.json`, {
31
+ paths
32
+ });
33
+ const packageFile = node_path.join(node_path.dirname(packageJsonPath), filePath);
34
+ return node_fs.existsSync(packageFile) ? node_fs.realpathSync(packageFile) : void 0;
35
+ } catch {
36
+ return;
37
+ }
38
+ }
39
+ function setAliasIfPresent(alias, name, value) {
40
+ if (value) alias.set(name, value);
41
+ }
42
+ function getCloudflareWorkerCompatFile(file) {
43
+ return node_path.join(CLOUDFLARE_WORKER_COMPAT_TEMPLATE_DIR, file);
44
+ }
45
+ function getEffectBffEntry(normalizedConfig, appContext) {
46
+ if (!normalizedConfig.bff || 'hono' === normalizedConfig.bff.runtimeFramework) return;
47
+ const configuredEntry = normalizedConfig.bff.effect?.entry;
48
+ const entryWithoutExtension = configuredEntry ? node_path.isAbsolute(configuredEntry) ? configuredEntry : node_path.resolve(appContext.appDirectory, configuredEntry) : node_path.resolve(appContext.apiDirectory, 'effect', 'index');
49
+ return findExistingFile(JS_OR_TS_EXTS.map((extension)=>`${entryWithoutExtension}${extension}`));
50
+ }
51
+ function isCloudflareWorkerDeploy(normalizedConfig) {
52
+ return normalizedConfig.deploy?.target === 'cloudflare' || 'cloudflare' === process.env.MODERNJS_DEPLOY;
53
+ }
3
54
  function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig) {
4
55
  const entries = {};
5
56
  const { entrypoints = [], checkedEntries } = appContext;
@@ -16,6 +67,11 @@ function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig)
16
67
  const v = entries[entry];
17
68
  serverEntries[entry] = v.map((entry)=>entry.replace('index.jsx', 'index.server.jsx')).map((entry)=>entry.replace('bootstrap.jsx', 'bootstrap.server.jsx'));
18
69
  }
70
+ const cloudflareWorkerServerEntries = {};
71
+ for(const entry in entries){
72
+ const v = entries[entry];
73
+ cloudflareWorkerServerEntries[entry] = v.map((entry)=>entry.replace('index.jsx', 'index.server.jsx')).map((entry)=>entry.replace('bootstrap.jsx', 'index.server.jsx'));
74
+ }
19
75
  const environments = {
20
76
  client: {
21
77
  output: {
@@ -40,14 +96,115 @@ function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig)
40
96
  }
41
97
  };
42
98
  const useWorkerTarget = isServiceWorker(normalizedConfig);
43
- if (useWorkerTarget) environments[SERVICE_WORKER_ENVIRONMENT_NAME] = {
44
- output: {
45
- target: 'web-worker'
46
- },
47
- source: {
48
- entry: serverEntries
49
- }
50
- };
99
+ if (useWorkerTarget) {
100
+ const useCloudflareModuleWorker = isCloudflareWorkerDeploy(normalizedConfig);
101
+ const effectBffEntry = useCloudflareModuleWorker ? getEffectBffEntry(normalizedConfig, appContext) : void 0;
102
+ const tanstackRouterSsrServerFile = useCloudflareModuleWorker ? resolvePackageFile('@tanstack/router-core', 'dist/esm/ssr/ssr-server.js', [
103
+ appContext.appDirectory,
104
+ process.cwd()
105
+ ]) : void 0;
106
+ const runtimeRscWorkerFile = useCloudflareModuleWorker ? resolvePackageFile('@modern-js/runtime', 'dist/esm/rsc/server.worker.mjs', [
107
+ appContext.appDirectory,
108
+ process.cwd()
109
+ ]) : void 0;
110
+ const renderRscWorkerFile = useCloudflareModuleWorker ? resolvePackageFile('@modern-js/render', 'dist/esm/rscWorker.mjs', [
111
+ appContext.appDirectory,
112
+ process.cwd()
113
+ ]) : void 0;
114
+ const reactFile = useCloudflareModuleWorker ? resolvePackageFile('react', 'index.js', [
115
+ appContext.appDirectory,
116
+ process.cwd()
117
+ ]) : void 0;
118
+ const reactJsxRuntimeFile = useCloudflareModuleWorker ? resolvePackageFile('react', 'jsx-runtime.js', [
119
+ appContext.appDirectory,
120
+ process.cwd()
121
+ ]) : void 0;
122
+ const reactJsxDevRuntimeFile = useCloudflareModuleWorker ? resolvePackageFile('react', 'jsx-dev-runtime.js', [
123
+ appContext.appDirectory,
124
+ process.cwd()
125
+ ]) : void 0;
126
+ const reactDomFile = useCloudflareModuleWorker ? resolvePackageFile('react-dom', 'index.js', [
127
+ appContext.appDirectory,
128
+ process.cwd()
129
+ ]) : void 0;
130
+ const reactDomServerEdgeFile = useCloudflareModuleWorker ? resolvePackageFile('react-dom', 'server.edge.js', [
131
+ appContext.appDirectory,
132
+ process.cwd()
133
+ ]) : void 0;
134
+ const loadableComponentFile = useCloudflareModuleWorker ? resolvePackageEntry('@loadable/component', [
135
+ appContext.appDirectory,
136
+ process.cwd(),
137
+ CLOUDFLARE_WORKER_COMPAT_TEMPLATE_DIR
138
+ ]) : void 0;
139
+ const loadableServerWorkerFile = useCloudflareModuleWorker ? getCloudflareWorkerCompatFile('cloudflare-worker-loadable-server.mjs') : void 0;
140
+ const fsPromisesWorkerFile = useCloudflareModuleWorker ? getCloudflareWorkerCompatFile('cloudflare-worker-fs-promises.mjs') : void 0;
141
+ const pathWorkerFile = useCloudflareModuleWorker ? getCloudflareWorkerCompatFile('cloudflare-worker-path.mjs') : void 0;
142
+ const baseWorkerEntries = useCloudflareModuleWorker ? cloudflareWorkerServerEntries : serverEntries;
143
+ const workerEntries = effectBffEntry ? {
144
+ ...baseWorkerEntries,
145
+ [BFF_EFFECT_WORKER_ENTRY_NAME]: [
146
+ `${effectBffEntry}?${BFF_EFFECT_WORKER_RUNTIME_QUERY}`
147
+ ]
148
+ } : baseWorkerEntries;
149
+ environments[SERVICE_WORKER_ENVIRONMENT_NAME] = {
150
+ output: {
151
+ target: useCloudflareModuleWorker ? 'web' : 'web-worker',
152
+ ...useCloudflareModuleWorker ? {
153
+ module: true
154
+ } : {}
155
+ },
156
+ source: {
157
+ entry: workerEntries
158
+ },
159
+ tools: {
160
+ htmlPlugin: false,
161
+ ...useCloudflareModuleWorker ? {
162
+ bundlerChain: (chain)=>{
163
+ chain.merge({
164
+ experiments: {
165
+ outputModule: true
166
+ }
167
+ });
168
+ chain.output.chunkFormat('module').chunkLoading('import').workerChunkLoading('import');
169
+ chain.target('webworker');
170
+ chain.plugins.delete('plugin-module-federation');
171
+ if (tanstackRouterSsrServerFile) {
172
+ chain.resolve.alias.set('@tanstack/router-core/ssr/server$', tanstackRouterSsrServerFile);
173
+ chain.resolve.alias.set('@tanstack/router-core/ssr/server', tanstackRouterSsrServerFile);
174
+ }
175
+ if (runtimeRscWorkerFile) {
176
+ chain.resolve.alias.set('@modern-js/runtime/rsc/server$', runtimeRscWorkerFile);
177
+ chain.resolve.alias.set('@modern-js/runtime/rsc/server', runtimeRscWorkerFile);
178
+ }
179
+ if (renderRscWorkerFile) {
180
+ chain.resolve.alias.set('@modern-js/render/rsc$', renderRscWorkerFile);
181
+ chain.resolve.alias.set('@modern-js/render/rsc', renderRscWorkerFile);
182
+ chain.resolve.alias.set('@modern-js/render/rsc-worker$', renderRscWorkerFile);
183
+ }
184
+ setAliasIfPresent(chain.resolve.alias, 'react$', reactFile);
185
+ setAliasIfPresent(chain.resolve.alias, 'react/jsx-runtime$', reactJsxRuntimeFile);
186
+ setAliasIfPresent(chain.resolve.alias, 'react/jsx-dev-runtime$', reactJsxDevRuntimeFile);
187
+ setAliasIfPresent(chain.resolve.alias, 'react-dom$', reactDomFile);
188
+ setAliasIfPresent(chain.resolve.alias, 'react-dom/server.edge$', reactDomServerEdgeFile);
189
+ setAliasIfPresent(chain.resolve.alias, '@loadable/component$', loadableComponentFile);
190
+ setAliasIfPresent(chain.resolve.alias, '@loadable/server$', loadableServerWorkerFile);
191
+ setAliasIfPresent(chain.resolve.alias, 'fs/promises$', fsPromisesWorkerFile);
192
+ setAliasIfPresent(chain.resolve.alias, 'node:fs/promises$', fsPromisesWorkerFile);
193
+ setAliasIfPresent(chain.resolve.alias, 'path$', pathWorkerFile);
194
+ setAliasIfPresent(chain.resolve.alias, 'node:path$', pathWorkerFile);
195
+ chain.resolve.alias.set('react-server-dom-rspack/server.node$', 'react-server-dom-rspack/server.edge');
196
+ chain.resolve.alias.set('react-server-dom-rspack/server.node', 'react-server-dom-rspack/server.edge');
197
+ chain.resolve.alias.set('react-server-dom-rspack/client.node$', 'react-server-dom-rspack/client.edge');
198
+ chain.resolve.alias.set('react-server-dom-rspack/client.node', 'react-server-dom-rspack/client.edge');
199
+ chain.resolve.fallback.set('async_hooks', false);
200
+ chain.resolve.fallback.set('node:async_hooks', false);
201
+ chain.resolve.fallback.set('fs', false);
202
+ chain.resolve.fallback.set('node:fs', false);
203
+ }
204
+ } : {}
205
+ }
206
+ };
207
+ }
51
208
  return {
52
209
  environments,
53
210
  builderConfig: tempBuilderConfig
@@ -5,8 +5,11 @@ const builderPluginAdapterBasic = (options)=>({
5
5
  setup (api) {
6
6
  api.modifyBundlerChain((chain, { target, CHAIN_ID, environment })=>{
7
7
  const isServiceWorker = environment.name === SERVICE_WORKER_ENVIRONMENT_NAME;
8
- if ('node' === target || isServiceWorker) applyNodeCompat(isServiceWorker, chain);
9
- if ('web' === target) {
8
+ const isWebTargetServiceWorker = isServiceWorker && 'web' === target;
9
+ if ('node' === target || isServiceWorker) applyNodeCompat(isServiceWorker, chain, {
10
+ includeNodeExtensions: !isWebTargetServiceWorker
11
+ });
12
+ if ('web' === target && !isServiceWorker) {
10
13
  const bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
11
14
  const depExt = 'mjs';
12
15
  chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
@@ -22,8 +25,40 @@ const builderPluginAdapterBasic = (options)=>({
22
25
  });
23
26
  api.modifyRspackConfig((config, { target, environment })=>{
24
27
  const isServiceWorker = environment.name === SERVICE_WORKER_ENVIRONMENT_NAME;
28
+ const isWebTargetServiceWorker = isServiceWorker && 'web' === target;
25
29
  if ('node' === target || isServiceWorker) {
26
- const extensionAlias = {
30
+ const extensionAlias = isWebTargetServiceWorker ? {
31
+ '.js': [
32
+ '.worker.js',
33
+ '.server.js',
34
+ '.js'
35
+ ],
36
+ '.jsx': [
37
+ '.worker.jsx',
38
+ '.server.jsx',
39
+ '.jsx'
40
+ ],
41
+ '.ts': [
42
+ '.worker.ts',
43
+ '.server.ts',
44
+ '.ts'
45
+ ],
46
+ '.tsx': [
47
+ '.worker.tsx',
48
+ '.server.tsx',
49
+ '.tsx'
50
+ ],
51
+ '.mjs': [
52
+ '.worker.mjs',
53
+ '.server.mjs',
54
+ '.mjs'
55
+ ],
56
+ '.json': [
57
+ '.worker.json',
58
+ '.server.json',
59
+ '.json'
60
+ ]
61
+ } : {
27
62
  '.js': [
28
63
  '.node.js',
29
64
  '.server.js',
@@ -64,7 +99,8 @@ const builderPluginAdapterBasic = (options)=>({
64
99
  });
65
100
  }
66
101
  });
67
- function applyNodeCompat(isServiceWorker, chain) {
102
+ function applyNodeCompat(isServiceWorker, chain, options = {}) {
103
+ const { includeNodeExtensions = true } = options;
68
104
  const nodeExts = [
69
105
  '.node.js',
70
106
  '.node.jsx',
@@ -83,7 +119,7 @@ function applyNodeCompat(isServiceWorker, chain) {
83
119
  '.worker.ts',
84
120
  '.worker.tsx'
85
121
  ];
86
- for (const ext of nodeExts)chain.resolve.extensions.prepend(ext);
122
+ if (includeNodeExtensions) for (const ext of nodeExts)chain.resolve.extensions.prepend(ext);
87
123
  if (isServiceWorker) for (const ext of webWorkerExts)chain.resolve.extensions.prepend(ext);
88
124
  }
89
125
  export { builderPluginAdapterBasic };
@@ -94,9 +94,10 @@ function applyFilterEntriesBySSRConfig({ isProd, chain, appNormalizedConfig }) {
94
94
  });
95
95
  }
96
96
  async function applySSRLoaderEntry(chain, optinos, isServer) {
97
- const { appContext } = optinos;
97
+ const { appContext, normalizedConfig } = optinos;
98
98
  const { internalDirectory } = appContext;
99
99
  const { entrypoints } = appContext;
100
+ const isRsc = isUseRsc(normalizedConfig);
100
101
  await Promise.all(entrypoints.map(async (entrypoint)=>{
101
102
  const { entryName } = entrypoint;
102
103
  const serverLoadersFile = getServerCombinedModuleFile(internalDirectory, entryName);
@@ -104,6 +105,7 @@ async function applySSRLoaderEntry(chain, optinos, isServer) {
104
105
  await fs.access(serverLoadersFile, fs.constants.F_OK);
105
106
  chain.entry(`${entryName}-server-loaders`).add(serverLoadersFile);
106
107
  } catch (err) {}
108
+ else if (isRsc) chain.entry(`${entryName}-server-loaders`).add("data:text/javascript,export%20{};");
107
109
  }));
108
110
  }
109
111
  function applySSRDataLoader(chain, options) {
@@ -1,4 +1,5 @@
1
1
  import { provider } from "std-env";
2
+ import { createCloudflarePreset } from "./platforms/cloudflare.mjs";
2
3
  import { createGhPagesPreset } from "./platforms/gh-pages.mjs";
3
4
  import { createNetlifyPreset } from "./platforms/netlify.mjs";
4
5
  import { createNodePreset } from "./platforms/node.mjs";
@@ -8,14 +9,18 @@ const deployPresets = {
8
9
  node: createNodePreset,
9
10
  vercel: createVercelPreset,
10
11
  netlify: createNetlifyPreset,
11
- ghPages: createGhPagesPreset
12
+ ghPages: createGhPagesPreset,
13
+ cloudflare: createCloudflarePreset
12
14
  };
15
+ const getSupportedDeployTargets = ()=>Object.keys(deployPresets);
16
+ const isDeployTarget = (target)=>Object.prototype.hasOwnProperty.call(deployPresets, target);
17
+ const resolveDeployTarget = (modernConfig, envDeployTarget = process.env.MODERNJS_DEPLOY, detectedProvider = provider)=>modernConfig.deploy?.target || envDeployTarget || detectedProvider || 'node';
13
18
  async function getDeployPreset(appContext, modernConfig, deployTarget, api) {
14
19
  const { appDirectory, distDirectory, metaName } = appContext;
15
20
  const { useSSR, useAPI, useWebServer } = getProjectUsage(appDirectory, distDirectory, metaName);
16
21
  const needModernServer = useSSR || useAPI || useWebServer;
22
+ if (!isDeployTarget(deployTarget)) throw new Error(`Unknown deploy target: '${deployTarget}'. deploy.target or MODERNJS_DEPLOY should be one of: ${getSupportedDeployTargets().join(', ')}.`);
17
23
  const createPreset = deployPresets[deployTarget];
18
- if (!createPreset) throw new Error(`Unknown deploy target: '${deployTarget}'. MODERNJS_DEPLOY should be 'node', 'vercel', or 'netlify'.`);
19
24
  return createPreset({
20
25
  appContext,
21
26
  modernConfig,
@@ -26,12 +31,12 @@ async function getDeployPreset(appContext, modernConfig, deployTarget, api) {
26
31
  const deploy = ()=>({
27
32
  name: '@modern-js/plugin-deploy',
28
33
  setup: (api)=>{
29
- const deployTarget = process.env.MODERNJS_DEPLOY || provider || 'node';
30
34
  api.deploy(async ()=>{
31
35
  const appContext = api.getAppContext();
32
36
  const { metaName } = appContext;
33
- if ('modern-js' !== metaName && !process.env.MODERNJS_DEPLOY) return;
34
37
  const modernConfig = api.getNormalizedConfig();
38
+ const deployTarget = resolveDeployTarget(modernConfig);
39
+ if ('modern-js' !== metaName && !modernConfig.deploy?.target && !process.env.MODERNJS_DEPLOY) return;
35
40
  const deployPreset = await getDeployPreset(appContext, modernConfig, deployTarget, api);
36
41
  deployPreset?.prepare && await deployPreset?.prepare();
37
42
  deployPreset?.writeOutput && await deployPreset?.writeOutput();
@@ -41,3 +46,4 @@ const deploy = ()=>({
41
46
  }
42
47
  });
43
48
  export default deploy;
49
+ export { getSupportedDeployTargets, resolveDeployTarget };
@@ -0,0 +1,178 @@
1
+ import node_path from "node:path";
2
+ import { fs } from "@modern-js/utils";
3
+ import { readTemplate } from "../utils/index.mjs";
4
+ const WORKER_ENTRY = 'server/index.mjs';
5
+ const WORKER_MANIFEST = 'server/modern-worker-manifest.json';
6
+ const ASSETS_BINDING = 'ASSETS';
7
+ const ROUTE_SPEC_FILE = 'route.json';
8
+ const ROUTE_SPEC_OUTPUT = `server/${ROUTE_SPEC_FILE}`;
9
+ const LOADABLE_STATS_FILE = 'loadable-stats.json';
10
+ const ROUTE_MANIFEST_FILE = 'routes-manifest.json';
11
+ const PUBLIC_ASSETS_DIRECTORY = 'public';
12
+ const WORKER_BUNDLE_DIRECTORY = 'worker';
13
+ const SERVER_BUNDLE_DIRECTORY = 'bundles';
14
+ const BFF_EFFECT_WORKER_ENTRY = `${WORKER_BUNDLE_DIRECTORY}/__modern_bff_effect.js`;
15
+ const getCompatibilityDate = ()=>new Date().toISOString().slice(0, 10);
16
+ const getWorkerName = (appDirectory)=>{
17
+ const basename = node_path.basename(appDirectory);
18
+ return basename.replace(/[^a-zA-Z0-9-_]/g, '-') || 'modern-cloudflare-worker';
19
+ };
20
+ const getConfiguredWorkerName = (appDirectory, modernConfig)=>{
21
+ const configuredName = modernConfig.deploy?.worker?.name?.trim();
22
+ return configuredName || getWorkerName(appDirectory);
23
+ };
24
+ const readRouteSpec = async (outputDirectory)=>{
25
+ const routeSpecPath = node_path.join(outputDirectory, ROUTE_SPEC_OUTPUT);
26
+ if (!await fs.pathExists(routeSpecPath)) return {
27
+ routes: []
28
+ };
29
+ const routeSpec = await fs.readJSON(routeSpecPath);
30
+ return {
31
+ ...routeSpec,
32
+ routes: Array.isArray(routeSpec.routes) ? routeSpec.routes : []
33
+ };
34
+ };
35
+ const createWorkerManifest = async (outputDirectory, modernConfig)=>{
36
+ const routeSpec = await readRouteSpec(outputDirectory);
37
+ const routes = await Promise.all(routeSpec.routes.map(async (route)=>{
38
+ const worker = 'string' == typeof route.worker ? route.worker : void 0;
39
+ return {
40
+ urlPath: route.urlPath,
41
+ entryName: route.entryName,
42
+ entryPath: route.entryPath,
43
+ isSSR: Boolean(route.isSSR),
44
+ worker,
45
+ workerExists: worker ? await fs.pathExists(node_path.join(outputDirectory, worker)) : false
46
+ };
47
+ }));
48
+ const bffPrefix = modernConfig.bff?.prefix;
49
+ const primaryBffPrefix = Array.isArray(bffPrefix) ? bffPrefix[0] : bffPrefix;
50
+ const isEffectBff = Boolean(modernConfig.bff) && modernConfig.bff?.runtimeFramework !== 'hono';
51
+ const effectBffWorkerExists = await fs.pathExists(node_path.join(outputDirectory, BFF_EFFECT_WORKER_ENTRY));
52
+ return {
53
+ version: 1,
54
+ runtime: {
55
+ type: 'cloudflare-module-worker',
56
+ entry: WORKER_ENTRY,
57
+ fetchExport: true,
58
+ nodeListen: false
59
+ },
60
+ assets: {
61
+ binding: ASSETS_BINDING,
62
+ directory: `./${PUBLIC_ASSETS_DIRECTORY}`,
63
+ runWorkerFirst: true
64
+ },
65
+ routeSpec: {
66
+ file: ROUTE_SPEC_OUTPUT,
67
+ routes
68
+ },
69
+ workerBundles: {
70
+ directory: WORKER_BUNDLE_DIRECTORY,
71
+ format: 'commonjs',
72
+ importableFromModuleWorker: true,
73
+ requestHandlerExport: 'requestHandler'
74
+ },
75
+ resources: {
76
+ loadableStats: LOADABLE_STATS_FILE,
77
+ routeManifest: ROUTE_MANIFEST_FILE
78
+ },
79
+ bff: isEffectBff && primaryBffPrefix && effectBffWorkerExists ? {
80
+ runtimeFramework: 'effect',
81
+ prefix: primaryBffPrefix,
82
+ worker: BFF_EFFECT_WORKER_ENTRY
83
+ } : void 0
84
+ };
85
+ };
86
+ const createWorkerModuleLoaders = (manifest)=>{
87
+ const imports = new Map();
88
+ for (const route of manifest.routeSpec.routes)if (route.worker && route.workerExists) {
89
+ const importPath = `../${String(route.worker).replace(/^\/+/u, '')}`;
90
+ imports.set(route.worker, `() => import(${JSON.stringify(importPath)})`);
91
+ }
92
+ if (manifest.bff?.worker) {
93
+ const importPath = `../${String(manifest.bff.worker).replace(/^\/+/u, '')}`;
94
+ imports.set(manifest.bff.worker, `() => import(${JSON.stringify(importPath)})`);
95
+ }
96
+ if (0 === imports.size) return '{}';
97
+ const loaders = [
98
+ ...imports.entries()
99
+ ].map(([worker, loader])=>`${JSON.stringify(worker)}: ${loader}`);
100
+ return `{\n${loaders.join(',\n')}\n}`;
101
+ };
102
+ const shouldCopyToPublicAssets = (src, distDirectory)=>{
103
+ const relativePath = node_path.relative(distDirectory, src);
104
+ if (!relativePath) return true;
105
+ const normalizedRelativePath = relativePath.replace(/\\/g, '/');
106
+ const [topLevelDirectory] = normalizedRelativePath.split('/');
107
+ return normalizedRelativePath !== ROUTE_SPEC_FILE && topLevelDirectory !== WORKER_BUNDLE_DIRECTORY && topLevelDirectory !== SERVER_BUNDLE_DIRECTORY;
108
+ };
109
+ const shouldCopyToWorkerBundle = (src, workerBundleDirectory)=>{
110
+ const relativePath = node_path.relative(workerBundleDirectory, src);
111
+ if (!relativePath) return true;
112
+ const normalizedRelativePath = relativePath.replace(/\\/g, '/');
113
+ const basename = node_path.basename(normalizedRelativePath);
114
+ if (basename.startsWith('.') || normalizedRelativePath.includes('/.')) return false;
115
+ if (fs.statSync(src).isDirectory()) return true;
116
+ return [
117
+ '.cjs',
118
+ '.js',
119
+ '.mjs'
120
+ ].includes(node_path.extname(normalizedRelativePath));
121
+ };
122
+ const createCloudflarePreset = ({ appContext, modernConfig })=>{
123
+ const { appDirectory, distDirectory } = appContext;
124
+ const outputDirectory = node_path.join(appDirectory, '.output');
125
+ const publicDirectory = node_path.join(outputDirectory, PUBLIC_ASSETS_DIRECTORY);
126
+ const workerEntryPath = node_path.join(outputDirectory, WORKER_ENTRY);
127
+ const workerManifestPath = node_path.join(outputDirectory, WORKER_MANIFEST);
128
+ const routeSpecOutputPath = node_path.join(outputDirectory, ROUTE_SPEC_OUTPUT);
129
+ const wranglerConfigPath = node_path.join(outputDirectory, 'wrangler.json');
130
+ const workerName = getConfiguredWorkerName(appDirectory, modernConfig);
131
+ return {
132
+ async prepare () {
133
+ await fs.remove(outputDirectory);
134
+ },
135
+ async writeOutput () {
136
+ await fs.copy(distDirectory, publicDirectory, {
137
+ filter: (src)=>shouldCopyToPublicAssets(src, distDirectory)
138
+ });
139
+ await fs.ensureDir(node_path.dirname(workerEntryPath));
140
+ await fs.ensureDir(node_path.dirname(workerManifestPath));
141
+ const routeSpecSourcePath = node_path.join(distDirectory, ROUTE_SPEC_FILE);
142
+ if (await fs.pathExists(routeSpecSourcePath)) await fs.copy(routeSpecSourcePath, routeSpecOutputPath);
143
+ const workerBundleSourceDirectory = node_path.join(distDirectory, WORKER_BUNDLE_DIRECTORY);
144
+ if (await fs.pathExists(workerBundleSourceDirectory)) await fs.copy(workerBundleSourceDirectory, node_path.join(outputDirectory, WORKER_BUNDLE_DIRECTORY), {
145
+ filter: (src)=>shouldCopyToWorkerBundle(src, workerBundleSourceDirectory)
146
+ });
147
+ await fs.writeJSON(wranglerConfigPath, {
148
+ $schema: 'node_modules/wrangler/config-schema.json',
149
+ name: workerName,
150
+ main: WORKER_ENTRY,
151
+ compatibility_date: getCompatibilityDate(),
152
+ compatibility_flags: [
153
+ 'nodejs_compat',
154
+ 'global_fetch_strictly_public'
155
+ ],
156
+ assets: {
157
+ directory: `./${PUBLIC_ASSETS_DIRECTORY}`,
158
+ binding: ASSETS_BINDING,
159
+ run_worker_first: true
160
+ }
161
+ }, {
162
+ spaces: 2
163
+ });
164
+ await fs.writeJSON(workerManifestPath, await createWorkerManifest(outputDirectory, modernConfig), {
165
+ spaces: 2
166
+ });
167
+ await fs.writeJSON(node_path.join(outputDirectory, 'package.json'), {
168
+ type: 'commonjs'
169
+ });
170
+ },
171
+ async genEntry () {
172
+ const template = await readTemplate('cloudflare-entry.mjs');
173
+ const manifest = await fs.readJSON(workerManifestPath);
174
+ await fs.writeFile(workerEntryPath, template.replace('p_workerManifest', JSON.stringify(manifest, null, 2)).replace('p_workerModuleLoaders', createWorkerModuleLoaders(manifest)));
175
+ }
176
+ };
177
+ };
178
+ export { createCloudflarePreset };