everything-dev 1.12.2 → 1.12.4

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 (77) hide show
  1. package/dist/app.cjs +7 -96
  2. package/dist/app.cjs.map +1 -1
  3. package/dist/app.mjs +8 -97
  4. package/dist/app.mjs.map +1 -1
  5. package/dist/cli/framework-version.cjs +35 -0
  6. package/dist/cli/framework-version.cjs.map +1 -0
  7. package/dist/cli/framework-version.mjs +34 -0
  8. package/dist/cli/framework-version.mjs.map +1 -0
  9. package/dist/cli/init.cjs +14 -3
  10. package/dist/cli/init.cjs.map +1 -1
  11. package/dist/cli/init.d.cts.map +1 -1
  12. package/dist/cli/init.d.mts.map +1 -1
  13. package/dist/cli/init.mjs +14 -3
  14. package/dist/cli/init.mjs.map +1 -1
  15. package/dist/cli/status.cjs +2 -9
  16. package/dist/cli/status.cjs.map +1 -1
  17. package/dist/cli/status.mjs +2 -9
  18. package/dist/cli/status.mjs.map +1 -1
  19. package/dist/cli/sync.cjs +88 -16
  20. package/dist/cli/sync.cjs.map +1 -1
  21. package/dist/cli/sync.mjs +88 -16
  22. package/dist/cli/sync.mjs.map +1 -1
  23. package/dist/cli/upgrade.cjs +85 -48
  24. package/dist/cli/upgrade.cjs.map +1 -1
  25. package/dist/cli/upgrade.mjs +85 -48
  26. package/dist/cli/upgrade.mjs.map +1 -1
  27. package/dist/config.cjs +18 -13
  28. package/dist/config.cjs.map +1 -1
  29. package/dist/config.d.cts +10 -1
  30. package/dist/config.d.cts.map +1 -1
  31. package/dist/config.d.mts +10 -1
  32. package/dist/config.d.mts.map +1 -1
  33. package/dist/config.mjs +18 -14
  34. package/dist/config.mjs.map +1 -1
  35. package/dist/contract.d.cts +2 -2
  36. package/dist/contract.d.mts +2 -2
  37. package/dist/host.cjs +1 -0
  38. package/dist/host.cjs.map +1 -1
  39. package/dist/host.d.cts.map +1 -1
  40. package/dist/host.d.mts.map +1 -1
  41. package/dist/host.mjs +1 -0
  42. package/dist/host.mjs.map +1 -1
  43. package/dist/index.cjs +1 -0
  44. package/dist/index.d.cts +2 -2
  45. package/dist/index.d.mts +2 -2
  46. package/dist/index.mjs +2 -2
  47. package/dist/internal/manifest-normalizer.cjs +7 -0
  48. package/dist/internal/manifest-normalizer.cjs.map +1 -1
  49. package/dist/internal/manifest-normalizer.mjs +7 -0
  50. package/dist/internal/manifest-normalizer.mjs.map +1 -1
  51. package/dist/orchestrator.d.cts +1 -1
  52. package/dist/orchestrator.d.mts +1 -1
  53. package/dist/plugin.d.cts +1 -1
  54. package/dist/plugin.d.mts +1 -1
  55. package/dist/ui/index.cjs +0 -9
  56. package/dist/ui/index.d.cts +2 -2
  57. package/dist/ui/index.d.mts +2 -2
  58. package/dist/ui/index.mjs +2 -2
  59. package/dist/ui/runtime.cjs +1 -43
  60. package/dist/ui/runtime.cjs.map +1 -1
  61. package/dist/ui/runtime.d.cts +1 -16
  62. package/dist/ui/runtime.d.cts.map +1 -1
  63. package/dist/ui/runtime.d.mts +1 -16
  64. package/dist/ui/runtime.d.mts.map +1 -1
  65. package/dist/ui/runtime.mjs +2 -36
  66. package/dist/ui/runtime.mjs.map +1 -1
  67. package/package.json +1 -1
  68. package/src/app.ts +8 -113
  69. package/src/cli/framework-version.ts +61 -0
  70. package/src/cli/init.ts +16 -4
  71. package/src/cli/status.ts +2 -15
  72. package/src/cli/sync.ts +145 -24
  73. package/src/cli/upgrade.ts +94 -72
  74. package/src/config.ts +51 -14
  75. package/src/host.ts +1 -0
  76. package/src/internal/manifest-normalizer.ts +13 -0
  77. package/src/ui/runtime.ts +1 -48
package/dist/app.cjs CHANGED
@@ -1,5 +1,4 @@
1
1
  const require_runtime = require('./_virtual/_rolldown/runtime.cjs');
2
- const require_network = require('./network.cjs');
3
2
  const require_config = require('./config.cjs');
4
3
  let node_fs = require("node:fs");
5
4
  let node_path = require("node:path");
@@ -27,102 +26,14 @@ function detectLocalPackages(bosConfig, runtimeConfig) {
27
26
  return packages;
28
27
  }
29
28
  function buildRuntimeConfig(bosConfig, options) {
30
- const configDir = require_config.getProjectRoot();
31
- const hostConfig = bosConfig.app.host;
32
- const uiConfig = bosConfig.app.ui;
33
- const apiConfig = bosConfig.app.api;
34
- const authConfig = bosConfig.app.auth;
35
- function resolveDevelopmentEntry(entry, preferredSource) {
36
- if (preferredSource === "remote") return {
37
- source: "remote",
38
- url: entry.production ?? ""
39
- };
40
- const localPath = require_config.resolveLocalDevelopmentPath(entry.development, configDir);
41
- if (localPath && (0, node_fs.existsSync)(localPath)) return {
42
- source: "local",
43
- url: "",
44
- localPath
45
- };
46
- const devUrl = entry.development && !require_config.isLocalDevelopmentTarget(entry.development) ? entry.development.replace(/\/$/, "") : null;
47
- if (devUrl) return {
48
- source: "local",
49
- url: devUrl,
50
- port: require_config.parsePort(devUrl)
51
- };
52
- return {
53
- source: "remote",
54
- url: entry.production ?? ""
55
- };
56
- }
57
- const hostEntry = resolveDevelopmentEntry(hostConfig, options.hostSource ?? "local");
58
- const uiEntry = resolveDevelopmentEntry(uiConfig, options.uiSource ?? "local");
59
- const apiEntry = resolveDevelopmentEntry(apiConfig, options.apiSource ?? "local");
60
- const authEntry = authConfig ? resolveDevelopmentEntry(authConfig, options.authSource ?? "local") : void 0;
61
- const hostUrl = `http://localhost:${DEFAULT_HOST_PORT}`;
62
- return {
63
- env: options.env ?? "development",
64
- account: bosConfig.account,
65
- domain: bosConfig.domain,
66
- networkId: require_network.getNetworkIdForAccount(bosConfig.account),
67
- host: {
68
- name: "host",
69
- url: hostUrl,
70
- entry: `${hostUrl}/mf-manifest.json`,
71
- localPath: hostEntry.localPath,
72
- port: hostEntry.port ?? DEFAULT_HOST_PORT,
73
- secrets: hostConfig.secrets,
74
- integrity: hostEntry.source === "remote" ? hostConfig.integrity : void 0,
75
- source: hostEntry.source,
76
- remoteUrl: hostEntry.source === "remote" ? hostEntry.url : void 0
77
- },
78
- shared: bosConfig.shared,
79
- ui: uiConfig ? {
80
- name: uiConfig.name,
81
- url: uiEntry.url,
82
- entry: uiEntry.url ? `${uiEntry.url}/mf-manifest.json` : "/mf-manifest.json",
83
- localPath: uiEntry.localPath,
84
- port: uiEntry.port,
85
- ssrUrl: uiEntry.source === "remote" ? uiConfig.ssr : void 0,
86
- ssrIntegrity: uiEntry.source === "remote" ? uiConfig.ssrIntegrity : void 0,
87
- integrity: uiEntry.source === "remote" ? uiConfig.integrity : void 0,
88
- source: uiEntry.source
89
- } : {
90
- name: "ui",
91
- url: "",
92
- entry: "/mf-manifest.json",
93
- source: uiEntry.source
94
- },
95
- api: apiConfig ? {
96
- name: apiConfig.name,
97
- url: apiEntry.url,
98
- entry: apiEntry.url ? `${apiEntry.url}/mf-manifest.json` : "/mf-manifest.json",
99
- localPath: apiEntry.localPath,
100
- port: apiEntry.port,
101
- source: apiEntry.source,
102
- proxy: options.proxy ?? apiConfig.proxy,
103
- variables: apiConfig.variables,
104
- secrets: apiConfig.secrets,
105
- integrity: apiEntry.source === "remote" ? apiConfig.integrity : void 0
106
- } : {
107
- name: "api",
108
- url: "",
109
- entry: "/mf-manifest.json",
110
- source: apiEntry.source
111
- },
112
- auth: authEntry && authConfig ? {
113
- name: require_config.resolvePluginRuntimeName(void 0, authEntry.localPath, authConfig.name),
114
- url: authEntry.url,
115
- entry: authEntry.url ? `${authEntry.url}/mf-manifest.json` : "/mf-manifest.json",
116
- localPath: authEntry.localPath,
117
- port: authEntry.port,
118
- source: authEntry.source,
119
- proxy: authConfig.proxy,
120
- variables: authConfig.variables,
121
- secrets: authConfig.secrets,
122
- integrity: authEntry.source === "remote" ? authConfig.integrity : void 0
123
- } : void 0,
29
+ return require_config.buildRuntimeConfig(bosConfig, require_config.getProjectRoot(), options.env ?? "development", {
30
+ hostSource: options.hostSource,
31
+ uiSource: options.uiSource,
32
+ apiSource: options.apiSource,
33
+ authSource: options.authSource,
34
+ proxy: options.proxy,
124
35
  plugins: options.plugins
125
- };
36
+ });
126
37
  }
