@bleedingdev/modern-js-create 3.5.0-ultramodern.86 → 3.5.0-ultramodern.89

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 (8) hide show
  1. package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-build-identity.cjs +27 -1
  2. package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-build-identity.js +25 -2
  3. package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-build-identity.js +25 -2
  4. package/dist/types/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-build-identity.d.ts +1 -0
  5. package/package.json +4 -4
  6. package/template-workspace/.modernjs/release-cohort.json +34 -34
  7. package/template-workspace/patches/@module-federation__bridge-react@2.8.0.patch +47 -0
  8. package/templates/workspace-scripts/proof-node-backend-federation.mjs +252 -13
package/dist/cjs/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-build-identity.cjs CHANGED
@@ -37,6 +37,7 @@ var __webpack_require__ = {};
37
37
  var __webpack_exports__ = {};
38
38
  __webpack_require__.r(__webpack_exports__);
39
39
  __webpack_require__.d(__webpack_exports__, {
40
+ rewriteApiMarkerIdentitySchema: ()=>rewriteApiMarkerIdentitySchema,
40
41
  rewriteLegacyApiMarkerBinding: ()=>rewriteLegacyApiMarkerBinding,
41
42
  updateGeneratedBuildIdentityModules: ()=>updateGeneratedBuildIdentityModules
42
43
  });
