@bleedingdev/modern-js-plugin-bff 3.9.0-ultramodern.5 → 3.9.0-ultramodern.6
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/utils/client-generator/package-json.js +2 -2
- package/dist/cjs/utils/client-generator/write-package.js +8 -0
- package/dist/cjs/utils/runtimeGenerator.js +2 -1
- package/dist/esm/utils/client-generator/package-json.mjs +3 -3
- package/dist/esm/utils/client-generator/write-package.mjs +8 -0
- package/dist/esm/utils/runtimeGenerator.mjs +2 -1
- package/dist/esm-node/utils/client-generator/package-json.mjs +3 -3
- package/dist/esm-node/utils/client-generator/write-package.mjs +8 -0
- package/dist/esm-node/utils/runtimeGenerator.mjs +2 -1
- package/dist/types/utils/runtimeGenerator.d.ts +1 -1
- package/package.json +13 -13
|
@@ -90,7 +90,7 @@ function mergePackageJson(packageJson, files, typesVersion, exports1, relativeDi
|
|
|
90
90
|
}).map(([key])=>key);
|
|
91
91
|
if (typeConflicts.length > 0) throw new Error(`[plugin-bff] package.json typesVersions conflict on keys: ${typeConflicts.sort().join(', ')}. Rename these keys or move them outside "${external_files_js_namespaceObject.TYPE_PREFIX}" namespace.`);
|
|
92
92
|
Object.keys(starTypes).forEach((key)=>{
|
|
93
|
-
if (generatedTypeKeys.has(key) || key.startsWith(external_files_js_namespaceObject.TYPE_PREFIX)) delete starTypes[key];
|
|
93
|
+
if (generatedTypeKeys.has(key) || key.startsWith(external_files_js_namespaceObject.TYPE_PREFIX) || key === external_files_js_namespaceObject.RUNTIME_DIR && isManagedTypeEntry(starTypes[key])) delete starTypes[key];
|
|
94
94
|
});
|
|
95
95
|
typesVersions['*'] = {
|
|
96
96
|
...starTypes,
|
|
@@ -107,7 +107,7 @@ function mergePackageJson(packageJson, files, typesVersion, exports1, relativeDi
|
|
|
107
107
|
}).map(([key])=>key);
|
|
108
108
|
if (exportConflicts.length > 0) throw new Error(`[plugin-bff] package.json exports conflict on keys: ${exportConflicts.sort().join(', ')}. Rename these exports or move them outside "${external_files_js_namespaceObject.EXPORT_PREFIX}" namespace.`);
|
|
109
109
|
Object.keys(packageExports).forEach((key)=>{
|
|
110
|
-
if (generatedExportKeys.has(key) || key.startsWith(external_files_js_namespaceObject.EXPORT_PREFIX)) delete packageExports[key];
|
|
110
|
+
if (generatedExportKeys.has(key) || key.startsWith(external_files_js_namespaceObject.EXPORT_PREFIX) || key === `./${external_files_js_namespaceObject.RUNTIME_DIR}` && isManagedExportEntry(packageExports[key])) delete packageExports[key];
|
|
111
111
|
});
|
|
112
112
|
Object.assign(packageExports, exports1);
|
|
113
113
|
}
|
|
@@ -121,6 +121,14 @@ async function setPackage(files, appDirectory, relativeDistPath, packageDependen
|
|
|
121
121
|
types: (0, external_files_js_namespaceObject.toPosixPath)(`./${relativeDistPath}/${external_files_js_namespaceObject.RUNTIME_DIR}/index.d.ts`)
|
|
122
122
|
}
|
|
123
123
|
});
|
|
124
|
+
if (0 === files.length) {
|
|
125
|
+
Reflect.deleteProperty(typesVersions['*'], `${external_files_js_namespaceObject.API_DIR}/*`);
|
|
126
|
+
Reflect.deleteProperty(exports1, `./${external_files_js_namespaceObject.API_DIR}/*`);
|
|
127
|
+
}
|
|
128
|
+
if (!utils_namespaceObject.fs.existsSync(external_path_default().resolve(appDirectory, relativeDistPath, external_files_js_namespaceObject.RUNTIME_DIR, 'index.js'))) {
|
|
129
|
+
Reflect.deleteProperty(typesVersions['*'], external_files_js_namespaceObject.RUNTIME_DIR);
|
|
130
|
+
Reflect.deleteProperty(exports1, `./${external_files_js_namespaceObject.RUNTIME_DIR}`);
|
|
131
|
+
}
|
|
124
132
|
(0, external_package_json_js_namespaceObject.mergePackageJson)(packageJson, addFiles, typesVersions, exports1, relativeDistPath);
|
|
125
133
|
await utils_namespaceObject.fs.promises.writeFile(packagePath, `${JSON.stringify(packageJson, null, 2)}\n`);
|
|
126
134
|
}
|
|
@@ -59,8 +59,9 @@ export declare const configure: typeof initProducerClient;
|
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
61
|
async function runtimeGenerator(options, rendered) {
|
|
62
|
-
const module = rendered ?? renderBffRuntime(options);
|
|
63
62
|
const directory = external_path_default().resolve(options.appDirectory, options.relativeDistPath, 'runtime');
|
|
63
|
+
if (null === rendered) return void await utils_namespaceObject.fs.remove(directory);
|
|
64
|
+
const module = rendered ?? renderBffRuntime(options);
|
|
64
65
|
await utils_namespaceObject.fs.outputFile(external_path_default().join(directory, 'index.js'), module.code);
|
|
65
66
|
await utils_namespaceObject.fs.outputFile(external_path_default().join(directory, 'index.d.ts'), module.declaration);
|
|
66
67
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { fs } from "@modern-js/utils";
|
|
2
2
|
import path from "path";
|
|
3
|
-
import { EXPORT_PREFIX, GENERATED_RUNTIME_DIRS, TYPE_PREFIX, toPosixPath } from "./files.mjs";
|
|
3
|
+
import { EXPORT_PREFIX, GENERATED_RUNTIME_DIRS, RUNTIME_DIR, TYPE_PREFIX, toPosixPath } from "./files.mjs";
|
|
4
4
|
function getPackageName(appDirectory) {
|
|
5
5
|
try {
|
|
6
6
|
const packageJsonPath = path.resolve(appDirectory, './package.json');
|
|
@@ -46,7 +46,7 @@ function mergePackageJson(packageJson, files, typesVersion, exports, relativeDis
|
|
|
46
46
|
}).map(([key])=>key);
|
|
47
47
|
if (typeConflicts.length > 0) throw new Error(`[plugin-bff] package.json typesVersions conflict on keys: ${typeConflicts.sort().join(', ')}. Rename these keys or move them outside "${TYPE_PREFIX}" namespace.`);
|
|
48
48
|
Object.keys(starTypes).forEach((key)=>{
|
|
49
|
-
if (generatedTypeKeys.has(key) || key.startsWith(TYPE_PREFIX)) delete starTypes[key];
|
|
49
|
+
if (generatedTypeKeys.has(key) || key.startsWith(TYPE_PREFIX) || key === RUNTIME_DIR && isManagedTypeEntry(starTypes[key])) delete starTypes[key];
|
|
50
50
|
});
|
|
51
51
|
typesVersions['*'] = {
|
|
52
52
|
...starTypes,
|
|
@@ -63,7 +63,7 @@ function mergePackageJson(packageJson, files, typesVersion, exports, relativeDis
|
|
|
63
63
|
}).map(([key])=>key);
|
|
64
64
|
if (exportConflicts.length > 0) throw new Error(`[plugin-bff] package.json exports conflict on keys: ${exportConflicts.sort().join(', ')}. Rename these exports or move them outside "${EXPORT_PREFIX}" namespace.`);
|
|
65
65
|
Object.keys(packageExports).forEach((key)=>{
|
|
66
|
-
if (generatedExportKeys.has(key) || key.startsWith(EXPORT_PREFIX)) delete packageExports[key];
|
|
66
|
+
if (generatedExportKeys.has(key) || key.startsWith(EXPORT_PREFIX) || key === `./${RUNTIME_DIR}` && isManagedExportEntry(packageExports[key])) delete packageExports[key];
|
|
67
67
|
});
|
|
68
68
|
Object.assign(packageExports, exports);
|
|
69
69
|
}
|
|
@@ -78,6 +78,14 @@ async function setPackage(files, appDirectory, relativeDistPath, packageDependen
|
|
|
78
78
|
types: toPosixPath(`./${relativeDistPath}/${RUNTIME_DIR}/index.d.ts`)
|
|
79
79
|
}
|
|
80
80
|
});
|
|
81
|
+
if (0 === files.length) {
|
|
82
|
+
Reflect.deleteProperty(typesVersions['*'], `${API_DIR}/*`);
|
|
83
|
+
Reflect.deleteProperty(exports, `./${API_DIR}/*`);
|
|
84
|
+
}
|
|
85
|
+
if (!fs.existsSync(path.resolve(appDirectory, relativeDistPath, RUNTIME_DIR, 'index.js'))) {
|
|
86
|
+
Reflect.deleteProperty(typesVersions['*'], RUNTIME_DIR);
|
|
87
|
+
Reflect.deleteProperty(exports, `./${RUNTIME_DIR}`);
|
|
88
|
+
}
|
|
81
89
|
mergePackageJson(packageJson, addFiles, typesVersions, exports, relativeDistPath);
|
|
82
90
|
await fs.promises.writeFile(packagePath, `${JSON.stringify(packageJson, null, 2)}\n`);
|
|
83
91
|
}
|
|
@@ -16,8 +16,9 @@ export declare const configure: typeof initProducerClient;
|
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
18
|
async function runtimeGenerator(options, rendered) {
|
|
19
|
-
const module = rendered ?? renderBffRuntime(options);
|
|
20
19
|
const directory = path.resolve(options.appDirectory, options.relativeDistPath, 'runtime');
|
|
20
|
+
if (null === rendered) return void await fs.remove(directory);
|
|
21
|
+
const module = rendered ?? renderBffRuntime(options);
|
|
21
22
|
await fs.outputFile(path.join(directory, 'index.js'), module.code);
|
|
22
23
|
await fs.outputFile(path.join(directory, 'index.d.ts'), module.declaration);
|
|
23
24
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import "node:module";
|
|
2
2
|
import { fs } from "@modern-js/utils";
|
|
3
3
|
import path from "path";
|
|
4
|
-
import { EXPORT_PREFIX, GENERATED_RUNTIME_DIRS, TYPE_PREFIX, toPosixPath } from "./files.mjs";
|
|
4
|
+
import { EXPORT_PREFIX, GENERATED_RUNTIME_DIRS, RUNTIME_DIR, TYPE_PREFIX, toPosixPath } from "./files.mjs";
|
|
5
5
|
function getPackageName(appDirectory) {
|
|
6
6
|
try {
|
|
7
7
|
const packageJsonPath = path.resolve(appDirectory, './package.json');
|
|
@@ -47,7 +47,7 @@ function mergePackageJson(packageJson, files, typesVersion, exports, relativeDis
|
|
|
47
47
|
}).map(([key])=>key);
|
|
48
48
|
if (typeConflicts.length > 0) throw new Error(`[plugin-bff] package.json typesVersions conflict on keys: ${typeConflicts.sort().join(', ')}. Rename these keys or move them outside "${TYPE_PREFIX}" namespace.`);
|
|
49
49
|
Object.keys(starTypes).forEach((key)=>{
|
|
50
|
-
if (generatedTypeKeys.has(key) || key.startsWith(TYPE_PREFIX)) delete starTypes[key];
|
|
50
|
+
if (generatedTypeKeys.has(key) || key.startsWith(TYPE_PREFIX) || key === RUNTIME_DIR && isManagedTypeEntry(starTypes[key])) delete starTypes[key];
|
|
51
51
|
});
|
|
52
52
|
typesVersions['*'] = {
|
|
53
53
|
...starTypes,
|
|
@@ -64,7 +64,7 @@ function mergePackageJson(packageJson, files, typesVersion, exports, relativeDis
|
|
|
64
64
|
}).map(([key])=>key);
|
|
65
65
|
if (exportConflicts.length > 0) throw new Error(`[plugin-bff] package.json exports conflict on keys: ${exportConflicts.sort().join(', ')}. Rename these exports or move them outside "${EXPORT_PREFIX}" namespace.`);
|
|
66
66
|
Object.keys(packageExports).forEach((key)=>{
|
|
67
|
-
if (generatedExportKeys.has(key) || key.startsWith(EXPORT_PREFIX)) delete packageExports[key];
|
|
67
|
+
if (generatedExportKeys.has(key) || key.startsWith(EXPORT_PREFIX) || key === `./${RUNTIME_DIR}` && isManagedExportEntry(packageExports[key])) delete packageExports[key];
|
|
68
68
|
});
|
|
69
69
|
Object.assign(packageExports, exports);
|
|
70
70
|
}
|
|
@@ -79,6 +79,14 @@ async function setPackage(files, appDirectory, relativeDistPath, packageDependen
|
|
|
79
79
|
types: toPosixPath(`./${relativeDistPath}/${RUNTIME_DIR}/index.d.ts`)
|
|
80
80
|
}
|
|
81
81
|
});
|
|
82
|
+
if (0 === files.length) {
|
|
83
|
+
Reflect.deleteProperty(typesVersions['*'], `${API_DIR}/*`);
|
|
84
|
+
Reflect.deleteProperty(exports, `./${API_DIR}/*`);
|
|
85
|
+
}
|
|
86
|
+
if (!fs.existsSync(path.resolve(appDirectory, relativeDistPath, RUNTIME_DIR, 'index.js'))) {
|
|
87
|
+
Reflect.deleteProperty(typesVersions['*'], RUNTIME_DIR);
|
|
88
|
+
Reflect.deleteProperty(exports, `./${RUNTIME_DIR}`);
|
|
89
|
+
}
|
|
82
90
|
mergePackageJson(packageJson, addFiles, typesVersions, exports, relativeDistPath);
|
|
83
91
|
await fs.promises.writeFile(packagePath, `${JSON.stringify(packageJson, null, 2)}\n`);
|
|
84
92
|
}
|
|
@@ -17,8 +17,9 @@ export declare const configure: typeof initProducerClient;
|
|
|
17
17
|
};
|
|
18
18
|
}
|
|
19
19
|
async function runtimeGenerator(options, rendered) {
|
|
20
|
-
const module = rendered ?? renderBffRuntime(options);
|
|
21
20
|
const directory = path.resolve(options.appDirectory, options.relativeDistPath, 'runtime');
|
|
21
|
+
if (null === rendered) return void await fs.remove(directory);
|
|
22
|
+
const module = rendered ?? renderBffRuntime(options);
|
|
22
23
|
await fs.outputFile(path.join(directory, 'index.js'), module.code);
|
|
23
24
|
await fs.outputFile(path.join(directory, 'index.d.ts'), module.declaration);
|
|
24
25
|
}
|
|
@@ -6,5 +6,5 @@ interface RuntimeGeneratorOptions {
|
|
|
6
6
|
packageName?: string;
|
|
7
7
|
}
|
|
8
8
|
export declare function renderBffRuntime(options: RuntimeGeneratorOptions): BffGeneratedModule;
|
|
9
|
-
export default function runtimeGenerator(options: RuntimeGeneratorOptions, rendered?: BffGeneratedModule): Promise<void>;
|
|
9
|
+
export default function runtimeGenerator(options: RuntimeGeneratorOptions, rendered?: BffGeneratedModule | null): Promise<void>;
|
|
10
10
|
export {};
|
package/package.json
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"modern",
|
|
18
18
|
"modern.js"
|
|
19
19
|
],
|
|
20
|
-
"version": "3.9.0-ultramodern.
|
|
20
|
+
"version": "3.9.0-ultramodern.6",
|
|
21
21
|
"types": "./dist/types/cli.d.ts",
|
|
22
22
|
"main": "./dist/cjs/cli.js",
|
|
23
23
|
"exports": {
|
|
@@ -91,17 +91,17 @@
|
|
|
91
91
|
}
|
|
92
92
|
},
|
|
93
93
|
"dependencies": {
|
|
94
|
-
"@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.9.0-ultramodern.
|
|
95
|
-
"@modern-js/create-request": "npm:@bleedingdev/modern-js-create-request@3.9.0-ultramodern.
|
|
96
|
-
"@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.
|
|
97
|
-
"@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.9.0-ultramodern.
|
|
98
|
-
"@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.
|
|
94
|
+
"@modern-js/bff-core": "npm:@bleedingdev/modern-js-bff-core@3.9.0-ultramodern.6",
|
|
95
|
+
"@modern-js/create-request": "npm:@bleedingdev/modern-js-create-request@3.9.0-ultramodern.6",
|
|
96
|
+
"@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.6",
|
|
97
|
+
"@modern-js/server-utils": "npm:@bleedingdev/modern-js-server-utils@3.9.0-ultramodern.6",
|
|
98
|
+
"@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.6",
|
|
99
99
|
"@swc/core": "1.16.2",
|
|
100
100
|
"qs": "^6.16.0",
|
|
101
101
|
"type-is": "^2.1.0"
|
|
102
102
|
},
|
|
103
103
|
"peerDependencies": {
|
|
104
|
-
"@modern-js/app-tools": "3.9.0-ultramodern.
|
|
104
|
+
"@modern-js/app-tools": "3.9.0-ultramodern.6"
|
|
105
105
|
},
|
|
106
106
|
"peerDependenciesMeta": {
|
|
107
107
|
"@modern-js/app-tools": {
|
|
@@ -109,12 +109,12 @@
|
|
|
109
109
|
}
|
|
110
110
|
},
|
|
111
111
|
"devDependencies": {
|
|
112
|
-
"@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.
|
|
113
|
-
"@modern-js/bff-runtime": "npm:@bleedingdev/modern-js-bff-runtime@3.9.0-ultramodern.
|
|
114
|
-
"@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.
|
|
115
|
-
"@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.
|
|
116
|
-
"@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.
|
|
117
|
-
"@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.
|
|
112
|
+
"@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.6",
|
|
113
|
+
"@modern-js/bff-runtime": "npm:@bleedingdev/modern-js-bff-runtime@3.9.0-ultramodern.6",
|
|
114
|
+
"@modern-js/builder": "npm:@bleedingdev/modern-js-builder@3.9.0-ultramodern.6",
|
|
115
|
+
"@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.6",
|
|
116
|
+
"@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.6",
|
|
117
|
+
"@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.6",
|
|
118
118
|
"@rsbuild/core": "2.2.3",
|
|
119
119
|
"@rslib/core": "1.0.0",
|
|
120
120
|
"@scripts/rstest-config": "2.66.0",
|