@bleedingdev/modern-js-create 3.5.0-ultramodern.13 → 3.5.0-ultramodern.15
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.
- package/dist/cjs/ultramodern-tooling/commands.cjs +6 -0
- package/dist/cjs/ultramodern-workspace/workspace-scripts.cjs +1 -0
- package/dist/cjs/ultramodern-workspace/write-workspace.cjs +1 -0
- package/dist/esm/ultramodern-tooling/commands.js +7 -1
- package/dist/esm/ultramodern-workspace/workspace-scripts.js +2 -1
- package/dist/esm/ultramodern-workspace/write-workspace.js +2 -1
- package/dist/esm-node/ultramodern-tooling/commands.js +7 -1
- package/dist/esm-node/ultramodern-workspace/workspace-scripts.js +2 -1
- package/dist/esm-node/ultramodern-workspace/write-workspace.js +2 -1
- package/package.json +3 -3
- package/template-workspace/patches/@module-federation__modern-js-v3@2.6.0.patch +57 -0
- package/template-workspace/pnpm-workspace.yaml.handlebars +1 -0
- package/templates/workspace-scripts/validate-ultramodern-workspace.mjs.handlebars +7 -0
|
@@ -236,6 +236,8 @@ const strictEffectPackageVersionPolicyExclusions = [
|
|
|
236
236
|
`effect@${versions_cjs_namespaceObject.EFFECT_VERSION}`,
|
|
237
237
|
`@effect/opentelemetry@${versions_cjs_namespaceObject.EFFECT_VERSION}`
|
|
238
238
|
];
|
|
239
|
+
const moduleFederationModernJsPatchPath = `patches/@module-federation__modern-js-v3@${versions_cjs_namespaceObject.MODULE_FEDERATION_VERSION}.patch`;
|
|
240
|
+
const moduleFederationModernJsPatchSourcePath = external_node_path_default().join(createPackageRoot, 'template-workspace', moduleFederationModernJsPatchPath);
|
|
239
241
|
const effectDeclarationPatchPath = 'patches/effect-schema-error-type-id.patch';
|
|
240
242
|
const effectDeclarationPatchSourcePath = external_node_path_default().join(createPackageRoot, 'template-workspace', effectDeclarationPatchPath);
|
|
241
243
|
const drizzleOrmDeclarationPatchPath = 'patches/drizzle-orm-ts7-strict-declarations.patch';
|
|
@@ -481,6 +483,7 @@ function workspaceUsesDependency(workspaceRoot, packageName) {
|
|
|
481
483
|
}
|
|
482
484
|
function ensureGeneratedDeclarationPatches(workspaceRoot, options) {
|
|
483
485
|
let changed = false;
|
|
486
|
+
changed = ensureGeneratedPatchFile(workspaceRoot, moduleFederationModernJsPatchPath, moduleFederationModernJsPatchSourcePath) || changed;
|
|
484
487
|
changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
|
|
485
488
|
changed = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
|
|
486
489
|
return changed;
|
|
@@ -528,6 +531,9 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
|
|
|
528
531
|
const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${versions_cjs_namespaceObject.EFFECT_VERSION}`, effectDeclarationPatchPath);
|
|
529
532
|
source = effectPatch.source;
|
|
530
533
|
changed = effectPatch.changed || changed;
|
|
534
|
+
const moduleFederationModernJsPatch = ensureYamlMapEntry(source, 'patchedDependencies', `@module-federation/modern-js-v3@${versions_cjs_namespaceObject.MODULE_FEDERATION_VERSION}`, moduleFederationModernJsPatchPath);
|
|
535
|
+
source = moduleFederationModernJsPatch.source;
|
|
536
|
+
changed = moduleFederationModernJsPatch.changed || changed;
|
|
531
537
|
const drizzleOrmPatch = usesDrizzleOrm ? ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${versions_cjs_namespaceObject.DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath) : removeYamlMapEntry(source, `drizzle-orm@${versions_cjs_namespaceObject.DRIZZLE_ORM_VERSION}`);
|
|
532
538
|
source = drizzleOrmPatch.source;
|
|
533
539
|
changed = drizzleOrmPatch.changed || changed;
|
|
@@ -175,6 +175,7 @@ function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
|
|
|
175
175
|
return (0, external_fs_io_cjs_namespaceObject.renderFileTemplate)("workspace-scripts/validate-ultramodern-workspace.mjs", {
|
|
176
176
|
packageScope: scope,
|
|
177
177
|
effectVersion: external_versions_cjs_namespaceObject.EFFECT_VERSION,
|
|
178
|
+
moduleFederationVersion: external_versions_cjs_namespaceObject.MODULE_FEDERATION_VERSION,
|
|
178
179
|
nodeVersion: external_versions_cjs_namespaceObject.NODE_VERSION,
|
|
179
180
|
pnpmVersion: external_versions_cjs_namespaceObject.PNPM_VERSION,
|
|
180
181
|
tailwindEnabledJson: JSON.stringify(enableTailwind),
|
|
@@ -178,6 +178,7 @@ function generateUltramodernWorkspace(options) {
|
|
|
178
178
|
drizzleOrmVersion: external_versions_cjs_namespaceObject.DRIZZLE_ORM_VERSION,
|
|
179
179
|
effectVersion: external_versions_cjs_namespaceObject.EFFECT_VERSION,
|
|
180
180
|
effectVitestVersion: external_versions_cjs_namespaceObject.EFFECT_VITEST_VERSION,
|
|
181
|
+
moduleFederationVersion: external_versions_cjs_namespaceObject.MODULE_FEDERATION_VERSION,
|
|
181
182
|
tanstackRouterCoreVersion: external_versions_cjs_namespaceObject.TANSTACK_ROUTER_CORE_VERSION,
|
|
182
183
|
tanstackRouterVersion: external_versions_cjs_namespaceObject.TANSTACK_ROUTER_VERSION,
|
|
183
184
|
typescriptVersion: external_versions_cjs_namespaceObject.TYPESCRIPT_VERSION,
|
|
@@ -9,7 +9,7 @@ import { createAppEnvDts } from "../ultramodern-workspace/app-files.js";
|
|
|
9
9
|
import { validateModuleFederationTypes } from "../ultramodern-workspace/mf-validation.js";
|
|
10
10
|
import { createAppModernConfig } from "../ultramodern-workspace/module-federation.js";
|
|
11
11
|
import { createAppMfTypesTsConfig, createAppTsConfig, createSharedPackageTsConfig, createTsConfigBase } from "../ultramodern-workspace/package-json.js";
|
|
12
|
-
import { DRIZZLE_ORM_VERSION, EFFECT_TSGO_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, OXFMT_VERSION, OXLINT_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION } from "../ultramodern-workspace/versions.js";
|
|
12
|
+
import { DRIZZLE_ORM_VERSION, EFFECT_TSGO_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, MODULE_FEDERATION_VERSION, OXFMT_VERSION, OXLINT_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION } from "../ultramodern-workspace/versions.js";
|
|
13
13
|
import { createWorkspaceValidationScript } from "../ultramodern-workspace/workspace-scripts.js";
|
|
14
14
|
import { readUltramodernConfig, workspaceAppsFromToolingConfig } from "./config.js";
|
|
15
15
|
const commands_dirname = node_path.dirname(fileURLToPath(import.meta.url));
|
|
@@ -189,6 +189,8 @@ const strictEffectPackageVersionPolicyExclusions = [
|
|
|
189
189
|
`effect@${EFFECT_VERSION}`,
|
|
190
190
|
`@effect/opentelemetry@${EFFECT_VERSION}`
|
|
191
191
|
];
|
|
192
|
+
const moduleFederationModernJsPatchPath = `patches/@module-federation__modern-js-v3@${MODULE_FEDERATION_VERSION}.patch`;
|
|
193
|
+
const moduleFederationModernJsPatchSourcePath = node_path.join(createPackageRoot, 'template-workspace', moduleFederationModernJsPatchPath);
|
|
192
194
|
const effectDeclarationPatchPath = 'patches/effect-schema-error-type-id.patch';
|
|
193
195
|
const effectDeclarationPatchSourcePath = node_path.join(createPackageRoot, 'template-workspace', effectDeclarationPatchPath);
|
|
194
196
|
const drizzleOrmDeclarationPatchPath = 'patches/drizzle-orm-ts7-strict-declarations.patch';
|
|
@@ -434,6 +436,7 @@ function workspaceUsesDependency(workspaceRoot, packageName) {
|
|
|
434
436
|
}
|
|
435
437
|
function ensureGeneratedDeclarationPatches(workspaceRoot, options) {
|
|
436
438
|
let changed = false;
|
|
439
|
+
changed = ensureGeneratedPatchFile(workspaceRoot, moduleFederationModernJsPatchPath, moduleFederationModernJsPatchSourcePath) || changed;
|
|
437
440
|
changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
|
|
438
441
|
changed = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
|
|
439
442
|
return changed;
|
|
@@ -481,6 +484,9 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
|
|
|
481
484
|
const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${EFFECT_VERSION}`, effectDeclarationPatchPath);
|
|
482
485
|
source = effectPatch.source;
|
|
483
486
|
changed = effectPatch.changed || changed;
|
|
487
|
+
const moduleFederationModernJsPatch = ensureYamlMapEntry(source, 'patchedDependencies', `@module-federation/modern-js-v3@${MODULE_FEDERATION_VERSION}`, moduleFederationModernJsPatchPath);
|
|
488
|
+
source = moduleFederationModernJsPatch.source;
|
|
489
|
+
changed = moduleFederationModernJsPatch.changed || changed;
|
|
484
490
|
const drizzleOrmPatch = usesDrizzleOrm ? ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath) : removeYamlMapEntry(source, `drizzle-orm@${DRIZZLE_ORM_VERSION}`);
|
|
485
491
|
source = drizzleOrmPatch.source;
|
|
486
492
|
changed = drizzleOrmPatch.changed || changed;
|
|
@@ -8,7 +8,7 @@ import { packageName, tailwindPrefixForApp } from "./naming.js";
|
|
|
8
8
|
import { createCloudflareSecurityContract } from "./policy.js";
|
|
9
9
|
import { publicSurfaceManagedSourceAssetPaths } from "./public-surface.js";
|
|
10
10
|
import { createLocalisedUrlsMap, createRouteMetaFilePath, createRouteOwnedI18nPaths, createRoutePageFilePath } from "./routes.js";
|
|
11
|
-
import { CLOUDFLARE_COMPATIBILITY_DATE, EFFECT_VERSION, NODE_VERSION, PNPM_VERSION } from "./versions.js";
|
|
11
|
+
import { CLOUDFLARE_COMPATIBILITY_DATE, EFFECT_VERSION, MODULE_FEDERATION_VERSION, NODE_VERSION, PNPM_VERSION } from "./versions.js";
|
|
12
12
|
function createToolWrapperScript(command, extraArgs = []) {
|
|
13
13
|
const commandJson = JSON.stringify(command);
|
|
14
14
|
const extraArgsJson = JSON.stringify(extraArgs);
|
|
@@ -128,6 +128,7 @@ function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
|
|
|
128
128
|
return renderFileTemplate("workspace-scripts/validate-ultramodern-workspace.mjs", {
|
|
129
129
|
packageScope: scope,
|
|
130
130
|
effectVersion: EFFECT_VERSION,
|
|
131
|
+
moduleFederationVersion: MODULE_FEDERATION_VERSION,
|
|
131
132
|
nodeVersion: NODE_VERSION,
|
|
132
133
|
pnpmVersion: PNPM_VERSION,
|
|
133
134
|
tailwindEnabledJson: JSON.stringify(enableTailwind),
|
|
@@ -14,7 +14,7 @@ import { runCodeSmithOverlays } from "./overlays.js";
|
|
|
14
14
|
import { createAppMfTypesTsConfig, createAppPackage, createAppTsConfig, createRootPackageJson, createRootTsConfig, createSharedContractsIndex, createSharedPackage, createSharedPackageTsConfig, createTsConfigBase } from "./package-json.js";
|
|
15
15
|
import { resolvePackageSource } from "./package-source.js";
|
|
16
16
|
import { createPublicWebAppArtifacts } from "./public-surface.js";
|
|
17
|
-
import { DRIZZLE_ORM_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, NODE_FETCH_VERSION, NODE_VERSION, PNPM_VERSION, TANSTACK_ROUTER_CORE_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_VERSION } from "./versions.js";
|
|
17
|
+
import { DRIZZLE_ORM_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, MODULE_FEDERATION_VERSION, NODE_FETCH_VERSION, NODE_VERSION, PNPM_VERSION, TANSTACK_ROUTER_CORE_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_VERSION } from "./versions.js";
|
|
18
18
|
import { writeGeneratedWorkspaceScripts } from "./workspace-scripts.js";
|
|
19
19
|
function writeApp(targetDir, scope, app, packageSource, enableTailwind, remotes = [], bridge) {
|
|
20
20
|
const resolvedApp = 'shell' === app.kind ? createShellHost(remotes) : app;
|
|
@@ -133,6 +133,7 @@ function generateUltramodernWorkspace(options) {
|
|
|
133
133
|
drizzleOrmVersion: DRIZZLE_ORM_VERSION,
|
|
134
134
|
effectVersion: EFFECT_VERSION,
|
|
135
135
|
effectVitestVersion: EFFECT_VITEST_VERSION,
|
|
136
|
+
moduleFederationVersion: MODULE_FEDERATION_VERSION,
|
|
136
137
|
tanstackRouterCoreVersion: TANSTACK_ROUTER_CORE_VERSION,
|
|
137
138
|
tanstackRouterVersion: TANSTACK_ROUTER_VERSION,
|
|
138
139
|
typescriptVersion: TYPESCRIPT_VERSION,
|
|
@@ -10,7 +10,7 @@ import { createAppEnvDts } from "../ultramodern-workspace/app-files.js";
|
|
|
10
10
|
import { validateModuleFederationTypes } from "../ultramodern-workspace/mf-validation.js";
|
|
11
11
|
import { createAppModernConfig } from "../ultramodern-workspace/module-federation.js";
|
|
12
12
|
import { createAppMfTypesTsConfig, createAppTsConfig, createSharedPackageTsConfig, createTsConfigBase } from "../ultramodern-workspace/package-json.js";
|
|
13
|
-
import { DRIZZLE_ORM_VERSION, EFFECT_TSGO_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, OXFMT_VERSION, OXLINT_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION } from "../ultramodern-workspace/versions.js";
|
|
13
|
+
import { DRIZZLE_ORM_VERSION, EFFECT_TSGO_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, MODULE_FEDERATION_VERSION, OXFMT_VERSION, OXLINT_VERSION, TYPESCRIPT_NATIVE_PREVIEW_VERSION, WRANGLER_VERSION, ZEPHYR_AGENT_VERSION, ZEPHYR_RSPACK_PLUGIN_VERSION } from "../ultramodern-workspace/versions.js";
|
|
14
14
|
import { createWorkspaceValidationScript } from "../ultramodern-workspace/workspace-scripts.js";
|
|
15
15
|
import { readUltramodernConfig, workspaceAppsFromToolingConfig } from "./config.js";
|
|
16
16
|
const commands_dirname = node_path.dirname(fileURLToPath(import.meta.url));
|
|
@@ -190,6 +190,8 @@ const strictEffectPackageVersionPolicyExclusions = [
|
|
|
190
190
|
`effect@${EFFECT_VERSION}`,
|
|
191
191
|
`@effect/opentelemetry@${EFFECT_VERSION}`
|
|
192
192
|
];
|
|
193
|
+
const moduleFederationModernJsPatchPath = `patches/@module-federation__modern-js-v3@${MODULE_FEDERATION_VERSION}.patch`;
|
|
194
|
+
const moduleFederationModernJsPatchSourcePath = node_path.join(createPackageRoot, 'template-workspace', moduleFederationModernJsPatchPath);
|
|
193
195
|
const effectDeclarationPatchPath = 'patches/effect-schema-error-type-id.patch';
|
|
194
196
|
const effectDeclarationPatchSourcePath = node_path.join(createPackageRoot, 'template-workspace', effectDeclarationPatchPath);
|
|
195
197
|
const drizzleOrmDeclarationPatchPath = 'patches/drizzle-orm-ts7-strict-declarations.patch';
|
|
@@ -435,6 +437,7 @@ function workspaceUsesDependency(workspaceRoot, packageName) {
|
|
|
435
437
|
}
|
|
436
438
|
function ensureGeneratedDeclarationPatches(workspaceRoot, options) {
|
|
437
439
|
let changed = false;
|
|
440
|
+
changed = ensureGeneratedPatchFile(workspaceRoot, moduleFederationModernJsPatchPath, moduleFederationModernJsPatchSourcePath) || changed;
|
|
438
441
|
changed = ensureGeneratedPatchFile(workspaceRoot, effectDeclarationPatchPath, effectDeclarationPatchSourcePath) || changed;
|
|
439
442
|
changed = options.includeDrizzleOrmPatch ? ensureGeneratedPatchFile(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed : removeGeneratedPatchFileIfUnchanged(workspaceRoot, drizzleOrmDeclarationPatchPath, drizzleOrmDeclarationPatchSourcePath) || changed;
|
|
440
443
|
return changed;
|
|
@@ -482,6 +485,9 @@ function updateGeneratedPnpmWorkspacePolicy(workspaceRoot) {
|
|
|
482
485
|
const effectPatch = ensureYamlMapEntry(source, 'patchedDependencies', `effect@${EFFECT_VERSION}`, effectDeclarationPatchPath);
|
|
483
486
|
source = effectPatch.source;
|
|
484
487
|
changed = effectPatch.changed || changed;
|
|
488
|
+
const moduleFederationModernJsPatch = ensureYamlMapEntry(source, 'patchedDependencies', `@module-federation/modern-js-v3@${MODULE_FEDERATION_VERSION}`, moduleFederationModernJsPatchPath);
|
|
489
|
+
source = moduleFederationModernJsPatch.source;
|
|
490
|
+
changed = moduleFederationModernJsPatch.changed || changed;
|
|
485
491
|
const drizzleOrmPatch = usesDrizzleOrm ? ensureYamlMapEntry(source, 'patchedDependencies', `drizzle-orm@${DRIZZLE_ORM_VERSION}`, drizzleOrmDeclarationPatchPath) : removeYamlMapEntry(source, `drizzle-orm@${DRIZZLE_ORM_VERSION}`);
|
|
486
492
|
source = drizzleOrmPatch.source;
|
|
487
493
|
changed = drizzleOrmPatch.changed || changed;
|
|
@@ -9,7 +9,7 @@ import { packageName, tailwindPrefixForApp } from "./naming.js";
|
|
|
9
9
|
import { createCloudflareSecurityContract } from "./policy.js";
|
|
10
10
|
import { publicSurfaceManagedSourceAssetPaths } from "./public-surface.js";
|
|
11
11
|
import { createLocalisedUrlsMap, createRouteMetaFilePath, createRouteOwnedI18nPaths, createRoutePageFilePath } from "./routes.js";
|
|
12
|
-
import { CLOUDFLARE_COMPATIBILITY_DATE, EFFECT_VERSION, NODE_VERSION, PNPM_VERSION } from "./versions.js";
|
|
12
|
+
import { CLOUDFLARE_COMPATIBILITY_DATE, EFFECT_VERSION, MODULE_FEDERATION_VERSION, NODE_VERSION, PNPM_VERSION } from "./versions.js";
|
|
13
13
|
function createToolWrapperScript(command, extraArgs = []) {
|
|
14
14
|
const commandJson = JSON.stringify(command);
|
|
15
15
|
const extraArgsJson = JSON.stringify(extraArgs);
|
|
@@ -129,6 +129,7 @@ function createWorkspaceValidationScript(scope, enableTailwind, remotes = []) {
|
|
|
129
129
|
return renderFileTemplate("workspace-scripts/validate-ultramodern-workspace.mjs", {
|
|
130
130
|
packageScope: scope,
|
|
131
131
|
effectVersion: EFFECT_VERSION,
|
|
132
|
+
moduleFederationVersion: MODULE_FEDERATION_VERSION,
|
|
132
133
|
nodeVersion: NODE_VERSION,
|
|
133
134
|
pnpmVersion: PNPM_VERSION,
|
|
134
135
|
tailwindEnabledJson: JSON.stringify(enableTailwind),
|
|
@@ -15,7 +15,7 @@ import { runCodeSmithOverlays } from "./overlays.js";
|
|
|
15
15
|
import { createAppMfTypesTsConfig, createAppPackage, createAppTsConfig, createRootPackageJson, createRootTsConfig, createSharedContractsIndex, createSharedPackage, createSharedPackageTsConfig, createTsConfigBase } from "./package-json.js";
|
|
16
16
|
import { resolvePackageSource } from "./package-source.js";
|
|
17
17
|
import { createPublicWebAppArtifacts } from "./public-surface.js";
|
|
18
|
-
import { DRIZZLE_ORM_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, NODE_FETCH_VERSION, NODE_VERSION, PNPM_VERSION, TANSTACK_ROUTER_CORE_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_VERSION } from "./versions.js";
|
|
18
|
+
import { DRIZZLE_ORM_VERSION, EFFECT_VERSION, EFFECT_VITEST_VERSION, MODULE_FEDERATION_VERSION, NODE_FETCH_VERSION, NODE_VERSION, PNPM_VERSION, TANSTACK_ROUTER_CORE_VERSION, TANSTACK_ROUTER_VERSION, TYPESCRIPT_VERSION } from "./versions.js";
|
|
19
19
|
import { writeGeneratedWorkspaceScripts } from "./workspace-scripts.js";
|
|
20
20
|
function writeApp(targetDir, scope, app, packageSource, enableTailwind, remotes = [], bridge) {
|
|
21
21
|
const resolvedApp = 'shell' === app.kind ? createShellHost(remotes) : app;
|
|
@@ -134,6 +134,7 @@ function generateUltramodernWorkspace(options) {
|
|
|
134
134
|
drizzleOrmVersion: DRIZZLE_ORM_VERSION,
|
|
135
135
|
effectVersion: EFFECT_VERSION,
|
|
136
136
|
effectVitestVersion: EFFECT_VITEST_VERSION,
|
|
137
|
+
moduleFederationVersion: MODULE_FEDERATION_VERSION,
|
|
137
138
|
tanstackRouterCoreVersion: TANSTACK_ROUTER_CORE_VERSION,
|
|
138
139
|
tanstackRouterVersion: TANSTACK_ROUTER_VERSION,
|
|
139
140
|
typescriptVersion: TYPESCRIPT_VERSION,
|
package/package.json
CHANGED
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"engines": {
|
|
22
22
|
"node": ">=20"
|
|
23
23
|
},
|
|
24
|
-
"version": "3.5.0-ultramodern.
|
|
24
|
+
"version": "3.5.0-ultramodern.15",
|
|
25
25
|
"types": "./dist/types/index.d.ts",
|
|
26
26
|
"main": "./dist/esm-node/index.js",
|
|
27
27
|
"bin": {
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"@modern-js/codesmith": "2.6.9",
|
|
78
78
|
"oxfmt": "0.56.0",
|
|
79
79
|
"ultracite": "7.8.3",
|
|
80
|
-
"@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.
|
|
80
|
+
"@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.15"
|
|
81
81
|
},
|
|
82
82
|
"devDependencies": {
|
|
83
83
|
"@rslib/core": "0.23.1",
|
|
@@ -99,6 +99,6 @@
|
|
|
99
99
|
"test": "rm -rf dist && rslib build -c rslibconfig.mts && rstest --passWithNoTests"
|
|
100
100
|
},
|
|
101
101
|
"ultramodern": {
|
|
102
|
-
"frameworkVersion": "3.5.0-ultramodern.
|
|
102
|
+
"frameworkVersion": "3.5.0-ultramodern.15"
|
|
103
103
|
}
|
|
104
104
|
}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
diff --git a/dist/cjs/cli/configPlugin.js b/dist/cjs/cli/configPlugin.js
|
|
2
|
+
index 0d01ad0..e5485a2 100644
|
|
3
|
+
--- a/dist/cjs/cli/configPlugin.js
|
|
4
|
+
+++ b/dist/cjs/cli/configPlugin.js
|
|
5
|
+
@@ -212,9 +212,12 @@ var __webpack_exports__ = {};
|
|
6
|
+
if (!chain.output.get('uniqueName')) chain.output.uniqueName(mfConfig.name);
|
|
7
|
+
const splitChunkConfig = chain.optimization.splitChunks.entries();
|
|
8
|
+
if (!isServer) (0, utils_namespaceObject.autoDeleteSplitChunkCacheGroups)(mfConfig, splitChunkConfig);
|
|
9
|
+
- if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups) {
|
|
10
|
+
+ if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups && splitChunkConfig.chunks !== undefined && splitChunkConfig.chunks !== 'async') {
|
|
11
|
+
+ const previousChunks = splitChunkConfig.chunks;
|
|
12
|
+
splitChunkConfig.chunks = 'async';
|
|
13
|
+
- external_logger_js_default().warn('splitChunks.chunks = async is not allowed with stream SSR mode, it will auto changed to "async"');
|
|
14
|
+
+ if (void 0 !== previousChunks) {
|
|
15
|
+
+ external_logger_js_default().warn(`splitChunks.chunks = ${previousChunks} is not allowed with stream SSR mode, it will auto changed to "async"`);
|
|
16
|
+
+ }
|
|
17
|
+
}
|
|
18
|
+
if ((0, external_utils_js_namespaceObject.isDev)() && 'auto' === chain.output.get('publicPath')) {
|
|
19
|
+
var _modernjsConfig_server;
|
|
20
|
+
diff --git a/dist/esm/cli/configPlugin.mjs b/dist/esm/cli/configPlugin.mjs
|
|
21
|
+
index 3e880c8..93e4290 100644
|
|
22
|
+
--- a/dist/esm/cli/configPlugin.mjs
|
|
23
|
+
+++ b/dist/esm/cli/configPlugin.mjs
|
|
24
|
+
@@ -194,9 +194,12 @@ function patchBundlerConfig(options) {
|
|
25
|
+
if (!chain.output.get('uniqueName')) chain.output.uniqueName(mfConfig.name);
|
|
26
|
+
var splitChunkConfig = chain.optimization.splitChunks.entries();
|
|
27
|
+
if (!isServer) autoDeleteSplitChunkCacheGroups(mfConfig, splitChunkConfig);
|
|
28
|
+
- if (!isServer && enableSSR && splitChunkConfig && (void 0 === splitChunkConfig ? "undefined" : _type_of__(splitChunkConfig)) === 'object' && splitChunkConfig.cacheGroups) {
|
|
29
|
+
+ if (!isServer && enableSSR && splitChunkConfig && (void 0 === splitChunkConfig ? "undefined" : _type_of__(splitChunkConfig)) === 'object' && splitChunkConfig.cacheGroups && void 0 !== splitChunkConfig.chunks && splitChunkConfig.chunks !== 'async') {
|
|
30
|
+
+ var previousChunks = splitChunkConfig.chunks;
|
|
31
|
+
splitChunkConfig.chunks = 'async';
|
|
32
|
+
- logger.warn('splitChunks.chunks = async is not allowed with stream SSR mode, it will auto changed to "async"');
|
|
33
|
+
+ if (void 0 !== previousChunks) {
|
|
34
|
+
+ logger.warn("splitChunks.chunks = ".concat(previousChunks, " is not allowed with stream SSR mode, it will auto changed to \"async\""));
|
|
35
|
+
+ }
|
|
36
|
+
}
|
|
37
|
+
if (isDev() && 'auto' === chain.output.get('publicPath')) {
|
|
38
|
+
var _modernjsConfig_server;
|
|
39
|
+
diff --git a/dist/esm-node/cli/configPlugin.mjs b/dist/esm-node/cli/configPlugin.mjs
|
|
40
|
+
index 722f1bb..dcac7ec 100644
|
|
41
|
+
--- a/dist/esm-node/cli/configPlugin.mjs
|
|
42
|
+
+++ b/dist/esm-node/cli/configPlugin.mjs
|
|
43
|
+
@@ -165,9 +165,12 @@ function patchBundlerConfig(options) {
|
|
44
|
+
if (!chain.output.get('uniqueName')) chain.output.uniqueName(mfConfig.name);
|
|
45
|
+
const splitChunkConfig = chain.optimization.splitChunks.entries();
|
|
46
|
+
if (!isServer) autoDeleteSplitChunkCacheGroups(mfConfig, splitChunkConfig);
|
|
47
|
+
- if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups) {
|
|
48
|
+
+ if (!isServer && enableSSR && splitChunkConfig && 'object' == typeof splitChunkConfig && splitChunkConfig.cacheGroups && splitChunkConfig.chunks !== undefined && splitChunkConfig.chunks !== 'async') {
|
|
49
|
+
+ const previousChunks = splitChunkConfig.chunks;
|
|
50
|
+
splitChunkConfig.chunks = 'async';
|
|
51
|
+
- logger.warn('splitChunks.chunks = async is not allowed with stream SSR mode, it will auto changed to "async"');
|
|
52
|
+
+ if (void 0 !== previousChunks) {
|
|
53
|
+
+ logger.warn(`splitChunks.chunks = ${previousChunks} is not allowed with stream SSR mode, it will auto changed to "async"`);
|
|
54
|
+
+ }
|
|
55
|
+
}
|
|
56
|
+
if (isDev() && 'auto' === chain.output.get('publicPath')) {
|
|
57
|
+
var _modernjsConfig_server;
|
|
@@ -62,5 +62,6 @@ allowBuilds:
|
|
|
62
62
|
workerd: true
|
|
63
63
|
|
|
64
64
|
patchedDependencies:
|
|
65
|
+
'@module-federation/modern-js-v3@{{moduleFederationVersion}}': patches/@module-federation__modern-js-v3@{{moduleFederationVersion}}.patch
|
|
65
66
|
'@tanstack/router-core@{{tanstackRouterCoreVersion}}': patches/@tanstack__router-core@{{tanstackRouterCoreVersion}}.patch
|
|
66
67
|
'effect@{{effectVersion}}': patches/effect-schema-error-type-id.patch
|
|
@@ -1503,6 +1503,7 @@ const requiredPaths = [
|
|
|
1503
1503
|
'.gitignore',
|
|
1504
1504
|
'package.json',
|
|
1505
1505
|
'pnpm-workspace.yaml',
|
|
1506
|
+
'patches/@module-federation__modern-js-v3@{{moduleFederationVersion}}.patch',
|
|
1506
1507
|
'patches/effect-schema-error-type-id.patch',
|
|
1507
1508
|
'tsconfig.json',
|
|
1508
1509
|
'tsconfig.base.json',
|
|
@@ -1580,6 +1581,12 @@ for (const requiredPath of requiredPaths) {
|
|
|
1580
1581
|
assertExists(requiredPath);
|
|
1581
1582
|
}
|
|
1582
1583
|
const pnpmWorkspace = readText('pnpm-workspace.yaml');
|
|
1584
|
+
assert(
|
|
1585
|
+
pnpmWorkspace.includes(
|
|
1586
|
+
"'@module-federation/modern-js-v3@{{moduleFederationVersion}}': patches/@module-federation__modern-js-v3@{{moduleFederationVersion}}.patch",
|
|
1587
|
+
),
|
|
1588
|
+
'pnpm-workspace.yaml must patch the generated Module Federation Modern.js integration cohort',
|
|
1589
|
+
);
|
|
1583
1590
|
assert(
|
|
1584
1591
|
pnpmWorkspace.includes(
|
|
1585
1592
|
"'effect@{{effectVersion}}': patches/effect-schema-error-type-id.patch",
|