zephyr-rspack-plugin 0.0.0-canary.2 → 0.0.0-canary.20
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/index.d.ts +2 -0
- package/dist/index.js.map +1 -1
- package/dist/package.json +1 -2
- package/dist/rspack-plugin/env-virtual-loader.js +15 -10
- package/dist/rspack-plugin/with-zephyr.js +1 -0
- package/dist/rspack-plugin/with-zephyr.js.map +1 -1
- package/dist/rspack-plugin/ze-rspack-plugin.d.ts +2 -1
- package/dist/rspack-plugin/ze-rspack-plugin.js +8 -7
- package/dist/rspack-plugin/ze-rspack-plugin.js.map +1 -1
- package/dist/types/index.d.ts +2 -0
- package/package.json +3 -4
package/dist/index.d.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
export { withZephyr } from './rspack-plugin/with-zephyr';
|
|
2
|
+
export type { ZephyrRspackPluginOptions } from './types';
|
|
3
|
+
export type { ZephyrBuildHooks, DeploymentInfo } from 'zephyr-agent';
|
|
2
4
|
export { onDeploymentDone } from 'zephyr-xpack-internal';
|
|
3
5
|
export { resolveIndexHtml } from 'zephyr-agent';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AAAhD,yGAAA,UAAU,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AAAhD,yGAAA,UAAU,OAAA;AAInB,QAAQ;AACR,+DAAyD;AAAhD,yHAAA,gBAAgB,OAAA;AACzB,6CAAgD;AAAvC,gHAAA,gBAAgB,OAAA"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-rspack-plugin",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.2",
|
|
4
4
|
"description": "Repack plugin for Zephyr",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -25,7 +25,6 @@
|
|
|
25
25
|
"is-ci": "catalog:plugin-shared",
|
|
26
26
|
"tslib": "catalog:typescript",
|
|
27
27
|
"zephyr-agent": "workspace:*",
|
|
28
|
-
"zephyr-environment-variables": "workspace:*",
|
|
29
28
|
"zephyr-xpack-internal": "workspace:*"
|
|
30
29
|
},
|
|
31
30
|
"devDependencies": {
|
|
@@ -1,21 +1,26 @@
|
|
|
1
1
|
// Lightweight loader to rewrite ZE_PUBLIC_* env reads to a virtual module import
|
|
2
2
|
// CommonJS to be consumable by Rspack
|
|
3
3
|
|
|
4
|
+
const { rewriteEnvReadsToVirtualModule } = require('zephyr-agent');
|
|
5
|
+
|
|
4
6
|
module.exports = function envVirtualLoader(source) {
|
|
5
7
|
const options = this && typeof this.getOptions === 'function' ? this.getOptions() : {};
|
|
8
|
+
|
|
9
|
+
if (typeof rewriteEnvReadsToVirtualModule !== 'function') {
|
|
10
|
+
return source;
|
|
11
|
+
}
|
|
12
|
+
|
|
6
13
|
try {
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
if (res && typeof res.code === 'string') {
|
|
14
|
-
return res.code;
|
|
15
|
-
}
|
|
14
|
+
const res = rewriteEnvReadsToVirtualModule(
|
|
15
|
+
String(source),
|
|
16
|
+
options && options.specifier
|
|
17
|
+
);
|
|
18
|
+
if (res && typeof res.code === 'string') {
|
|
19
|
+
return res.code;
|
|
16
20
|
}
|
|
17
21
|
} catch (_e) {
|
|
18
|
-
// fallthrough; return original source
|
|
22
|
+
// fallthrough; return original source if rewrite fails
|
|
19
23
|
}
|
|
24
|
+
|
|
20
25
|
return source;
|
|
21
26
|
};
|
|
@@ -23,6 +23,7 @@ async function _zephyr_configuration(config, _zephyrOptions) {
|
|
|
23
23
|
zephyr_engine,
|
|
24
24
|
mfConfig: (0, zephyr_xpack_internal_1.makeCopyOfModuleFederationOptions)(config),
|
|
25
25
|
wait_for_index_html: _zephyrOptions?.wait_for_index_html,
|
|
26
|
+
hooks: _zephyrOptions?.hooks,
|
|
26
27
|
}));
|
|
27
28
|
}
|
|
28
29
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-zephyr.js","sourceRoot":"","sources":["../../src/rspack-plugin/with-zephyr.ts"],"names":[],"mappings":";;AAYA,gCAIC;AAfD,+CAAgE;AAChE,iEAI+B;AAE/B,yDAAoD;AAIpD,SAAgB,UAAU,CACxB,mBAA+C;IAE/C,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AACxE,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,MAAqB,EACrB,cAA0C;IAE1C,IAAI,CAAC;QACH,2DAA2D;QAC3D,MAAM,aAAa,GAAG,MAAM,2BAAY,CAAC,MAAM,CAAC;YAC9C,OAAO,EAAE,QAAQ;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CAAC;QAEH,6CAA6C;QAC7C,MAAM,eAAe,GAAG,IAAA,uDAA+B,EAAC,MAAM,CAAC,CAAC;QAEhE,MAAM,yBAAyB,GAC7B,MAAM,aAAa,CAAC,2BAA2B,CAAC,eAAe,CAAC,CAAC;QAEnE,IAAA,wDAAgC,EAAC,aAAa,EAAE,MAAM,EAAE,yBAAyB,CAAC,CAAC;QAEnF,gCAAgC;QAChC,MAAM,CAAC,OAAO,EAAE,IAAI,CAClB,IAAI,iCAAc,CAAC;YACjB,aAAa;YACb,QAAQ,EAAE,IAAA,yDAAiC,EAAC,MAAM,CAAC;YACnD,mBAAmB,EAAE,cAAc,EAAE,mBAAmB;
|
|
1
|
+
{"version":3,"file":"with-zephyr.js","sourceRoot":"","sources":["../../src/rspack-plugin/with-zephyr.ts"],"names":[],"mappings":";;AAYA,gCAIC;AAfD,+CAAgE;AAChE,iEAI+B;AAE/B,yDAAoD;AAIpD,SAAgB,UAAU,CACxB,mBAA+C;IAE/C,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AACxE,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,MAAqB,EACrB,cAA0C;IAE1C,IAAI,CAAC;QACH,2DAA2D;QAC3D,MAAM,aAAa,GAAG,MAAM,2BAAY,CAAC,MAAM,CAAC;YAC9C,OAAO,EAAE,QAAQ;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CAAC;QAEH,6CAA6C;QAC7C,MAAM,eAAe,GAAG,IAAA,uDAA+B,EAAC,MAAM,CAAC,CAAC;QAEhE,MAAM,yBAAyB,GAC7B,MAAM,aAAa,CAAC,2BAA2B,CAAC,eAAe,CAAC,CAAC;QAEnE,IAAA,wDAAgC,EAAC,aAAa,EAAE,MAAM,EAAE,yBAAyB,CAAC,CAAC;QAEnF,gCAAgC;QAChC,MAAM,CAAC,OAAO,EAAE,IAAI,CAClB,IAAI,iCAAc,CAAC;YACjB,aAAa;YACb,QAAQ,EAAE,IAAA,yDAAiC,EAAC,MAAM,CAAC;YACnD,mBAAmB,EAAE,cAAc,EAAE,mBAAmB;YACxD,KAAK,EAAE,cAAc,EAAE,KAAK;SAC7B,CAAC,CACH,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAA,oBAAK,EAAC,OAAO,EAAE,0BAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import type { ZephyrEngine } from 'zephyr-agent';
|
|
2
1
|
import type { Compiler } from '@rspack/core';
|
|
2
|
+
import { type ZephyrEngine, type ZephyrBuildHooks } from 'zephyr-agent';
|
|
3
3
|
import type { ModuleFederationPlugin } from 'zephyr-xpack-internal';
|
|
4
4
|
export interface ZephyrRspackInternalPluginOptions {
|
|
5
5
|
zephyr_engine: ZephyrEngine;
|
|
6
6
|
pluginName: string;
|
|
7
7
|
mfConfig: ModuleFederationPlugin[] | ModuleFederationPlugin | undefined;
|
|
8
8
|
wait_for_index_html?: boolean;
|
|
9
|
+
hooks?: ZephyrBuildHooks;
|
|
9
10
|
}
|
|
10
11
|
export declare class ZeRspackPlugin {
|
|
11
12
|
#private;
|
|
@@ -3,8 +3,8 @@ var _ZeRspackPlugin_instances, _ZeRspackPlugin_convertFederatedDepsToRemotes, _Z
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.ZeRspackPlugin = void 0;
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
|
-
const zephyr_agent_1 = require("zephyr-agent");
|
|
7
6
|
const core_1 = require("@rspack/core");
|
|
7
|
+
const zephyr_agent_1 = require("zephyr-agent");
|
|
8
8
|
const zephyr_xpack_internal_1 = require("zephyr-xpack-internal");
|
|
9
9
|
const pluginName = 'ZeRspackPlugin';
|
|
10
10
|
class ZeRspackPlugin {
|
|
@@ -29,7 +29,7 @@ class ZeRspackPlugin {
|
|
|
29
29
|
{
|
|
30
30
|
loader: require.resolve('./env-virtual-loader.js'),
|
|
31
31
|
options: {
|
|
32
|
-
specifier: `env:vars:${this._options.zephyr_engine.
|
|
32
|
+
specifier: `env:vars:${this._options.zephyr_engine.application_uid}`,
|
|
33
33
|
},
|
|
34
34
|
},
|
|
35
35
|
],
|
|
@@ -38,7 +38,7 @@ class ZeRspackPlugin {
|
|
|
38
38
|
compiler.options.module.rules = rules;
|
|
39
39
|
// Mark the virtual specifier external so import maps can resolve it
|
|
40
40
|
const existingExternals = compiler.options?.externals;
|
|
41
|
-
const PER_APP_SPECIFIER = `env:vars:${this._options.zephyr_engine.
|
|
41
|
+
const PER_APP_SPECIFIER = `env:vars:${this._options.zephyr_engine.application_uid}`;
|
|
42
42
|
const virtualExternal = {
|
|
43
43
|
[PER_APP_SPECIFIER]: `module ${PER_APP_SPECIFIER}`,
|
|
44
44
|
};
|
|
@@ -60,6 +60,7 @@ exports.ZeRspackPlugin = ZeRspackPlugin;
|
|
|
60
60
|
_ZeRspackPlugin_instances = new WeakSet(), _ZeRspackPlugin_convertFederatedDepsToRemotes = function _ZeRspackPlugin_convertFederatedDepsToRemotes() {
|
|
61
61
|
return (this._options.zephyr_engine.federated_dependencies?.map((dep) => ({
|
|
62
62
|
name: dep.name,
|
|
63
|
+
application_uid: dep.application_uid,
|
|
63
64
|
remote_entry_url: dep.default_url,
|
|
64
65
|
})) || []);
|
|
65
66
|
}, _ZeRspackPlugin_injectImportMapAtBuildTime = function _ZeRspackPlugin_injectImportMapAtBuildTime(compiler) {
|
|
@@ -70,7 +71,7 @@ _ZeRspackPlugin_instances = new WeakSet(), _ZeRspackPlugin_convertFederatedDepsT
|
|
|
70
71
|
// Use afterTemplateExecution hook to modify HTML and tags
|
|
71
72
|
hooks.afterTemplateExecution.tapPromise(pluginName, async (data) => {
|
|
72
73
|
try {
|
|
73
|
-
const
|
|
74
|
+
const appUid = this._options.zephyr_engine.application_uid;
|
|
74
75
|
const remotes = tslib_1.__classPrivateFieldGet(this, _ZeRspackPlugin_instances, "m", _ZeRspackPlugin_convertFederatedDepsToRemotes).call(this);
|
|
75
76
|
// Check if import map already exists
|
|
76
77
|
const hasImportMap = data.headTags.some((tag) => tag.tagName === 'script' && tag.attributes?.type === 'importmap');
|
|
@@ -80,21 +81,21 @@ _ZeRspackPlugin_instances = new WeakSet(), _ZeRspackPlugin_convertFederatedDepsT
|
|
|
80
81
|
tagName: 'script',
|
|
81
82
|
attributes: { type: 'importmap' },
|
|
82
83
|
innerHTML: JSON.stringify({
|
|
83
|
-
imports: (0, zephyr_agent_1.buildEnvImportMap)(
|
|
84
|
+
imports: (0, zephyr_agent_1.buildEnvImportMap)(appUid, remotes),
|
|
84
85
|
}),
|
|
85
86
|
voidTag: false,
|
|
86
87
|
});
|
|
87
88
|
}
|
|
88
89
|
}
|
|
89
90
|
catch (e) {
|
|
90
|
-
|
|
91
|
+
zephyr_agent_1.ze_log.misc('Failed to inject import map at build time:', e);
|
|
91
92
|
}
|
|
92
93
|
return data;
|
|
93
94
|
});
|
|
94
95
|
}
|
|
95
96
|
catch {
|
|
96
97
|
// HtmlRspackPlugin might not be available if no HTML is being generated
|
|
97
|
-
|
|
98
|
+
zephyr_agent_1.ze_log.misc('HtmlRspackPlugin not available, skipping import map injection');
|
|
98
99
|
}
|
|
99
100
|
});
|
|
100
101
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ze-rspack-plugin.js","sourceRoot":"","sources":["../../src/rspack-plugin/ze-rspack-plugin.ts"],"names":[],"mappings":";;;;;AACA
|
|
1
|
+
{"version":3,"file":"ze-rspack-plugin.js","sourceRoot":"","sources":["../../src/rspack-plugin/ze-rspack-plugin.ts"],"names":[],"mappings":"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"}
|
package/dist/types/index.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zephyr-rspack-plugin",
|
|
3
|
-
"version": "0.0.0-canary.
|
|
3
|
+
"version": "0.0.0-canary.20",
|
|
4
4
|
"description": "Repack plugin for Zephyr",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -20,9 +20,8 @@
|
|
|
20
20
|
"@rspack/core": "^1.5.5",
|
|
21
21
|
"is-ci": "^4.1.0",
|
|
22
22
|
"tslib": "^2.8.1",
|
|
23
|
-
"zephyr-agent": "0.0.0-canary.
|
|
24
|
-
"zephyr-xpack-internal": "0.0.0-canary.
|
|
25
|
-
"zephyr-environment-variables": "0.0.0"
|
|
23
|
+
"zephyr-agent": "0.0.0-canary.20",
|
|
24
|
+
"zephyr-xpack-internal": "0.0.0-canary.20"
|
|
26
25
|
},
|
|
27
26
|
"devDependencies": {
|
|
28
27
|
"@types/is-ci": "3.0.4",
|