@@ -48,24 +49,49 @@ const module_federation_cjs_namespaceObject = require("../../../ultramodern-work
48
49
  const external_config_cjs_namespaceObject = require("../../config.cjs");
49
50
  const external_io_cjs_namespaceObject = require("./io.cjs");
50
51
  const legacyApiMarkerPattern = /export const ultramodernApiMarker\s*=\s*\{[\s\S]*?\}\s+as const;\n?/u;
52
+ const markerSchemaPattern = /(export const [A-Za-z_$][\w$]*MarkerSchema(?:\s*:[^=]+)?\s*=\s*Schema\.Struct\(\{\n)([\s\S]*?)(\n\}\);)/u;
51
53
  function rewriteLegacyApiMarkerBinding(source) {
52
54
  if (!legacyApiMarkerPattern.test(source)) return source;
53
55
  return source.replace(legacyApiMarkerPattern, "export { ultramodernApiMarker } from './ultramodern-build.ts';\n");
54
56
  }
57
+ function rewriteApiMarkerIdentitySchema(source) {
58
+ const match = source.match(markerSchemaPattern);
59
+ if (!match) return source;
60
+ let body = match[2];
61
+ const requiredLegacyFields = [
62
+ 'appId',
63
+ 'build',
64
+ 'deployProfile',
65
+ 'packageName',
66
+ 'surface',
67
+ 'version'
68
+ ];
69
+ if (!requiredLegacyFields.every((field)=>new RegExp(`^\\s+${field}: Schema\\.String,\\s*$`, 'mu').test(body))) return source;
70
+ const insertAfter = (anchor, field)=>{
71
+ if (new RegExp(`^\\s+${field}: Schema\\.String,\\s*$`, 'mu').test(body)) return;
72
+ body = body.replace(new RegExp(`^(\\s+)${anchor}: Schema\\.String,\\s*$`, 'mu'), `$&\n$1${field}: Schema.String,`);
73
+ };
74
+ insertAfter('build', 'buildMarker');
75
+ insertAfter('packageName', 'sourceRevision');
76
+ insertAfter('surface', 'unitId');
77
+ return source.replace(markerSchemaPattern, (_full, prefix, _body, suffix)=>`${prefix}${body}${suffix}`);
78
+ }
55
79
  function updateGeneratedBuildIdentityModules(io, config) {
56
80
  let changed = false;
57
81
  for (const app of (0, external_config_cjs_namespaceObject.allWorkspaceAppsFromToolingConfig)(config)){
58
82
  const sharedApiPath = external_node_path_default().join(io.workspaceRoot, app.directory, 'shared/api.ts');
59
- if (app.api && external_node_fs_default().existsSync(sharedApiPath)) changed = (0, external_io_cjs_namespaceObject.writeTextIfChanged)(io, sharedApiPath, rewriteLegacyApiMarkerBinding(external_node_fs_default().readFileSync(sharedApiPath, 'utf-8'))) || changed;
83
+ if (app.api && external_node_fs_default().existsSync(sharedApiPath)) changed = (0, external_io_cjs_namespaceObject.writeTextIfChanged)(io, sharedApiPath, rewriteApiMarkerIdentitySchema(rewriteLegacyApiMarkerBinding(external_node_fs_default().readFileSync(sharedApiPath, 'utf-8')))) || changed;
60
84
  changed = (0, external_io_cjs_namespaceObject.writeTextIfChanged)(io, external_node_path_default().join(io.workspaceRoot, app.directory, 'src/ultramodern-build.ts'), (0, module_federation_cjs_namespaceObject.createUltramodernBuildReexportModule)()) || changed;
61
85
  changed = (0, external_io_cjs_namespaceObject.writeTextIfChanged)(io, external_node_path_default().join(io.workspaceRoot, app.directory, 'shared/ultramodern-build.ts'), (0, module_federation_cjs_namespaceObject.createUltramodernBuildModule)(config.workspace.packageScope, app)) || changed;
62
86
  changed = (0, external_io_cjs_namespaceObject.writeTextIfChanged)(io, external_node_path_default().join(io.workspaceRoot, app.directory, 'shared/ultramodern-build.json'), (0, module_federation_cjs_namespaceObject.createUltramodernBuildArtifactJson)(config.workspace.packageScope, app)) || changed;
63
87
  }
64
88
  return changed;
65
89
  }
90
+ exports.rewriteApiMarkerIdentitySchema = __webpack_exports__.rewriteApiMarkerIdentitySchema;
66
91
  exports.rewriteLegacyApiMarkerBinding = __webpack_exports__.rewriteLegacyApiMarkerBinding;
67
92
  exports.updateGeneratedBuildIdentityModules = __webpack_exports__.updateGeneratedBuildIdentityModules;
68
93
  for(var __rspack_i in __webpack_exports__)if (-1 === [
94
+ "rewriteApiMarkerIdentitySchema",
69
95
  "rewriteLegacyApiMarkerBinding",
70
96
  "updateGeneratedBuildIdentityModules"
71
97
  ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
package/dist/esm/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-build-identity.js CHANGED
@@ -4,19 +4,42 @@ import { createUltramodernBuildArtifactJson, createUltramodernBuildModule, creat
4
4
  import { allWorkspaceAppsFromToolingConfig } from "../../config.js";
5
5
  import { writeTextIfChanged } from "./io.js";
6
6
  const legacyApiMarkerPattern = /export const ultramodernApiMarker\s*=\s*\{[\s\S]*?\}\s+as const;\n?/u;
7
+ const markerSchemaPattern = /(export const [A-Za-z_$][\w$]*MarkerSchema(?:\s*:[^=]+)?\s*=\s*Schema\.Struct\(\{\n)([\s\S]*?)(\n\}\);)/u;
7
8
  function rewriteLegacyApiMarkerBinding(source) {
8
9
  if (!legacyApiMarkerPattern.test(source)) return source;
9
10
  return source.replace(legacyApiMarkerPattern, "export { ultramodernApiMarker } from './ultramodern-build.ts';\n");
10
11
  }
12
+ function rewriteApiMarkerIdentitySchema(source) {
13
+ const match = source.match(markerSchemaPattern);
14
+ if (!match) return source;
15
+ let body = match[2];
16
+ const requiredLegacyFields = [
17
+ 'appId',
18
+ 'build',
19
+ 'deployProfile',
20
+ 'packageName',
21
+ 'surface',
22
+ 'version'
23
+ ];
24
+ if (!requiredLegacyFields.every((field)=>new RegExp(`^\\s+${field}: Schema\\.String,\\s*$`, 'mu').test(body))) return source;
25
+ const insertAfter = (anchor, field)=>{
26
+ if (new RegExp(`^\\s+${field}: Schema\\.String,\\s*$`, 'mu').test(body)) return;
27
+ body = body.replace(new RegExp(`^(\\s+)${anchor}: Schema\\.String,\\s*$`, 'mu'), `$&\n$1${field}: Schema.String,`);
28
+ };
29
+ insertAfter('build', 'buildMarker');
30
+ insertAfter('packageName', 'sourceRevision');
31
+ insertAfter('surface', 'unitId');
32
+ return source.replace(markerSchemaPattern, (_full, prefix, _body, suffix)=>`${prefix}${body}${suffix}`);
33
+ }
11
34
  function updateGeneratedBuildIdentityModules(io, config) {
12
35
  let changed = false;
13
36
  for (const app of allWorkspaceAppsFromToolingConfig(config)){
14
37
  const sharedApiPath = node_path.join(io.workspaceRoot, app.directory, 'shared/api.ts');
15
- if (app.api && node_fs.existsSync(sharedApiPath)) changed = writeTextIfChanged(io, sharedApiPath, rewriteLegacyApiMarkerBinding(node_fs.readFileSync(sharedApiPath, 'utf-8'))) || changed;
38
+ if (app.api && node_fs.existsSync(sharedApiPath)) changed = writeTextIfChanged(io, sharedApiPath, rewriteApiMarkerIdentitySchema(rewriteLegacyApiMarkerBinding(node_fs.readFileSync(sharedApiPath, 'utf-8')))) || changed;
16
39
  changed = writeTextIfChanged(io, node_path.join(io.workspaceRoot, app.directory, 'src/ultramodern-build.ts'), createUltramodernBuildReexportModule()) || changed;
17
40
  changed = writeTextIfChanged(io, node_path.join(io.workspaceRoot, app.directory, 'shared/ultramodern-build.ts'), createUltramodernBuildModule(config.workspace.packageScope, app)) || changed;
18
41
  changed = writeTextIfChanged(io, node_path.join(io.workspaceRoot, app.directory, 'shared/ultramodern-build.json'), createUltramodernBuildArtifactJson(config.workspace.packageScope, app)) || changed;
19
42
  }
20
43
  return changed;
21
44
  }
22
- export { rewriteLegacyApiMarkerBinding, updateGeneratedBuildIdentityModules };
45
+ export { rewriteApiMarkerIdentitySchema, rewriteLegacyApiMarkerBinding, updateGeneratedBuildIdentityModules };
package/dist/esm-node/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-build-identity.js CHANGED
@@ -5,19 +5,42 @@ import { createUltramodernBuildArtifactJson, createUltramodernBuildModule, creat
5
5
  import { allWorkspaceAppsFromToolingConfig } from "../../config.js";
6
6
  import { writeTextIfChanged } from "./io.js";
7
7
  const legacyApiMarkerPattern = /export const ultramodernApiMarker\s*=\s*\{[\s\S]*?\}\s+as const;\n?/u;
8
+ const markerSchemaPattern = /(export const [A-Za-z_$][\w$]*MarkerSchema(?:\s*:[^=]+)?\s*=\s*Schema\.Struct\(\{\n)([\s\S]*?)(\n\}\);)/u;
8
9
  function rewriteLegacyApiMarkerBinding(source) {
9
10
  if (!legacyApiMarkerPattern.test(source)) return source;
10
11
  return source.replace(legacyApiMarkerPattern, "export { ultramodernApiMarker } from './ultramodern-build.ts';\n");
11
12
  }
13
+ function rewriteApiMarkerIdentitySchema(source) {
14
+ const match = source.match(markerSchemaPattern);
15
+ if (!match) return source;
16
+ let body = match[2];
17
+ const requiredLegacyFields = [
18
+ 'appId',
19
+ 'build',
20
+ 'deployProfile',
21
+ 'packageName',
22
+ 'surface',
23
+ 'version'
24
+ ];
25
+ if (!requiredLegacyFields.every((field)=>new RegExp(`^\\s+${field}: Schema\\.String,\\s*$`, 'mu').test(body))) return source;
26
+ const insertAfter = (anchor, field)=>{
27
+ if (new RegExp(`^\\s+${field}: Schema\\.String,\\s*$`, 'mu').test(body)) return;
28
+ body = body.replace(new RegExp(`^(\\s+)${anchor}: Schema\\.String,\\s*$`, 'mu'), `$&\n$1${field}: Schema.String,`);
29
+ };
30
+ insertAfter('build', 'buildMarker');
31
+ insertAfter('packageName', 'sourceRevision');
32
+ insertAfter('surface', 'unitId');
33
+ return source.replace(markerSchemaPattern, (_full, prefix, _body, suffix)=>`${prefix}${body}${suffix}`);
34
+ }
12
35
  function updateGeneratedBuildIdentityModules(io, config) {
13
36
  let changed = false;
14
37
  for (const app of allWorkspaceAppsFromToolingConfig(config)){
15
38
  const sharedApiPath = node_path.join(io.workspaceRoot, app.directory, 'shared/api.ts');
16
- if (app.api && node_fs.existsSync(sharedApiPath)) changed = writeTextIfChanged(io, sharedApiPath, rewriteLegacyApiMarkerBinding(node_fs.readFileSync(sharedApiPath, 'utf-8'))) || changed;
39
+ if (app.api && node_fs.existsSync(sharedApiPath)) changed = writeTextIfChanged(io, sharedApiPath, rewriteApiMarkerIdentitySchema(rewriteLegacyApiMarkerBinding(node_fs.readFileSync(sharedApiPath, 'utf-8')))) || changed;
17
40
  changed = writeTextIfChanged(io, node_path.join(io.workspaceRoot, app.directory, 'src/ultramodern-build.ts'), createUltramodernBuildReexportModule()) || changed;
18
41
  changed = writeTextIfChanged(io, node_path.join(io.workspaceRoot, app.directory, 'shared/ultramodern-build.ts'), createUltramodernBuildModule(config.workspace.packageScope, app)) || changed;
19
42
  changed = writeTextIfChanged(io, node_path.join(io.workspaceRoot, app.directory, 'shared/ultramodern-build.json'), createUltramodernBuildArtifactJson(config.workspace.packageScope, app)) || changed;
20
43
  }
21
44
  return changed;
22
45
  }
23
- export { rewriteLegacyApiMarkerBinding, updateGeneratedBuildIdentityModules };
46
+ export { rewriteApiMarkerIdentitySchema, rewriteLegacyApiMarkerBinding, updateGeneratedBuildIdentityModules };
package/dist/types/ultramodern-tooling/commands/migrate-strict-effect/generated-artifacts-build-identity.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import { type UltramodernToolingConfig } from '../../config';
2
2
  import { type MigrationIo } from './io';
3
3
  export declare function rewriteLegacyApiMarkerBinding(source: string): string;
4
+ export declare function rewriteApiMarkerIdentitySchema(source: string): string;
4
5
  export declare function updateGeneratedBuildIdentityModules(io: MigrationIo, config: UltramodernToolingConfig): boolean;
package/package.json CHANGED
@@ -21,7 +21,7 @@
21
21
  "engines": {
22
22
  "node": ">=20"
23
23
  },
24
- "version": "3.5.0-ultramodern.86",
24
+ "version": "3.5.0-ultramodern.89",
25
25
  "types": "./dist/types/index.d.ts",
26
26
  "main": "./dist/esm-node/index.js",
27
27
  "bin": {
@@ -75,8 +75,8 @@
75
75
  ],
76
76
  "dependencies": {
77
77
  "@modern-js/codesmith": "2.6.9",
78
- "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.86",
79
- "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.86",
78
+ "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.89",
79
+ "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.89",
80
80
  "esbuild": "^0.28.1",
81
81
  "oxfmt": "0.58.0",
82
82
  "ultracite": "7.9.3"
@@ -101,6 +101,6 @@
101
101
  "type-check": "tsgo --noEmit -p tsconfig.json"
102
102
  },
103
103
  "ultramodern": {
104
- "frameworkVersion": "3.5.0-ultramodern.86"
104
+ "frameworkVersion": "3.5.0-ultramodern.89"
105
105
  }
106
106
  }
package/template-workspace/.modernjs/release-cohort.json CHANGED
@@ -37,172 +37,172 @@
37
37
  {
38
38
  "sourceName": "@modern-js/adapter-rstest",
39
39
  "targetName": "@bleedingdev/modern-js-adapter-rstest",
40
- "version": "3.5.0-ultramodern.86"
40
+ "version": "3.5.0-ultramodern.89"
41
41
  },
42
42
  {
43
43
  "sourceName": "@modern-js/app-tools",
44
44
  "targetName": "@bleedingdev/modern-js-app-tools",
45
- "version": "3.5.0-ultramodern.86"
45
+ "version": "3.5.0-ultramodern.89"
46
46
  },
47
47
  {
48
48
  "sourceName": "@modern-js/bff-core",
49
49
  "targetName": "@bleedingdev/modern-js-bff-core",
50
- "version": "3.5.0-ultramodern.86"
50
+ "version": "3.5.0-ultramodern.89"
51
51
  },
52
52
  {
53
53
  "sourceName": "@modern-js/bff-runtime",
54
54
  "targetName": "@bleedingdev/modern-js-bff-runtime",
55
- "version": "3.5.0-ultramodern.86"
55
+ "version": "3.5.0-ultramodern.89"
56
56
  },
57
57
  {
58
58
  "sourceName": "@modern-js/builder",
59
59
  "targetName": "@bleedingdev/modern-js-builder",
60
- "version": "3.5.0-ultramodern.86"
60
+ "version": "3.5.0-ultramodern.89"
61
61
  },
62
62
  {
63
63
  "sourceName": "@modern-js/code-tools",
64
64
  "targetName": "@bleedingdev/modern-js-code-tools",
65
- "version": "3.5.0-ultramodern.86"
65
+ "version": "3.5.0-ultramodern.89"
66
66
  },
67
67
  {
68
68
  "sourceName": "@modern-js/create",
69
69
  "targetName": "@bleedingdev/modern-js-create",
70
- "version": "3.5.0-ultramodern.86"
70
+ "version": "3.5.0-ultramodern.89"
71
71
  },
72
72
  {
73
73
  "sourceName": "@modern-js/create-request",
74
74
  "targetName": "@bleedingdev/modern-js-create-request",
75
- "version": "3.5.0-ultramodern.86"
75
+ "version": "3.5.0-ultramodern.89"
76
76
  },
77
77
  {
78
78
  "sourceName": "@modern-js/i18n-utils",
79
79
  "targetName": "@bleedingdev/modern-js-i18n-utils",
80
- "version": "3.5.0-ultramodern.86"
80
+ "version": "3.5.0-ultramodern.89"
81
81
  },
82
82
  {
83
83
  "sourceName": "@modern-js/image",
84
84
  "targetName": "@bleedingdev/modern-js-image",
85
- "version": "3.5.0-ultramodern.86"
85
+ "version": "3.5.0-ultramodern.89"
86
86
  },
87
87
  {
88
88
  "sourceName": "@modern-js/main-doc",
89
89
  "targetName": "@bleedingdev/modern-js-main-doc",
90
- "version": "3.5.0-ultramodern.86"
90
+ "version": "3.5.0-ultramodern.89"
91
91
  },
92
92
  {
93
93
  "sourceName": "@modern-js/plugin",
94
94
  "targetName": "@bleedingdev/modern-js-plugin",
95
- "version": "3.5.0-ultramodern.86"
95
+ "version": "3.5.0-ultramodern.89"
96
96
  },
97
97
  {
98
98
  "sourceName": "@modern-js/plugin-bff",
99
99
  "targetName": "@bleedingdev/modern-js-plugin-bff",
100
- "version": "3.5.0-ultramodern.86"
100
+ "version": "3.5.0-ultramodern.89"
101
101
  },
102
102
  {
103
103
  "sourceName": "@modern-js/plugin-data-loader",
104
104
  "targetName": "@bleedingdev/modern-js-plugin-data-loader",
105
- "version": "3.5.0-ultramodern.86"
105
+ "version": "3.5.0-ultramodern.89"
106
106
  },
107
107
  {
108
108
  "sourceName": "@modern-js/plugin-i18n",
109
109
  "targetName": "@bleedingdev/modern-js-plugin-i18n",
110
- "version": "3.5.0-ultramodern.86"
110
+ "version": "3.5.0-ultramodern.89"
111
111
  },
112
112
  {
113
113
  "sourceName": "@modern-js/plugin-polyfill",
114
114
  "targetName": "@bleedingdev/modern-js-plugin-polyfill",
115
- "version": "3.5.0-ultramodern.86"
115
+ "version": "3.5.0-ultramodern.89"
116
116
  },
117
117
  {
118
118
  "sourceName": "@modern-js/plugin-ssg",
119
119
  "targetName": "@bleedingdev/modern-js-plugin-ssg",
120
- "version": "3.5.0-ultramodern.86"
120
+ "version": "3.5.0-ultramodern.89"
121
121
  },
122
122
  {
123
123
  "sourceName": "@modern-js/plugin-styled-components",
124
124
  "targetName": "@bleedingdev/modern-js-plugin-styled-components",
125
- "version": "3.5.0-ultramodern.86"
125
+ "version": "3.5.0-ultramodern.89"
126
126
  },
127
127
  {
128
128
  "sourceName": "@modern-js/plugin-tanstack",
129
129
  "targetName": "@bleedingdev/modern-js-plugin-tanstack",
130
- "version": "3.5.0-ultramodern.86"
130
+ "version": "3.5.0-ultramodern.89"
131
131
  },
132
132
  {
133
133
  "sourceName": "@modern-js/prod-server",
134
134
  "targetName": "@bleedingdev/modern-js-prod-server",
135
- "version": "3.5.0-ultramodern.86"
135
+ "version": "3.5.0-ultramodern.89"
136
136
  },
137
137
  {
138
138
  "sourceName": "@modern-js/render",
139
139
  "targetName": "@bleedingdev/modern-js-render",
140
- "version": "3.5.0-ultramodern.86"
140
+ "version": "3.5.0-ultramodern.89"
141
141
  },
142
142
  {
143
143
  "sourceName": "@modern-js/runtime",
144
144
  "targetName": "@bleedingdev/modern-js-runtime",
145
- "version": "3.5.0-ultramodern.86"
145
+ "version": "3.5.0-ultramodern.89"
146
146
  },
147
147
  {
148
148
  "sourceName": "@modern-js/runtime-utils",
149
149
  "targetName": "@bleedingdev/modern-js-runtime-utils",
150
- "version": "3.5.0-ultramodern.86"
150
+ "version": "3.5.0-ultramodern.89"
151
151
  },
152
152
  {
153
153
  "sourceName": "@modern-js/sandpack-react",
154
154
  "targetName": "@bleedingdev/modern-js-sandpack-react",
155
- "version": "3.5.0-ultramodern.86"
155
+ "version": "3.5.0-ultramodern.89"
156
156
  },
157
157
  {
158
158
  "sourceName": "@modern-js/server",
159
159
  "targetName": "@bleedingdev/modern-js-server",
160
- "version": "3.5.0-ultramodern.86"
160
+ "version": "3.5.0-ultramodern.89"
161
161
  },
162
162
  {
163
163
  "sourceName": "@modern-js/server-core",
164
164
  "targetName": "@bleedingdev/modern-js-server-core",
165
- "version": "3.5.0-ultramodern.86"
165
+ "version": "3.5.0-ultramodern.89"
166
166
  },
167
167
  {
168
168
  "sourceName": "@modern-js/server-runtime",
169
169
  "targetName": "@bleedingdev/modern-js-server-runtime",
170
- "version": "3.5.0-ultramodern.86"
170
+ "version": "3.5.0-ultramodern.89"
171
171
  },
172
172
  {
173
173
  "sourceName": "@modern-js/server-runtime-extensions",
174
174
  "targetName": "@bleedingdev/modern-js-server-runtime-extensions",
175
- "version": "3.5.0-ultramodern.86"
175
+ "version": "3.5.0-ultramodern.89"
176
176
  },
177
177
  {
178
178
  "sourceName": "@modern-js/server-utils",
179
179
  "targetName": "@bleedingdev/modern-js-server-utils",
180
- "version": "3.5.0-ultramodern.86"
180
+ "version": "3.5.0-ultramodern.89"
181
181
  },
182
182
  {
183
183
  "sourceName": "@modern-js/tsconfig",
184
184
  "targetName": "@bleedingdev/modern-js-tsconfig",
185
- "version": "3.5.0-ultramodern.86"
185
+ "version": "3.5.0-ultramodern.89"
186
186
  },
187
187
  {
188
188
  "sourceName": "@modern-js/types",
189
189
  "targetName": "@bleedingdev/modern-js-types",
190
- "version": "3.5.0-ultramodern.86"
190
+ "version": "3.5.0-ultramodern.89"
191
191
  },
192
192
  {
193
193
  "sourceName": "@modern-js/utils",
194
194
  "targetName": "@bleedingdev/modern-js-utils",
195
- "version": "3.5.0-ultramodern.86"
195
+ "version": "3.5.0-ultramodern.89"
196
196
  }
197
197
  ],
198
198
  "release": {
199
199
  "tag": "latest",
200
- "version": "3.5.0-ultramodern.86"
200
+ "version": "3.5.0-ultramodern.89"
201
201
  },
202
202
  "schema": "bleedingdev.ultramodern.release-cohort",
203
203
  "schemaVersion": 1,
204
204
  "source": {
205
- "commit": "f04719f16126882a8d3b06d75fc2d420c2cd0f0f",
205
+ "commit": "db4fc17d40ee7d448da81a55fb4d804ef2062f53",
206
206
  "repository": "BleedingDev/ultramodern.js"
207
207
  }
208
208
  }
package/template-workspace/patches/@module-federation__bridge-react@2.8.0.patch CHANGED
@@ -136,3 +136,50 @@ diff --git a/dist/lazy-load-component-plugin-DEu-DfZt.mjs b/dist/lazy-load-compo
136
136
  }
137
137
  )