127
38
  function probeTcpOpen(port, timeoutMs = 250) {
128
39
  return new Promise((resolve) => {
package/dist/app.cjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.cjs","names":["getProjectRoot","resolveLocalDevelopmentPath","isLocalDevelopmentTarget","parsePort","getNetworkIdForAccount","resolvePluginRuntimeName"],"sources":["../src/app.ts"],"sourcesContent":["import { existsSync } from \"node:fs\";\nimport { createConnection } from \"node:net\";\nimport { join } from \"node:path\";\nimport {\n getProjectRoot,\n isLocalDevelopmentTarget,\n parsePort,\n resolveLocalDevelopmentPath,\n resolvePluginRuntimeName,\n} from \"./config\";\nimport { getNetworkIdForAccount } from \"./network\";\nimport type { AppOrchestrator } from \"./service-descriptor\";\nimport type { BosConfig, RuntimeConfig, RuntimePluginConfig } from \"./types\";\n\nexport type { AppOrchestrator };\n\nconst DEFAULT_HOST_PORT = 3000;\nconst DEFAULT_API_PORT = 3001;\nconst DEFAULT_AUTH_PORT = 3002;\nconst DEFAULT_UI_PORT = 3003;\nconst DEFAULT_PLUGIN_PORT_START = 3010;\n\nexport function detectLocalPackages(\n bosConfig?: BosConfig,\n runtimeConfig?: RuntimeConfig,\n): string[] {\n const packages: string[] = [];\n const configDir = getProjectRoot();\n\n const uiLocalPath =\n runtimeConfig?.ui.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.ui.development, configDir);\n if (uiLocalPath && existsSync(join(uiLocalPath, \"package.json\"))) {\n packages.push(\"ui\");\n }\n\n const apiLocalPath =\n runtimeConfig?.api.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.api.development, configDir);\n if (apiLocalPath && existsSync(join(apiLocalPath, \"package.json\"))) {\n packages.push(\"api\");\n }\n\n const hostLocalPath =\n runtimeConfig?.host?.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.host.development, configDir);\n if (hostLocalPath && existsSync(join(hostLocalPath, \"package.json\"))) {\n packages.push(\"host\");\n } else if (existsSync(join(configDir, \"host\", \"package.json\"))) {\n packages.push(\"host\");\n }\n\n for (const [pluginId, pluginConfig] of Object.entries(runtimeConfig?.plugins ?? {})) {\n if (pluginConfig.localPath && existsSync(join(pluginConfig.localPath, \"package.json\"))) {\n packages.push(`plugin:${pluginId}`);\n }\n }\n\n const authLocalPath =\n runtimeConfig?.auth?.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.auth?.development, configDir);\n if (authLocalPath && existsSync(join(authLocalPath, \"package.json\"))) {\n packages.push(\"auth\");\n }\n\n return packages;\n}\n\nexport function buildRuntimeConfig(\n bosConfig: BosConfig,\n options: {\n hostSource?: \"local\" | \"remote\";\n uiSource?: \"local\" | \"remote\";\n apiSource?: \"local\" | \"remote\";\n authSource?: \"local\" | \"remote\";\n proxy?: string;\n env?: \"development\" | \"production\";\n plugins?: Record<string, RuntimePluginConfig>;\n },\n): RuntimeConfig {\n const configDir = getProjectRoot();\n const hostConfig = bosConfig.app.host;\n const uiConfig = bosConfig.app.ui;\n const apiConfig = bosConfig.app.api;\n const authConfig = bosConfig.app.auth;\n\n function resolveDevelopmentEntry(\n entry: { development?: string; production?: string },\n preferredSource: \"local\" | \"remote\",\n ): { source: \"local\" | \"remote\"; url: string; localPath?: string; port?: number } {\n if (preferredSource === \"remote\") {\n return { source: \"remote\", url: entry.production ?? \"\" };\n }\n\n const localPath = resolveLocalDevelopmentPath(entry.development, configDir);\n if (localPath && existsSync(localPath)) {\n return { source: \"local\", url: \"\", localPath };\n }\n\n const devUrl =\n entry.development && !isLocalDevelopmentTarget(entry.development)\n ? entry.development.replace(/\\/$/, \"\")\n : null;\n if (devUrl) {\n return { source: \"local\", url: devUrl, port: parsePort(devUrl) };\n }\n\n return { source: \"remote\", url: entry.production ?? \"\" };\n }\n\n const hostEntry = resolveDevelopmentEntry(hostConfig, options.hostSource ?? \"local\");\n const uiEntry = resolveDevelopmentEntry(uiConfig, options.uiSource ?? \"local\");\n const apiEntry = resolveDevelopmentEntry(apiConfig, options.apiSource ?? \"local\");\n const authEntry = authConfig\n ? resolveDevelopmentEntry(authConfig, options.authSource ?? \"local\")\n : undefined;\n\n const hostUrl = `http://localhost:${DEFAULT_HOST_PORT}`;\n\n return {\n env: options.env ?? \"development\",\n account: bosConfig.account,\n domain: bosConfig.domain,\n networkId: getNetworkIdForAccount(bosConfig.account),\n host: {\n name: \"host\",\n url: hostUrl,\n entry: `${hostUrl}/mf-manifest.json`,\n localPath: hostEntry.localPath,\n port: hostEntry.port ?? DEFAULT_HOST_PORT,\n secrets: hostConfig.secrets,\n integrity: hostEntry.source === \"remote\" ? hostConfig.integrity : undefined,\n source: hostEntry.source,\n remoteUrl: hostEntry.source === \"remote\" ? hostEntry.url : undefined,\n },\n shared: bosConfig.shared,\n ui: uiConfig\n ? {\n name: uiConfig.name,\n url: uiEntry.url,\n entry: uiEntry.url ? `${uiEntry.url}/mf-manifest.json` : \"/mf-manifest.json\",\n localPath: uiEntry.localPath,\n port: uiEntry.port,\n ssrUrl: uiEntry.source === \"remote\" ? uiConfig.ssr : undefined,\n ssrIntegrity: uiEntry.source === \"remote\" ? uiConfig.ssrIntegrity : undefined,\n integrity: uiEntry.source === \"remote\" ? uiConfig.integrity : undefined,\n source: uiEntry.source,\n }\n : {\n name: \"ui\",\n url: \"\",\n entry: \"/mf-manifest.json\",\n source: uiEntry.source,\n },\n api: apiConfig\n ? {\n name: apiConfig.name,\n url: apiEntry.url,\n entry: apiEntry.url ? `${apiEntry.url}/mf-manifest.json` : \"/mf-manifest.json\",\n localPath: apiEntry.localPath,\n port: apiEntry.port,\n source: apiEntry.source,\n proxy: options.proxy ?? apiConfig.proxy,\n variables: apiConfig.variables,\n secrets: apiConfig.secrets,\n integrity: apiEntry.source === \"remote\" ? apiConfig.integrity : undefined,\n }\n : {\n name: \"api\",\n url: \"\",\n entry: \"/mf-manifest.json\",\n source: apiEntry.source,\n },\n auth:\n authEntry && authConfig\n ? {\n name: resolvePluginRuntimeName(undefined, authEntry.localPath, authConfig.name),\n url: authEntry.url,\n entry: authEntry.url ? `${authEntry.url}/mf-manifest.json` : \"/mf-manifest.json\",\n localPath: authEntry.localPath,\n port: authEntry.port,\n source: authEntry.source,\n proxy: authConfig.proxy,\n variables: authConfig.variables,\n secrets: authConfig.secrets,\n integrity: authEntry.source === \"remote\" ? authConfig.integrity : undefined,\n }\n : undefined,\n plugins: options.plugins,\n };\n}\n\nfunction probeTcpOpen(port: number, timeoutMs = 250): Promise<boolean> {\n return new Promise((resolve) => {\n const socket = createConnection({ host: \"127.0.0.1\", port });\n const timer = setTimeout(() => {\n socket.destroy();\n resolve(false);\n }, timeoutMs);\n\n socket.once(\"connect\", () => {\n clearTimeout(timer);\n socket.destroy();\n resolve(true);\n });\n\n socket.once(\"error\", () => {\n clearTimeout(timer);\n resolve(false);\n });\n });\n}\n\nasync function pickAvailablePort(preferred: number, usedPorts: Set<number>): Promise<number> {\n let port = preferred;\n while (usedPorts.has(port) || (await probeTcpOpen(port))) {\n port += 1;\n }\n usedPorts.add(port);\n return port;\n}\n\nfunction withLocalRuntimeUrl<\n T extends { url: string; entry: string; port?: number; localPath?: string },\n>(entry: T, port: number): T {\n const url = `http://localhost:${port}`;\n return {\n ...entry,\n url,\n entry: `${url}/mf-manifest.json`,\n port,\n };\n}\n\nexport async function prepareDevelopmentRuntimeConfig(\n runtimeConfig: RuntimeConfig,\n options?: { hostPort?: number; ssr?: boolean },\n): Promise<RuntimeConfig> {\n const usedPorts = new Set<number>();\n const hostPort = await pickAvailablePort(options?.hostPort ?? DEFAULT_HOST_PORT, usedPorts);\n\n const next: RuntimeConfig = {\n ...runtimeConfig,\n host: { ...runtimeConfig.host, url: `http://localhost:${hostPort}`, port: hostPort },\n ui: { ...runtimeConfig.ui },\n api: { ...runtimeConfig.api },\n auth: runtimeConfig.auth ? { ...runtimeConfig.auth } : undefined,\n plugins: runtimeConfig.plugins ? { ...runtimeConfig.plugins } : undefined,\n };\n\n if (next.api.source === \"local\" && next.api.localPath) {\n const apiPort = await pickAvailablePort(next.api.port ?? DEFAULT_API_PORT, usedPorts);\n next.api = withLocalRuntimeUrl(next.api, apiPort);\n }\n\n if (next.auth?.source === \"local\" && next.auth.localPath) {\n const authPort = await pickAvailablePort(next.auth.port ?? DEFAULT_AUTH_PORT, usedPorts);\n next.auth = withLocalRuntimeUrl(next.auth, authPort);\n }\n\n if (next.ui.source === \"local\" && next.ui.localPath) {\n const uiPort = await pickAvailablePort(next.ui.port ?? DEFAULT_UI_PORT, usedPorts);\n next.ui = withLocalRuntimeUrl(next.ui, uiPort);\n if (options?.ssr) {\n const ssrPort = await pickAvailablePort(uiPort + 1, usedPorts);\n next.ui.ssrUrl = `http://localhost:${ssrPort}`;\n } else {\n next.ui.ssrUrl = undefined;\n }\n }\n\n if (next.plugins) {\n const entries = Object.entries(next.plugins).sort(([a], [b]) => a.localeCompare(b));\n let pluginBasePort = DEFAULT_PLUGIN_PORT_START;\n\n for (const [pluginId, plugin] of entries) {\n if (plugin.source !== \"local\" || !plugin.localPath) {\n continue;\n }\n\n const pluginPort = await pickAvailablePort(plugin.port ?? pluginBasePort, usedPorts);\n next.plugins[pluginId] = withLocalRuntimeUrl(plugin, pluginPort);\n pluginBasePort = pluginPort + 1;\n }\n }\n\n return next;\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"app.cjs","names":["getProjectRoot","resolveLocalDevelopmentPath","configBuildRuntimeConfig"],"sources":["../src/app.ts"],"sourcesContent":["import { existsSync } from \"node:fs\";\nimport { createConnection } from \"node:net\";\nimport { join } from \"node:path\";\nimport {\n buildRuntimeConfig as configBuildRuntimeConfig,\n getProjectRoot,\n resolveLocalDevelopmentPath,\n} from \"./config\";\nimport type { AppOrchestrator } from \"./service-descriptor\";\nimport type { BosConfig, RuntimeConfig, RuntimePluginConfig } from \"./types\";\n\nexport type { AppOrchestrator };\n\nconst DEFAULT_HOST_PORT = 3000;\nconst DEFAULT_API_PORT = 3001;\nconst DEFAULT_AUTH_PORT = 3002;\nconst DEFAULT_UI_PORT = 3003;\nconst DEFAULT_PLUGIN_PORT_START = 3010;\n\nexport function detectLocalPackages(\n bosConfig?: BosConfig,\n runtimeConfig?: RuntimeConfig,\n): string[] {\n const packages: string[] = [];\n const configDir = getProjectRoot();\n\n const uiLocalPath =\n runtimeConfig?.ui.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.ui.development, configDir);\n if (uiLocalPath && existsSync(join(uiLocalPath, \"package.json\"))) {\n packages.push(\"ui\");\n }\n\n const apiLocalPath =\n runtimeConfig?.api.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.api.development, configDir);\n if (apiLocalPath && existsSync(join(apiLocalPath, \"package.json\"))) {\n packages.push(\"api\");\n }\n\n const hostLocalPath =\n runtimeConfig?.host?.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.host.development, configDir);\n if (hostLocalPath && existsSync(join(hostLocalPath, \"package.json\"))) {\n packages.push(\"host\");\n } else if (existsSync(join(configDir, \"host\", \"package.json\"))) {\n packages.push(\"host\");\n }\n\n for (const [pluginId, pluginConfig] of Object.entries(runtimeConfig?.plugins ?? {})) {\n if (pluginConfig.localPath && existsSync(join(pluginConfig.localPath, \"package.json\"))) {\n packages.push(`plugin:${pluginId}`);\n }\n }\n\n const authLocalPath =\n runtimeConfig?.auth?.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.auth?.development, configDir);\n if (authLocalPath && existsSync(join(authLocalPath, \"package.json\"))) {\n packages.push(\"auth\");\n }\n\n return packages;\n}\n\nexport function buildRuntimeConfig(\n bosConfig: BosConfig,\n options: {\n hostSource?: \"local\" | \"remote\";\n uiSource?: \"local\" | \"remote\";\n apiSource?: \"local\" | \"remote\";\n authSource?: \"local\" | \"remote\";\n proxy?: string;\n env?: \"development\" | \"production\";\n plugins?: Record<string, RuntimePluginConfig>;\n },\n): RuntimeConfig {\n return configBuildRuntimeConfig(bosConfig, getProjectRoot(), options.env ?? \"development\", {\n hostSource: options.hostSource,\n uiSource: options.uiSource,\n apiSource: options.apiSource,\n authSource: options.authSource,\n proxy: options.proxy,\n plugins: options.plugins,\n });\n}\n\nfunction probeTcpOpen(port: number, timeoutMs = 250): Promise<boolean> {\n return new Promise((resolve) => {\n const socket = createConnection({ host: \"127.0.0.1\", port });\n const timer = setTimeout(() => {\n socket.destroy();\n resolve(false);\n }, timeoutMs);\n\n socket.once(\"connect\", () => {\n clearTimeout(timer);\n socket.destroy();\n resolve(true);\n });\n\n socket.once(\"error\", () => {\n clearTimeout(timer);\n resolve(false);\n });\n });\n}\n\nasync function pickAvailablePort(preferred: number, usedPorts: Set<number>): Promise<number> {\n let port = preferred;\n while (usedPorts.has(port) || (await probeTcpOpen(port))) {\n port += 1;\n }\n usedPorts.add(port);\n return port;\n}\n\nfunction withLocalRuntimeUrl<\n T extends { url: string; entry: string; port?: number; localPath?: string },\n>(entry: T, port: number): T {\n const url = `http://localhost:${port}`;\n return {\n ...entry,\n url,\n entry: `${url}/mf-manifest.json`,\n port,\n };\n}\n\nexport async function prepareDevelopmentRuntimeConfig(\n runtimeConfig: RuntimeConfig,\n options?: { hostPort?: number; ssr?: boolean },\n): Promise<RuntimeConfig> {\n const usedPorts = new Set<number>();\n const hostPort = await pickAvailablePort(options?.hostPort ?? DEFAULT_HOST_PORT, usedPorts);\n\n const next: RuntimeConfig = {\n ...runtimeConfig,\n host: { ...runtimeConfig.host, url: `http://localhost:${hostPort}`, port: hostPort },\n ui: { ...runtimeConfig.ui },\n api: { ...runtimeConfig.api },\n auth: runtimeConfig.auth ? { ...runtimeConfig.auth } : undefined,\n plugins: runtimeConfig.plugins ? { ...runtimeConfig.plugins } : undefined,\n };\n\n if (next.api.source === \"local\" && next.api.localPath) {\n const apiPort = await pickAvailablePort(next.api.port ?? DEFAULT_API_PORT, usedPorts);\n next.api = withLocalRuntimeUrl(next.api, apiPort);\n }\n\n if (next.auth?.source === \"local\" && next.auth.localPath) {\n const authPort = await pickAvailablePort(next.auth.port ?? DEFAULT_AUTH_PORT, usedPorts);\n next.auth = withLocalRuntimeUrl(next.auth, authPort);\n }\n\n if (next.ui.source === \"local\" && next.ui.localPath) {\n const uiPort = await pickAvailablePort(next.ui.port ?? DEFAULT_UI_PORT, usedPorts);\n next.ui = withLocalRuntimeUrl(next.ui, uiPort);\n if (options?.ssr) {\n const ssrPort = await pickAvailablePort(uiPort + 1, usedPorts);\n next.ui.ssrUrl = `http://localhost:${ssrPort}`;\n } else {\n next.ui.ssrUrl = undefined;\n }\n }\n\n if (next.plugins) {\n const entries = Object.entries(next.plugins).sort(([a], [b]) => a.localeCompare(b));\n let pluginBasePort = DEFAULT_PLUGIN_PORT_START;\n\n for (const [pluginId, plugin] of entries) {\n if (plugin.source !== \"local\" || !plugin.localPath) {\n continue;\n }\n\n const pluginPort = await pickAvailablePort(plugin.port ?? pluginBasePort, usedPorts);\n next.plugins[pluginId] = withLocalRuntimeUrl(plugin, pluginPort);\n pluginBasePort = pluginPort + 1;\n }\n }\n\n return next;\n}\n"],"mappings":"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"}
package/dist/app.mjs CHANGED
@@ -1,5 +1,4 @@
1
- import { getNetworkIdForAccount } from "./network.mjs";
2
- import { getProjectRoot, isLocalDevelopmentTarget, parsePort, resolveLocalDevelopmentPath, resolvePluginRuntimeName } from "./config.mjs";
1
+ import { buildRuntimeConfig as buildRuntimeConfig$1, getProjectRoot, resolveLocalDevelopmentPath } from "./config.mjs";
3
2
  import { existsSync } from "node:fs";
4
3
  import { join } from "node:path";
5
4
  import { createConnection } from "node:net";
@@ -26,102 +25,14 @@ function detectLocalPackages(bosConfig, runtimeConfig) {
26
25
  return packages;
27
26
  }
28
27
  function buildRuntimeConfig(bosConfig, options) {
29
- const configDir = getProjectRoot();
30
- const hostConfig = bosConfig.app.host;
31
- const uiConfig = bosConfig.app.ui;
32
- const apiConfig = bosConfig.app.api;
33
- const authConfig = bosConfig.app.auth;
34
- function resolveDevelopmentEntry(entry, preferredSource) {
35
- if (preferredSource === "remote") return {
36
- source: "remote",
37
- url: entry.production ?? ""
38
- };
39
- const localPath = resolveLocalDevelopmentPath(entry.development, configDir);
40
- if (localPath && existsSync(localPath)) return {
41
- source: "local",
42
- url: "",
43
- localPath
44
- };
45
- const devUrl = entry.development && !isLocalDevelopmentTarget(entry.development) ? entry.development.replace(/\/$/, "") : null;
46
- if (devUrl) return {
47
- source: "local",
48
- url: devUrl,
49
- port: parsePort(devUrl)
50
- };
51
- return {
52
- source: "remote",
53
- url: entry.production ?? ""
54
- };
55
- }
56
- const hostEntry = resolveDevelopmentEntry(hostConfig, options.hostSource ?? "local");
57
- const uiEntry = resolveDevelopmentEntry(uiConfig, options.uiSource ?? "local");
58
- const apiEntry = resolveDevelopmentEntry(apiConfig, options.apiSource ?? "local");
59
- const authEntry = authConfig ? resolveDevelopmentEntry(authConfig, options.authSource ?? "local") : void 0;
60
- const hostUrl = `http://localhost:${DEFAULT_HOST_PORT}`;
61
- return {
62
- env: options.env ?? "development",
63
- account: bosConfig.account,
64
- domain: bosConfig.domain,
65
- networkId: getNetworkIdForAccount(bosConfig.account),
66
- host: {
67
- name: "host",
68
- url: hostUrl,
69
- entry: `${hostUrl}/mf-manifest.json`,
70
- localPath: hostEntry.localPath,
71
- port: hostEntry.port ?? DEFAULT_HOST_PORT,
72
- secrets: hostConfig.secrets,
73
- integrity: hostEntry.source === "remote" ? hostConfig.integrity : void 0,
74
- source: hostEntry.source,
75
- remoteUrl: hostEntry.source === "remote" ? hostEntry.url : void 0
76
- },
77
- shared: bosConfig.shared,
78
- ui: uiConfig ? {
79
- name: uiConfig.name,
80
- url: uiEntry.url,
81
- entry: uiEntry.url ? `${uiEntry.url}/mf-manifest.json` : "/mf-manifest.json",
82
- localPath: uiEntry.localPath,
83
- port: uiEntry.port,
84
- ssrUrl: uiEntry.source === "remote" ? uiConfig.ssr : void 0,
85
- ssrIntegrity: uiEntry.source === "remote" ? uiConfig.ssrIntegrity : void 0,
86
- integrity: uiEntry.source === "remote" ? uiConfig.integrity : void 0,
87
- source: uiEntry.source
88
- } : {
89
- name: "ui",
90
- url: "",
91
- entry: "/mf-manifest.json",
92
- source: uiEntry.source
93
- },
94
- api: apiConfig ? {
95
- name: apiConfig.name,
96
- url: apiEntry.url,
97
- entry: apiEntry.url ? `${apiEntry.url}/mf-manifest.json` : "/mf-manifest.json",
98
- localPath: apiEntry.localPath,
99
- port: apiEntry.port,
100
- source: apiEntry.source,
101
- proxy: options.proxy ?? apiConfig.proxy,
102
- variables: apiConfig.variables,
103
- secrets: apiConfig.secrets,
104
- integrity: apiEntry.source === "remote" ? apiConfig.integrity : void 0
105
- } : {
106
- name: "api",
107
- url: "",
108
- entry: "/mf-manifest.json",
109
- source: apiEntry.source
110
- },
111
- auth: authEntry && authConfig ? {
112
- name: resolvePluginRuntimeName(void 0, authEntry.localPath, authConfig.name),
113
- url: authEntry.url,
114
- entry: authEntry.url ? `${authEntry.url}/mf-manifest.json` : "/mf-manifest.json",
115
- localPath: authEntry.localPath,
116
- port: authEntry.port,
117
- source: authEntry.source,
118
- proxy: authConfig.proxy,
119
- variables: authConfig.variables,
120
- secrets: authConfig.secrets,
121
- integrity: authEntry.source === "remote" ? authConfig.integrity : void 0
122
- } : void 0,
28
+ return buildRuntimeConfig$1(bosConfig, getProjectRoot(), options.env ?? "development", {
29
+ hostSource: options.hostSource,
30
+ uiSource: options.uiSource,
31
+ apiSource: options.apiSource,
32
+ authSource: options.authSource,
33
+ proxy: options.proxy,
123
34
  plugins: options.plugins
124
- };
35
+ });
125
36
  }
126
37
  function probeTcpOpen(port, timeoutMs = 250) {
127
38
  return new Promise((resolve) => {
package/dist/app.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.mjs","names":[],"sources":["../src/app.ts"],"sourcesContent":["import { existsSync } from \"node:fs\";\nimport { createConnection } from \"node:net\";\nimport { join } from \"node:path\";\nimport {\n getProjectRoot,\n isLocalDevelopmentTarget,\n parsePort,\n resolveLocalDevelopmentPath,\n resolvePluginRuntimeName,\n} from \"./config\";\nimport { getNetworkIdForAccount } from \"./network\";\nimport type { AppOrchestrator } from \"./service-descriptor\";\nimport type { BosConfig, RuntimeConfig, RuntimePluginConfig } from \"./types\";\n\nexport type { AppOrchestrator };\n\nconst DEFAULT_HOST_PORT = 3000;\nconst DEFAULT_API_PORT = 3001;\nconst DEFAULT_AUTH_PORT = 3002;\nconst DEFAULT_UI_PORT = 3003;\nconst DEFAULT_PLUGIN_PORT_START = 3010;\n\nexport function detectLocalPackages(\n bosConfig?: BosConfig,\n runtimeConfig?: RuntimeConfig,\n): string[] {\n const packages: string[] = [];\n const configDir = getProjectRoot();\n\n const uiLocalPath =\n runtimeConfig?.ui.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.ui.development, configDir);\n if (uiLocalPath && existsSync(join(uiLocalPath, \"package.json\"))) {\n packages.push(\"ui\");\n }\n\n const apiLocalPath =\n runtimeConfig?.api.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.api.development, configDir);\n if (apiLocalPath && existsSync(join(apiLocalPath, \"package.json\"))) {\n packages.push(\"api\");\n }\n\n const hostLocalPath =\n runtimeConfig?.host?.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.host.development, configDir);\n if (hostLocalPath && existsSync(join(hostLocalPath, \"package.json\"))) {\n packages.push(\"host\");\n } else if (existsSync(join(configDir, \"host\", \"package.json\"))) {\n packages.push(\"host\");\n }\n\n for (const [pluginId, pluginConfig] of Object.entries(runtimeConfig?.plugins ?? {})) {\n if (pluginConfig.localPath && existsSync(join(pluginConfig.localPath, \"package.json\"))) {\n packages.push(`plugin:${pluginId}`);\n }\n }\n\n const authLocalPath =\n runtimeConfig?.auth?.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.auth?.development, configDir);\n if (authLocalPath && existsSync(join(authLocalPath, \"package.json\"))) {\n packages.push(\"auth\");\n }\n\n return packages;\n}\n\nexport function buildRuntimeConfig(\n bosConfig: BosConfig,\n options: {\n hostSource?: \"local\" | \"remote\";\n uiSource?: \"local\" | \"remote\";\n apiSource?: \"local\" | \"remote\";\n authSource?: \"local\" | \"remote\";\n proxy?: string;\n env?: \"development\" | \"production\";\n plugins?: Record<string, RuntimePluginConfig>;\n },\n): RuntimeConfig {\n const configDir = getProjectRoot();\n const hostConfig = bosConfig.app.host;\n const uiConfig = bosConfig.app.ui;\n const apiConfig = bosConfig.app.api;\n const authConfig = bosConfig.app.auth;\n\n function resolveDevelopmentEntry(\n entry: { development?: string; production?: string },\n preferredSource: \"local\" | \"remote\",\n ): { source: \"local\" | \"remote\"; url: string; localPath?: string; port?: number } {\n if (preferredSource === \"remote\") {\n return { source: \"remote\", url: entry.production ?? \"\" };\n }\n\n const localPath = resolveLocalDevelopmentPath(entry.development, configDir);\n if (localPath && existsSync(localPath)) {\n return { source: \"local\", url: \"\", localPath };\n }\n\n const devUrl =\n entry.development && !isLocalDevelopmentTarget(entry.development)\n ? entry.development.replace(/\\/$/, \"\")\n : null;\n if (devUrl) {\n return { source: \"local\", url: devUrl, port: parsePort(devUrl) };\n }\n\n return { source: \"remote\", url: entry.production ?? \"\" };\n }\n\n const hostEntry = resolveDevelopmentEntry(hostConfig, options.hostSource ?? \"local\");\n const uiEntry = resolveDevelopmentEntry(uiConfig, options.uiSource ?? \"local\");\n const apiEntry = resolveDevelopmentEntry(apiConfig, options.apiSource ?? \"local\");\n const authEntry = authConfig\n ? resolveDevelopmentEntry(authConfig, options.authSource ?? \"local\")\n : undefined;\n\n const hostUrl = `http://localhost:${DEFAULT_HOST_PORT}`;\n\n return {\n env: options.env ?? \"development\",\n account: bosConfig.account,\n domain: bosConfig.domain,\n networkId: getNetworkIdForAccount(bosConfig.account),\n host: {\n name: \"host\",\n url: hostUrl,\n entry: `${hostUrl}/mf-manifest.json`,\n localPath: hostEntry.localPath,\n port: hostEntry.port ?? DEFAULT_HOST_PORT,\n secrets: hostConfig.secrets,\n integrity: hostEntry.source === \"remote\" ? hostConfig.integrity : undefined,\n source: hostEntry.source,\n remoteUrl: hostEntry.source === \"remote\" ? hostEntry.url : undefined,\n },\n shared: bosConfig.shared,\n ui: uiConfig\n ? {\n name: uiConfig.name,\n url: uiEntry.url,\n entry: uiEntry.url ? `${uiEntry.url}/mf-manifest.json` : \"/mf-manifest.json\",\n localPath: uiEntry.localPath,\n port: uiEntry.port,\n ssrUrl: uiEntry.source === \"remote\" ? uiConfig.ssr : undefined,\n ssrIntegrity: uiEntry.source === \"remote\" ? uiConfig.ssrIntegrity : undefined,\n integrity: uiEntry.source === \"remote\" ? uiConfig.integrity : undefined,\n source: uiEntry.source,\n }\n : {\n name: \"ui\",\n url: \"\",\n entry: \"/mf-manifest.json\",\n source: uiEntry.source,\n },\n api: apiConfig\n ? {\n name: apiConfig.name,\n url: apiEntry.url,\n entry: apiEntry.url ? `${apiEntry.url}/mf-manifest.json` : \"/mf-manifest.json\",\n localPath: apiEntry.localPath,\n port: apiEntry.port,\n source: apiEntry.source,\n proxy: options.proxy ?? apiConfig.proxy,\n variables: apiConfig.variables,\n secrets: apiConfig.secrets,\n integrity: apiEntry.source === \"remote\" ? apiConfig.integrity : undefined,\n }\n : {\n name: \"api\",\n url: \"\",\n entry: \"/mf-manifest.json\",\n source: apiEntry.source,\n },\n auth:\n authEntry && authConfig\n ? {\n name: resolvePluginRuntimeName(undefined, authEntry.localPath, authConfig.name),\n url: authEntry.url,\n entry: authEntry.url ? `${authEntry.url}/mf-manifest.json` : \"/mf-manifest.json\",\n localPath: authEntry.localPath,\n port: authEntry.port,\n source: authEntry.source,\n proxy: authConfig.proxy,\n variables: authConfig.variables,\n secrets: authConfig.secrets,\n integrity: authEntry.source === \"remote\" ? authConfig.integrity : undefined,\n }\n : undefined,\n plugins: options.plugins,\n };\n}\n\nfunction probeTcpOpen(port: number, timeoutMs = 250): Promise<boolean> {\n return new Promise((resolve) => {\n const socket = createConnection({ host: \"127.0.0.1\", port });\n const timer = setTimeout(() => {\n socket.destroy();\n resolve(false);\n }, timeoutMs);\n\n socket.once(\"connect\", () => {\n clearTimeout(timer);\n socket.destroy();\n resolve(true);\n });\n\n socket.once(\"error\", () => {\n clearTimeout(timer);\n resolve(false);\n });\n });\n}\n\nasync function pickAvailablePort(preferred: number, usedPorts: Set<number>): Promise<number> {\n let port = preferred;\n while (usedPorts.has(port) || (await probeTcpOpen(port))) {\n port += 1;\n }\n usedPorts.add(port);\n return port;\n}\n\nfunction withLocalRuntimeUrl<\n T extends { url: string; entry: string; port?: number; localPath?: string },\n>(entry: T, port: number): T {\n const url = `http://localhost:${port}`;\n return {\n ...entry,\n url,\n entry: `${url}/mf-manifest.json`,\n port,\n };\n}\n\nexport async function prepareDevelopmentRuntimeConfig(\n runtimeConfig: RuntimeConfig,\n options?: { hostPort?: number; ssr?: boolean },\n): Promise<RuntimeConfig> {\n const usedPorts = new Set<number>();\n const hostPort = await pickAvailablePort(options?.hostPort ?? DEFAULT_HOST_PORT, usedPorts);\n\n const next: RuntimeConfig = {\n ...runtimeConfig,\n host: { ...runtimeConfig.host, url: `http://localhost:${hostPort}`, port: hostPort },\n ui: { ...runtimeConfig.ui },\n api: { ...runtimeConfig.api },\n auth: runtimeConfig.auth ? { ...runtimeConfig.auth } : undefined,\n plugins: runtimeConfig.plugins ? { ...runtimeConfig.plugins } : undefined,\n };\n\n if (next.api.source === \"local\" && next.api.localPath) {\n const apiPort = await pickAvailablePort(next.api.port ?? DEFAULT_API_PORT, usedPorts);\n next.api = withLocalRuntimeUrl(next.api, apiPort);\n }\n\n if (next.auth?.source === \"local\" && next.auth.localPath) {\n const authPort = await pickAvailablePort(next.auth.port ?? DEFAULT_AUTH_PORT, usedPorts);\n next.auth = withLocalRuntimeUrl(next.auth, authPort);\n }\n\n if (next.ui.source === \"local\" && next.ui.localPath) {\n const uiPort = await pickAvailablePort(next.ui.port ?? DEFAULT_UI_PORT, usedPorts);\n next.ui = withLocalRuntimeUrl(next.ui, uiPort);\n if (options?.ssr) {\n const ssrPort = await pickAvailablePort(uiPort + 1, usedPorts);\n next.ui.ssrUrl = `http://localhost:${ssrPort}`;\n } else {\n next.ui.ssrUrl = undefined;\n }\n }\n\n if (next.plugins) {\n const entries = Object.entries(next.plugins).sort(([a], [b]) => a.localeCompare(b));\n let pluginBasePort = DEFAULT_PLUGIN_PORT_START;\n\n for (const [pluginId, plugin] of entries) {\n if (plugin.source !== \"local\" || !plugin.localPath) {\n continue;\n }\n\n const pluginPort = await pickAvailablePort(plugin.port ?? pluginBasePort, usedPorts);\n next.plugins[pluginId] = withLocalRuntimeUrl(plugin, pluginPort);\n pluginBasePort = pluginPort + 1;\n }\n }\n\n return next;\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"app.mjs","names":["configBuildRuntimeConfig"],"sources":["../src/app.ts"],"sourcesContent":["import { existsSync } from \"node:fs\";\nimport { createConnection } from \"node:net\";\nimport { join } from \"node:path\";\nimport {\n buildRuntimeConfig as configBuildRuntimeConfig,\n getProjectRoot,\n resolveLocalDevelopmentPath,\n} from \"./config\";\nimport type { AppOrchestrator } from \"./service-descriptor\";\nimport type { BosConfig, RuntimeConfig, RuntimePluginConfig } from \"./types\";\n\nexport type { AppOrchestrator };\n\nconst DEFAULT_HOST_PORT = 3000;\nconst DEFAULT_API_PORT = 3001;\nconst DEFAULT_AUTH_PORT = 3002;\nconst DEFAULT_UI_PORT = 3003;\nconst DEFAULT_PLUGIN_PORT_START = 3010;\n\nexport function detectLocalPackages(\n bosConfig?: BosConfig,\n runtimeConfig?: RuntimeConfig,\n): string[] {\n const packages: string[] = [];\n const configDir = getProjectRoot();\n\n const uiLocalPath =\n runtimeConfig?.ui.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.ui.development, configDir);\n if (uiLocalPath && existsSync(join(uiLocalPath, \"package.json\"))) {\n packages.push(\"ui\");\n }\n\n const apiLocalPath =\n runtimeConfig?.api.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.api.development, configDir);\n if (apiLocalPath && existsSync(join(apiLocalPath, \"package.json\"))) {\n packages.push(\"api\");\n }\n\n const hostLocalPath =\n runtimeConfig?.host?.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.host.development, configDir);\n if (hostLocalPath && existsSync(join(hostLocalPath, \"package.json\"))) {\n packages.push(\"host\");\n } else if (existsSync(join(configDir, \"host\", \"package.json\"))) {\n packages.push(\"host\");\n }\n\n for (const [pluginId, pluginConfig] of Object.entries(runtimeConfig?.plugins ?? {})) {\n if (pluginConfig.localPath && existsSync(join(pluginConfig.localPath, \"package.json\"))) {\n packages.push(`plugin:${pluginId}`);\n }\n }\n\n const authLocalPath =\n runtimeConfig?.auth?.localPath ??\n resolveLocalDevelopmentPath(bosConfig?.app.auth?.development, configDir);\n if (authLocalPath && existsSync(join(authLocalPath, \"package.json\"))) {\n packages.push(\"auth\");\n }\n\n return packages;\n}\n\nexport function buildRuntimeConfig(\n bosConfig: BosConfig,\n options: {\n hostSource?: \"local\" | \"remote\";\n uiSource?: \"local\" | \"remote\";\n apiSource?: \"local\" | \"remote\";\n authSource?: \"local\" | \"remote\";\n proxy?: string;\n env?: \"development\" | \"production\";\n plugins?: Record<string, RuntimePluginConfig>;\n },\n): RuntimeConfig {\n return configBuildRuntimeConfig(bosConfig, getProjectRoot(), options.env ?? \"development\", {\n hostSource: options.hostSource,\n uiSource: options.uiSource,\n apiSource: options.apiSource,\n authSource: options.authSource,\n proxy: options.proxy,\n plugins: options.plugins,\n });\n}\n\nfunction probeTcpOpen(port: number, timeoutMs = 250): Promise<boolean> {\n return new Promise((resolve) => {\n const socket = createConnection({ host: \"127.0.0.1\", port });\n const timer = setTimeout(() => {\n socket.destroy();\n resolve(false);\n }, timeoutMs);\n\n socket.once(\"connect\", () => {\n clearTimeout(timer);\n socket.destroy();\n resolve(true);\n });\n\n socket.once(\"error\", () => {\n clearTimeout(timer);\n resolve(false);\n });\n });\n}\n\nasync function pickAvailablePort(preferred: number, usedPorts: Set<number>): Promise<number> {\n let port = preferred;\n while (usedPorts.has(port) || (await probeTcpOpen(port))) {\n port += 1;\n }\n usedPorts.add(port);\n return port;\n}\n\nfunction withLocalRuntimeUrl<\n T extends { url: string; entry: string; port?: number; localPath?: string },\n>(entry: T, port: number): T {\n const url = `http://localhost:${port}`;\n return {\n ...entry,\n url,\n entry: `${url}/mf-manifest.json`,\n port,\n };\n}\n\nexport async function prepareDevelopmentRuntimeConfig(\n runtimeConfig: RuntimeConfig,\n options?: { hostPort?: number; ssr?: boolean },\n): Promise<RuntimeConfig> {\n const usedPorts = new Set<number>();\n const hostPort = await pickAvailablePort(options?.hostPort ?? DEFAULT_HOST_PORT, usedPorts);\n\n const next: RuntimeConfig = {\n ...runtimeConfig,\n host: { ...runtimeConfig.host, url: `http://localhost:${hostPort}`, port: hostPort },\n ui: { ...runtimeConfig.ui },\n api: { ...runtimeConfig.api },\n auth: runtimeConfig.auth ? { ...runtimeConfig.auth } : undefined,\n plugins: runtimeConfig.plugins ? { ...runtimeConfig.plugins } : undefined,\n };\n\n if (next.api.source === \"local\" && next.api.localPath) {\n const apiPort = await pickAvailablePort(next.api.port ?? DEFAULT_API_PORT, usedPorts);\n next.api = withLocalRuntimeUrl(next.api, apiPort);\n }\n\n if (next.auth?.source === \"local\" && next.auth.localPath) {\n const authPort = await pickAvailablePort(next.auth.port ?? DEFAULT_AUTH_PORT, usedPorts);\n next.auth = withLocalRuntimeUrl(next.auth, authPort);\n }\n\n if (next.ui.source === \"local\" && next.ui.localPath) {\n const uiPort = await pickAvailablePort(next.ui.port ?? DEFAULT_UI_PORT, usedPorts);\n next.ui = withLocalRuntimeUrl(next.ui, uiPort);\n if (options?.ssr) {\n const ssrPort = await pickAvailablePort(uiPort + 1, usedPorts);\n next.ui.ssrUrl = `http://localhost:${ssrPort}`;\n } else {\n next.ui.ssrUrl = undefined;\n }\n }\n\n if (next.plugins) {\n const entries = Object.entries(next.plugins).sort(([a], [b]) => a.localeCompare(b));\n let pluginBasePort = DEFAULT_PLUGIN_PORT_START;\n\n for (const [pluginId, plugin] of entries) {\n if (plugin.source !== \"local\" || !plugin.localPath) {\n continue;\n }\n\n const pluginPort = await pickAvailablePort(plugin.port ?? pluginBasePort, usedPorts);\n next.plugins[pluginId] = withLocalRuntimeUrl(plugin, pluginPort);\n pluginBasePort = pluginPort + 1;\n }\n }\n\n return next;\n}\n"],"mappings":"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"}
@@ -0,0 +1,35 @@
1
+ const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
2
+ let node_fs = require("node:fs");
3
+ let node_path = require("node:path");
4
+
5
+ //#region src/cli/framework-version.ts
6
+ function stripVersionPrefix(version) {
7
+ return version.replace(/^[\^~>=]+/, "");
8
+ }
9
+ function readRootCatalogVersion(projectDir, packageName) {
10
+ const pkgPath = (0, node_path.join)(projectDir, "package.json");
11
+ if (!(0, node_fs.existsSync)(pkgPath)) return void 0;
12
+ const version = JSON.parse((0, node_fs.readFileSync)(pkgPath, "utf-8")).workspaces?.catalog?.[packageName];
13
+ return version ? stripVersionPrefix(version) : void 0;
14
+ }
15
+ function readNodeModulesVersion(projectDir, packageName) {
16
+ const pkgPath = (0, node_path.join)(projectDir, "node_modules", packageName, "package.json");
17
+ if (!(0, node_fs.existsSync)(pkgPath)) return void 0;
18
+ return JSON.parse((0, node_fs.readFileSync)(pkgPath, "utf-8")).version;
19
+ }
20
+ function readInstalledFrameworkVersion(projectDir, packageName) {
21
+ const pkgPath = (0, node_path.join)(projectDir, "package.json");
22
+ if (!(0, node_fs.existsSync)(pkgPath)) return void 0;
23
+ const pkg = JSON.parse((0, node_fs.readFileSync)(pkgPath, "utf-8"));
24
+ const deps = pkg.dependencies ?? {};
25
+ const devDeps = pkg.devDependencies ?? {};
26
+ const version = deps[packageName] || devDeps[packageName];
27
+ if (!version) return readRootCatalogVersion(projectDir, packageName) ?? readNodeModulesVersion(projectDir, packageName);
28
+ if (version.startsWith("catalog:")) return readRootCatalogVersion(projectDir, packageName) ?? readNodeModulesVersion(projectDir, packageName);
29
+ if (version.startsWith("workspace:") || version.startsWith("file:")) return readNodeModulesVersion(projectDir, packageName);
30
+ return stripVersionPrefix(version);
31
+ }
32
+
33
+ //#endregion
34
+ exports.readInstalledFrameworkVersion = readInstalledFrameworkVersion;
35
+ //# sourceMappingURL=framework-version.cjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"framework-version.cjs","names":[],"sources":["../../src/cli/framework-version.ts"],"sourcesContent":["import { existsSync, readFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\n\nfunction stripVersionPrefix(version: string): string {\n return version.replace(/^[\\^~>=]+/, \"\");\n}\n\nexport function readRootCatalogVersion(\n projectDir: string,\n packageName: string,\n): string | undefined {\n const pkgPath = join(projectDir, \"package.json\");\n if (!existsSync(pkgPath)) return undefined;\n const pkg = JSON.parse(readFileSync(pkgPath, \"utf-8\")) as {\n workspaces?: { catalog?: Record<string, string> };\n };\n const version = pkg.workspaces?.catalog?.[packageName];\n return version ? stripVersionPrefix(version) : undefined;\n}\n\nexport function readNodeModulesVersion(\n projectDir: string,\n packageName: string,\n): string | undefined {\n const pkgPath = join(projectDir, \"node_modules\", packageName, \"package.json\");\n if (!existsSync(pkgPath)) return undefined;\n const pkg = JSON.parse(readFileSync(pkgPath, \"utf-8\")) as { version?: string };\n return pkg.version;\n}\n\nexport function readInstalledFrameworkVersion(\n projectDir: string,\n packageName: string,\n): string | undefined {\n const pkgPath = join(projectDir, \"package.json\");\n if (!existsSync(pkgPath)) return undefined;\n const pkg = JSON.parse(readFileSync(pkgPath, \"utf-8\")) as Record<string, unknown>;\n const deps = (pkg.dependencies ?? {}) as Record<string, string>;\n const devDeps = (pkg.devDependencies ?? {}) as Record<string, string>;\n const version = deps[packageName] || devDeps[packageName];\n\n if (!version) {\n return (\n readRootCatalogVersion(projectDir, packageName) ??\n readNodeModulesVersion(projectDir, packageName)\n );\n }\n\n if (version.startsWith(\"catalog:\")) {\n return (\n readRootCatalogVersion(projectDir, packageName) ??\n readNodeModulesVersion(projectDir, packageName)\n );\n }\n\n if (version.startsWith(\"workspace:\") || version.startsWith(\"file:\")) {\n return readNodeModulesVersion(projectDir, packageName);\n }\n\n return stripVersionPrefix(version);\n}\n"],"mappings":";;;;;AAGA,SAAS,mBAAmB,SAAyB;AACnD,QAAO,QAAQ,QAAQ,aAAa,GAAG;;AAGzC,SAAgB,uBACd,YACA,aACoB;CACpB,MAAM,8BAAe,YAAY,eAAe;AAChD,KAAI,yBAAY,QAAQ,CAAE,QAAO;CAIjC,MAAM,UAHM,KAAK,gCAAmB,SAAS,QAAQ,CAAC,CAGlC,YAAY,UAAU;AAC1C,QAAO,UAAU,mBAAmB,QAAQ,GAAG;;AAGjD,SAAgB,uBACd,YACA,aACoB;CACpB,MAAM,8BAAe,YAAY,gBAAgB,aAAa,eAAe;AAC7E,KAAI,yBAAY,QAAQ,CAAE,QAAO;AAEjC,QADY,KAAK,gCAAmB,SAAS,QAAQ,CAAC,CAC3C;;AAGb,SAAgB,8BACd,YACA,aACoB;CACpB,MAAM,8BAAe,YAAY,eAAe;AAChD,KAAI,yBAAY,QAAQ,CAAE,QAAO;CACjC,MAAM,MAAM,KAAK,gCAAmB,SAAS,QAAQ,CAAC;CACtD,MAAM,OAAQ,IAAI,gBAAgB,EAAE;CACpC,MAAM,UAAW,IAAI,mBAAmB,EAAE;CAC1C,MAAM,UAAU,KAAK,gBAAgB,QAAQ;AAE7C,KAAI,CAAC,QACH,QACE,uBAAuB,YAAY,YAAY,IAC/C,uBAAuB,YAAY,YAAY;AAInD,KAAI,QAAQ,WAAW,WAAW,CAChC,QACE,uBAAuB,YAAY,YAAY,IAC/C,uBAAuB,YAAY,YAAY;AAInD,KAAI,QAAQ,WAAW,aAAa,IAAI,QAAQ,WAAW,QAAQ,CACjE,QAAO,uBAAuB,YAAY,YAAY;AAGxD,QAAO,mBAAmB,QAAQ"}
@@ -0,0 +1,34 @@
1
+ import { existsSync, readFileSync } from "node:fs";
2
+ import { join } from "node:path";
3
+
4
+ //#region src/cli/framework-version.ts
5
+ function stripVersionPrefix(version) {
6
+ return version.replace(/^[\^~>=]+/, "");
7
+ }
8
+ function readRootCatalogVersion(projectDir, packageName) {
9
+ const pkgPath = join(projectDir, "package.json");
10
+ if (!existsSync(pkgPath)) return void 0;
11
+ const version = JSON.parse(readFileSync(pkgPath, "utf-8")).workspaces?.catalog?.[packageName];
12
+ return version ? stripVersionPrefix(version) : void 0;
13
+ }
14
+ function readNodeModulesVersion(projectDir, packageName) {
15
+ const pkgPath = join(projectDir, "node_modules", packageName, "package.json");
16
+ if (!existsSync(pkgPath)) return void 0;
17
+ return JSON.parse(readFileSync(pkgPath, "utf-8")).version;
18
+ }
19
+ function readInstalledFrameworkVersion(projectDir, packageName) {
20
+ const pkgPath = join(projectDir, "package.json");
21
+ if (!existsSync(pkgPath)) return void 0;
22
+ const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
23
+ const deps = pkg.dependencies ?? {};
24
+ const devDeps = pkg.devDependencies ?? {};
25
+ const version = deps[packageName] || devDeps[packageName];
26
+ if (!version) return readRootCatalogVersion(projectDir, packageName) ?? readNodeModulesVersion(projectDir, packageName);
27
+ if (version.startsWith("catalog:")) return readRootCatalogVersion(projectDir, packageName) ?? readNodeModulesVersion(projectDir, packageName);
28
+ if (version.startsWith("workspace:") || version.startsWith("file:")) return readNodeModulesVersion(projectDir, packageName);
29
+ return stripVersionPrefix(version);
30
+ }
31
+
32
+ //#endregion
33
+ export { readInstalledFrameworkVersion };
34
+ //# sourceMappingURL=framework-version.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"framework-version.mjs","names":[],"sources":["../../src/cli/framework-version.ts"],"sourcesContent":["import { existsSync, readFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\n\nfunction stripVersionPrefix(version: string): string {\n return version.replace(/^[\\^~>=]+/, \"\");\n}\n\nexport function readRootCatalogVersion(\n projectDir: string,\n packageName: string,\n): string | undefined {\n const pkgPath = join(projectDir, \"package.json\");\n if (!existsSync(pkgPath)) return undefined;\n const pkg = JSON.parse(readFileSync(pkgPath, \"utf-8\")) as {\n workspaces?: { catalog?: Record<string, string> };\n };\n const version = pkg.workspaces?.catalog?.[packageName];\n return version ? stripVersionPrefix(version) : undefined;\n}\n\nexport function readNodeModulesVersion(\n projectDir: string,\n packageName: string,\n): string | undefined {\n const pkgPath = join(projectDir, \"node_modules\", packageName, \"package.json\");\n if (!existsSync(pkgPath)) return undefined;\n const pkg = JSON.parse(readFileSync(pkgPath, \"utf-8\")) as { version?: string };\n return pkg.version;\n}\n\nexport function readInstalledFrameworkVersion(\n projectDir: string,\n packageName: string,\n): string | undefined {\n const pkgPath = join(projectDir, \"package.json\");\n if (!existsSync(pkgPath)) return undefined;\n const pkg = JSON.parse(readFileSync(pkgPath, \"utf-8\")) as Record<string, unknown>;\n const deps = (pkg.dependencies ?? {}) as Record<string, string>;\n const devDeps = (pkg.devDependencies ?? {}) as Record<string, string>;\n const version = deps[packageName] || devDeps[packageName];\n\n if (!version) {\n return (\n readRootCatalogVersion(projectDir, packageName) ??\n readNodeModulesVersion(projectDir, packageName)\n );\n }\n\n if (version.startsWith(\"catalog:\")) {\n return (\n readRootCatalogVersion(projectDir, packageName) ??\n readNodeModulesVersion(projectDir, packageName)\n );\n }\n\n if (version.startsWith(\"workspace:\") || version.startsWith(\"file:\")) {\n return readNodeModulesVersion(projectDir, packageName);\n }\n\n return stripVersionPrefix(version);\n}\n"],"mappings":";;;;AAGA,SAAS,mBAAmB,SAAyB;AACnD,QAAO,QAAQ,QAAQ,aAAa,GAAG;;AAGzC,SAAgB,uBACd,YACA,aACoB;CACpB,MAAM,UAAU,KAAK,YAAY,eAAe;AAChD,KAAI,CAAC,WAAW,QAAQ,CAAE,QAAO;CAIjC,MAAM,UAHM,KAAK,MAAM,aAAa,SAAS,QAAQ,CAAC,CAGlC,YAAY,UAAU;AAC1C,QAAO,UAAU,mBAAmB,QAAQ,GAAG;;AAGjD,SAAgB,uBACd,YACA,aACoB;CACpB,MAAM,UAAU,KAAK,YAAY,gBAAgB,aAAa,eAAe;AAC7E,KAAI,CAAC,WAAW,QAAQ,CAAE,QAAO;AAEjC,QADY,KAAK,MAAM,aAAa,SAAS,QAAQ,CAAC,CAC3C;;AAGb,SAAgB,8BACd,YACA,aACoB;CACpB,MAAM,UAAU,KAAK,YAAY,eAAe;AAChD,KAAI,CAAC,WAAW,QAAQ,CAAE,QAAO;CACjC,MAAM,MAAM,KAAK,MAAM,aAAa,SAAS,QAAQ,CAAC;CACtD,MAAM,OAAQ,IAAI,gBAAgB,EAAE;CACpC,MAAM,UAAW,IAAI,mBAAmB,EAAE;CAC1C,MAAM,UAAU,KAAK,gBAAgB,QAAQ;AAE7C,KAAI,CAAC,QACH,QACE,uBAAuB,YAAY,YAAY,IAC/C,uBAAuB,YAAY,YAAY;AAInD,KAAI,QAAQ,WAAW,WAAW,CAChC,QACE,uBAAuB,YAAY,YAAY,IAC/C,uBAAuB,YAAY,YAAY;AAInD,KAAI,QAAQ,WAAW,aAAa,IAAI,QAAQ,WAAW,QAAQ,CACjE,QAAO,uBAAuB,YAAY,YAAY;AAGxD,QAAO,mBAAmB,QAAQ"}
package/dist/cli/init.cjs CHANGED
@@ -272,11 +272,21 @@ async function personalizeConfig(destination, opts) {
272
272
  delete deps["every-plugin"];
273
273
  delete deps["everything-dev"];
274
274
  }
275
+ if (!pkg.workspaces || typeof pkg.workspaces !== "object") pkg.workspaces = {
276
+ packages: [],
277
+ catalog: {}
278
+ };
279
+ const workspaces = pkg.workspaces;
280
+ if (!workspaces.catalog || typeof workspaces.catalog !== "object") workspaces.catalog = {};
275
281
  if (!pkg.dependencies) pkg.dependencies = {};
276
282
  const deps = pkg.dependencies;
277
283
  const spec = opts.workspaceOpts?.sourceDir ? require_manifest_normalizer.loadManifestNormalizationSpec(opts.workspaceOpts.sourceDir) : null;
278
- if (!deps["everything-dev"] && spec) deps["everything-dev"] = spec.rootCatalog["everything-dev"];
279
- if (!deps["every-plugin"] && spec) deps["every-plugin"] = spec.rootCatalog["every-plugin"];
284
+ if (spec) {
285
+ workspaces.catalog["everything-dev"] = spec.rootCatalog["everything-dev"];
286
+ workspaces.catalog["every-plugin"] = spec.rootCatalog["every-plugin"];
287
+ }
288
+ if (!deps["everything-dev"] && spec) deps["everything-dev"] = "catalog:";
289
+ if (!deps["every-plugin"] && spec) deps["every-plugin"] = "catalog:";
280
290
  (0, node_fs.writeFileSync)(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
281
291
  }
282
292
  const apiTsConfigPath = (0, node_path.join)(destination, "api", "tsconfig.json");
@@ -332,7 +342,8 @@ async function resolveWorkspaceRefs(destination, options) {
332
342
  await require_manifest_normalizer.normalizePackageManifestsInTree({
333
343
  sourceRootDir: options?.sourceDir ?? destination,
334
344
  targetDir: destination,
335
- resolveCatalogRefs: true,
345
+ resolveCatalogRefs: false,
346
+ preserveCatalogRefs: true,
336
347
  removeWorkspaceDeps: ["host"]
337
348
  });
338
349
  if (options?.localOverrides && options.sourceDir) {