138
138
  );
139
+ diff --git a/dist/lazy/wrapNoSSR.d.ts b/dist/lazy/wrapNoSSR.d.ts
140
+ --- a/dist/lazy/wrapNoSSR.d.ts
141
+ +++ b/dist/lazy/wrapNoSSR.d.ts
142
+ @@ -6,4 +6,4 @@ export declare function wrapNoSSR<T, E extends keyof T>(createLazyComponentFn:
143
+ key?: React.Key | null;
144
+ } : {
145
+ key?: React.Key | null;
146
+ -}) => import("node_modules/@types/react").JSX.Element;
147
+ +}) => import("react").JSX.Element;
148
+ diff --git a/dist/provider/versions/v18.d.ts b/dist/provider/versions/v18.d.ts
149
+ --- a/dist/provider/versions/v18.d.ts
150
+ +++ b/dist/provider/versions/v18.d.ts
151
+ @@ -12,7 +12,7 @@ export interface Root {
152
+ unmount(): void;
153
+ }
154
+ export declare function createReact18Root(container: Element | DocumentFragment, options?: CreateRootOptions): Root;
155
+ -export declare function hydrateReact18Root(container: Element | DocumentFragment, initialChildren: React.ReactNode, options?: CreateRootOptions): import("node_modules/@types/react-dom/client").Root;
156
+ +export declare function hydrateReact18Root(container: Element | DocumentFragment, initialChildren: React.ReactNode, options?: CreateRootOptions): import("react-dom/client").Root;
157
+ export declare function createBridgeComponent<T = any>(bridgeInfo: Omit<ProviderFnParams<T>, 'createRoot'>): () => {
158
+ render(info: import("../..").RenderParams): Promise<void>;
159
+ destroy(info: import("../..").DestroyParams): void;
160
+ diff --git a/dist/remote/base-component/create.d.ts b/dist/remote/base-component/create.d.ts
161
+ --- a/dist/remote/base-component/create.d.ts
162
+ +++ b/dist/remote/base-component/create.d.ts
163
+ @@ -1,7 +1,7 @@
164
+ import { type LazyRemoteComponentInfo } from '../createHelpers';
165
+ export type { LazyRemoteComponentInfo };
166
+ -declare const createLazyRemoteComponent: <T = Record<string, unknown>, E extends keyof T = keyof T>(info: LazyRemoteComponentInfo<T, E>) => import("node_modules/@types/react").LazyExoticComponent<import("node_modules/@types/react").ForwardRefExoticComponent<Omit<import("../..").RemoteComponentProps<Record<string, unknown>>, "ref"> & import("node_modules/@types/react").RefAttributes<HTMLDivElement>>>;
167
+ -export declare const createRemoteAppComponent: <T = Record<string, unknown>, E extends keyof T = keyof T>(info: LazyRemoteComponentInfo<T, E>) => import("node_modules/@types/react").ForwardRefExoticComponent<Omit<import("../..").RemoteComponentProps<Record<string, unknown>>, "ref"> & import("node_modules/@types/react").RefAttributes<HTMLDivElement>>;
168
+ +declare const createLazyRemoteComponent: <T = Record<string, unknown>, E extends keyof T = keyof T>(info: LazyRemoteComponentInfo<T, E>) => import("react").LazyExoticComponent<import("react").ForwardRefExoticComponent<Omit<import("../..").RemoteComponentProps<Record<string, unknown>>, "ref"> & import("react").RefAttributes<HTMLDivElement>>>;
169
+ +export declare const createRemoteAppComponent: <T = Record<string, unknown>, E extends keyof T = keyof T>(info: LazyRemoteComponentInfo<T, E>) => import("react").ForwardRefExoticComponent<Omit<import("../..").RemoteComponentProps<Record<string, unknown>>, "ref"> & import("react").RefAttributes<HTMLDivElement>>;
170
+ /**
171
+ * @deprecated createRemoteComponent is deprecated, please use createRemoteAppComponent instead!
172
+ */
173
+ diff --git a/dist/remote/router-component/create.d.ts b/dist/remote/router-component/create.d.ts
174
+ --- a/dist/remote/router-component/create.d.ts
175
+ +++ b/dist/remote/router-component/create.d.ts
176
+ @@ -1,7 +1,7 @@
177
+ import { type LazyRemoteComponentInfo } from '../createHelpers';
178
+ export type { LazyRemoteComponentInfo };
179
+ -declare const createLazyRemoteComponent: <T = Record<string, unknown>, E extends keyof T = keyof T>(info: LazyRemoteComponentInfo<T, E>) => import("node_modules/@types/react").LazyExoticComponent<import("node_modules/@types/react").ForwardRefExoticComponent<Omit<import("../..").RemoteComponentProps<Record<string, unknown>>, "ref"> & import("node_modules/@types/react").RefAttributes<HTMLDivElement>>>;
180
+ -export declare const createRemoteAppComponent: <T = Record<string, unknown>, E extends keyof T = keyof T>(info: LazyRemoteComponentInfo<T, E>) => import("node_modules/@types/react").ForwardRefExoticComponent<Omit<import("../..").RemoteComponentProps<Record<string, unknown>>, "ref"> & import("node_modules/@types/react").RefAttributes<HTMLDivElement>>;
181
+ +declare const createLazyRemoteComponent: <T = Record<string, unknown>, E extends keyof T = keyof T>(info: LazyRemoteComponentInfo<T, E>) => import("react").LazyExoticComponent<import("react").ForwardRefExoticComponent<Omit<import("../..").RemoteComponentProps<Record<string, unknown>>, "ref"> & import("react").RefAttributes<HTMLDivElement>>>;
182
+ +export declare const createRemoteAppComponent: <T = Record<string, unknown>, E extends keyof T = keyof T>(info: LazyRemoteComponentInfo<T, E>) => import("react").ForwardRefExoticComponent<Omit<import("../..").RemoteComponentProps<Record<string, unknown>>, "ref"> & import("react").RefAttributes<HTMLDivElement>>;
183
+ /**
184
+ * @deprecated createRemoteComponent is deprecated, please use createRemoteAppComponent instead!
185
+ */
package/templates/workspace-scripts/proof-node-backend-federation.mjs CHANGED
@@ -1,7 +1,9 @@
1
1
  #!/usr/bin/env node
2
+ import { spawn } from 'node:child_process';
2
3
  import { createHash } from 'node:crypto';
3
4
  import fs from 'node:fs';
4
5
  import { createRequire } from 'node:module';
6
+ import net from 'node:net';
5
7
  import path from 'node:path';
6
8
  import { fileURLToPath, pathToFileURL } from 'node:url';
7
9
 
@@ -221,6 +223,8 @@ function compactApps(config, appFilter) {
221
223
  backendName: createBackendName(app),
222
224
  manifestUrl: createBackendManifestUrl(app),
223
225
  containerEntry: createBackendContainerEntry(app),
226
+ port: app.port,
227
+ portEnv: app.portEnv,
224
228
  remoteType: resolveRemoteType(app),
225
229
  smokeChecks: collectJsonSmokeChecks(apps, app),
226
230
  compactDeliveryUnit:
@@ -236,6 +240,214 @@ function compactApps(config, appFilter) {
236
240
  return filteredApps;
237
241
  }
238
242
 
243
+ const sleep = (durationMs) =>
244
+ new Promise((resolve) => setTimeout(resolve, durationMs));
245
+
246
+ async function assertPortAvailable(port, appId) {
247
+ for (const host of ['127.0.0.1', '::']) {
248
+ await new Promise((resolve, reject) => {
249
+ const server = net.createServer();
250
+ server.unref();
251
+ server.once('error', (error) => {
252
+ if (
253
+ host === '::' &&
254
+ ['EAFNOSUPPORT', 'EADDRNOTAVAIL'].includes(error?.code)
255
+ ) {
256
+ resolve();
257
+ return;
258
+ }
259
+ reject(
260
+ new Error(
261
+ `${appId} Node proof port ${port} is unavailable on ${host}: ${error.message}`,
262
+ ),
263
+ );
264
+ });
265
+ server.listen({ host, port }, () => {
266
+ server.close((error) => (error ? reject(error) : resolve()));
267
+ });
268
+ });
269
+ }
270
+ }
271
+
272
+ function runtimeLogTail(logPath) {
273
+ if (!fs.existsSync(logPath)) {
274
+ return '';
275
+ }
276
+ const source = fs.readFileSync(logPath, 'utf8');
277
+ return source.length > 8_000 ? source.slice(-8_000) : source;
278
+ }
279
+
280
+ async function waitForNodeRuntime(runtime, startupTimeoutMs) {
281
+ const deadline = Date.now() + startupTimeoutMs;
282
+ let lastError;
283
+ while (Date.now() < deadline) {
284
+ if (runtime.exitResult) {
285
+ const tail = runtimeLogTail(runtime.logPath);
286
+ throw new Error(
287
+ `${runtime.appId} Node runtime exited before readiness (code ${runtime.exitResult.exitCode}, signal ${runtime.exitResult.signal})${
288
+ tail ? `\n${tail}` : ''
289
+ }`,
290
+ );
291
+ }
292
+ try {
293
+ const response = await fetch(runtime.manifestUrl, {
294
+ headers: {
295
+ accept: 'application/json',
296
+ 'cache-control': 'no-cache',
297
+ },
298
+ });
299
+ if (response.ok) {
300
+ return;
301
+ }
302
+ lastError = new Error(`HTTP ${response.status}`);
303
+ } catch (error) {
304
+ lastError = error;
305
+ }
306
+ await sleep(100);
307
+ }
308
+
309
+ throw new Error(
310
+ `${runtime.appId} Node runtime did not serve ${runtime.manifestUrl} within ${startupTimeoutMs}ms${
311
+ lastError instanceof Error ? `: ${lastError.message}` : ''
312
+ }`,
313
+ );
314
+ }
315
+
316
+ export async function startNodeRuntime(
317
+ app,
318
+ target,
319
+ {
320
+ deferReadiness = false,
321
+ startupTimeoutMs = 90_000,
322
+ workspaceRoot: runtimeWorkspaceRoot = workspaceRoot,
323
+ } = {},
324
+ ) {
325
+ const parsedPort =
326
+ Number.isInteger(app.port) && app.port > 0
327
+ ? app.port
328
+ : Number(new URL(app.manifestUrl).port);
329
+ if (!Number.isInteger(parsedPort) || parsedPort <= 0) {
330
+ throw new Error(`${app.id} has no valid Node proof port`);
331
+ }
332
+ await assertPortAvailable(parsedPort, app.id);
333
+
334
+ const outputDirectory = path.join(
335
+ runtimeWorkspaceRoot,
336
+ app.directory,
337
+ target,
338
+ );
339
+ const entryPath = path.join(outputDirectory, 'index.js');
340
+ assertFile(entryPath, app.id, 'Node deploy entry');
341
+ const logPath = path.join(
342
+ runtimeWorkspaceRoot,
343
+ '.codex/reports/node-backend-federation-proof',
344
+ `${app.id}-serve.log`,
345
+ );
346
+ fs.mkdirSync(path.dirname(logPath), { recursive: true });
347
+ const logStream = fs.createWriteStream(logPath, { flags: 'w' });
348
+ const env = {
349
+ ...process.env,
350
+ PORT: String(parsedPort),
351
+ ...(typeof app.portEnv === 'string' && app.portEnv.length > 0
352
+ ? { [app.portEnv]: String(parsedPort) }
353
+ : {}),
354
+ };
355
+ const child = spawn(process.execPath, ['index.js'], {
356
+ cwd: outputDirectory,
357
+ detached: process.platform !== 'win32',
358
+ env,
359
+ stdio: ['ignore', 'pipe', 'pipe'],
360
+ });
361
+ child.stdout.pipe(logStream);
362
+ child.stderr.pipe(logStream);
363
+
364
+ const runtime = {
365
+ appId: app.id,
366
+ child,
367
+ exitResult: undefined,
368
+ logPath,
369
+ logStream,
370
+ manifestUrl: app.manifestUrl,
371
+ };
372
+ runtime.exited = new Promise((resolve) => {
373
+ let spawnError;
374
+ child.once('error', (error) => {
375
+ spawnError = error instanceof Error ? error.message : String(error);
376
+ });
377
+ child.once('close', (exitCode, signal) => {
378
+ runtime.exitResult = { exitCode, signal, spawnError };
379
+ logStream.end();
380
+ resolve(runtime.exitResult);
381
+ });
382
+ });
383
+
384
+ if (deferReadiness) {
385
+ runtime.startupTimeoutMs = startupTimeoutMs;
386
+ return runtime;
387
+ }
388
+
389
+ try {
390
+ await waitForNodeRuntime(runtime, startupTimeoutMs);
391
+ return runtime;
392
+ } catch (error) {
393
+ await stopNodeRuntime(runtime);
394
+ throw error;
395
+ }
396
+ }
397
+
398
+ function processGroupIsAlive(pid) {
399
+ if (process.platform === 'win32' || !pid) {
400
+ return false;
401
+ }
402
+ try {
403
+ process.kill(-pid, 0);
404
+ return true;
405
+ } catch {
406
+ return false;
407
+ }
408
+ }
409
+
410
+ function signalRuntime(runtime, signal) {
411
+ if (!runtime.child.pid) {
412
+ return;
413
+ }
414
+ if (process.platform === 'win32') {
415
+ runtime.child.kill(signal);
416
+ return;
417
+ }
418
+ try {
419
+ process.kill(-runtime.child.pid, signal);
420
+ } catch {}
421
+ }
422
+
423
+ export async function stopNodeRuntime(runtime) {
424
+ if (!runtime?.child || runtime.exitResult) {
425
+ return;
426
+ }
427
+ signalRuntime(runtime, 'SIGTERM');
428
+ const deadline = Date.now() + 5_000;
429
+ while (
430
+ processGroupIsAlive(runtime.child.pid) &&
431
+ Date.now() < deadline
432
+ ) {
433
+ await sleep(50);
434
+ }
435
+ if (processGroupIsAlive(runtime.child.pid)) {
436
+ signalRuntime(runtime, 'SIGKILL');
437
+ }
438
+ await Promise.race([runtime.exited, sleep(1_000)]);
439
+ }
440
+
441
+ export function resolveNodeProofServerMode(env = process.env) {
442
+ const mode = env.ULTRAMODERN_NODE_PROOF_SERVER_MODE ?? 'owned';
443
+ if (mode !== 'owned' && mode !== 'existing') {
444
+ throw new Error(
445
+ `ULTRAMODERN_NODE_PROOF_SERVER_MODE must be "owned" or "existing", received ${JSON.stringify(mode)}`,
446
+ );
447
+ }
448
+ return mode;
449
+ }
450
+
239
451
  function assertEqual(actual, expected, message) {
240
452
  if (actual !== expected) {
241
453
  throw new Error(`${message}: expected ${expected}, received ${actual}`);
@@ -949,13 +1161,34 @@ async function main(argv = process.argv.slice(2)) {
949
1161
  }
950
1162
 
951
1163
  const config = readJson(compactConfigPath);
952
- const apps = compactApps(config, args.app);
1164
+ const runtimeApps = compactApps(config);
1165
+ const apps = args.app ? compactApps(config, args.app) : runtimeApps;
953
1166
  const results = [];
954
1167
  const backendRuntime =
955
1168
  apps.length > 0 ? await importBackendFederationRuntime() : undefined;
956
-
957
- for (const app of apps) {
958
- results.push(await proveBackend(app, backendRuntime, args.target));
1169
+ const runtimes = [];
1170
+ try {
1171
+ if (resolveNodeProofServerMode() === 'owned') {
1172
+ for (const app of runtimeApps) {
1173
+ runtimes.push(
1174
+ await startNodeRuntime(app, args.target, {
1175
+ deferReadiness: true,
1176
+ }),
1177
+ );
1178
+ }
1179
+ await Promise.all(
1180
+ runtimes.map((runtime) =>
1181
+ waitForNodeRuntime(runtime, runtime.startupTimeoutMs),
1182
+ ),
1183
+ );
1184
+ }
1185
+ for (const app of apps) {
1186
+ results.push(await proveBackend(app, backendRuntime, args.target));
1187
+ }
1188
+ } finally {
1189
+ await Promise.allSettled(
1190
+ runtimes.reverse().map((runtime) => stopNodeRuntime(runtime)),
1191
+ );
959
1192
  }
960
1193
 
961
1194
  const report = {
@@ -973,12 +1206,18 @@ async function main(argv = process.argv.slice(2)) {
973
1206
  return 0;
974
1207
  }
975
1208
 
976
- main().then(
977
- (exitCode) => {
978
- process.exitCode = exitCode;
979
- },
980
- (error) => {
981
- process.stderr.write(`[node-backend-federation-proof] ${error.message}\n`);
982
- process.exitCode = 1;
983
- },
984
- );
1209
+ const isMain =
1210
+ typeof process.argv[1] === 'string' &&
1211
+ path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
1212
+
1213
+ if (isMain) {
1214
+ main().then(
1215
+ (exitCode) => {
1216
+ process.exitCode = exitCode;
1217
+ },
1218
+ (error) => {
1219
+ process.stderr.write(`[node-backend-federation-proof] ${error.message}\n`);
1220
+ process.exitCode = 1;
1221
+ },
1222
+ );
1223
+ }