@angular-architects/native-federation 0.9.4 → 1.1.0-beta.0
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/README.md
CHANGED
|
@@ -50,7 +50,7 @@ We migrated our webpack Module Federation example to Native Federation:
|
|
|
50
50
|
|
|
51
51
|
|
|
52
52
|
|
|
53
|
-
Please find the example [here (branch:
|
|
53
|
+
Please find the example [here (branch: nf-solution)](https://github.com/manfredsteyer/module-federation-plugin-example/tree/nf-solution):
|
|
54
54
|
|
|
55
55
|
```
|
|
56
56
|
git clone https://github.com/manfredsteyer/module-federation-plugin-example.git --branch nf-solution
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular-architects/native-federation",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "1.1.0-beta.0",
|
|
4
4
|
"main": "src/index.js",
|
|
5
5
|
"generators": "./collection.json",
|
|
6
6
|
"builders": "./builders.json",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"rollup-plugin-node-externals": "^4.1.1",
|
|
24
24
|
"esbuild": "^0.15.5",
|
|
25
25
|
"@babel/core": "^7.19.0",
|
|
26
|
-
"@softarc/native-federation": "1.
|
|
27
|
-
"@softarc/native-federation-runtime": "1.
|
|
26
|
+
"@softarc/native-federation": "1.1.0",
|
|
27
|
+
"@softarc/native-federation-runtime": "1.1.0",
|
|
28
28
|
"@rollup/plugin-json": "^4.1.0",
|
|
29
29
|
"cross-spawn": "^7.0.3",
|
|
30
30
|
"rollup-plugin-terser": "^7.0.2",
|
|
@@ -24,6 +24,7 @@ function runBuilder(options, context) {
|
|
|
24
24
|
federationConfig: infereConfigPath(options.tsConfig),
|
|
25
25
|
tsConfig: options.tsConfig,
|
|
26
26
|
verbose: options.verbose,
|
|
27
|
+
watch: options.watch,
|
|
27
28
|
};
|
|
28
29
|
const config = yield (0, build_4.loadFederationConfig)(fedOptions);
|
|
29
30
|
const externals = (0, build_3.getExternals)(config);
|
|
@@ -108,15 +109,15 @@ function updateIndexHtml(fedOptions) {
|
|
|
108
109
|
const polyfillsName = fs
|
|
109
110
|
.readdirSync(outputPath)
|
|
110
111
|
.find((f) => f.startsWith('polyfills.') && f.endsWith('.js'));
|
|
111
|
-
const htmlFragment = `
|
|
112
|
-
<script type="esms-options">
|
|
113
|
-
{
|
|
114
|
-
"shimMode": true
|
|
115
|
-
}
|
|
116
|
-
</script>
|
|
117
|
-
|
|
118
|
-
<script type="module" src="${polyfillsName}"></script>
|
|
119
|
-
<script type="module-shim" src="${mainName}"></script>
|
|
112
|
+
const htmlFragment = `
|
|
113
|
+
<script type="esms-options">
|
|
114
|
+
{
|
|
115
|
+
"shimMode": true
|
|
116
|
+
}
|
|
117
|
+
</script>
|
|
118
|
+
|
|
119
|
+
<script type="module" src="${polyfillsName}"></script>
|
|
120
|
+
<script type="module-shim" src="${mainName}"></script>
|
|
120
121
|
`;
|
|
121
122
|
const indexContent = fs.readFileSync(indexPath, 'utf-8');
|
|
122
123
|
const updatedContent = indexContent.replace('</body>', `${htmlFragment}</body>`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../../libs/native-federation/src/builders/build/builder.ts"],"names":[],"mappings":";;;;AAAA,yDAImC;AAEnC,gGAA2G;AAG3G,6BAA6B;AAC7B,yBAAyB;AACzB,4DAK0C;AAG1C,+EAAgF;AAEhF,4DAAmE;AACnE,iFAA4E;AAC5E,4DAAgE;AAChE,4DAAwE;AACxE,4DAAsE;AAEtE,0CAA0C;AAE1C,SAAsB,UAAU,CAC9B,OAAe,EACf,OAAuB;;QAEvB,IAAA,uBAAe,EAAC,+CAAqB,CAAC,CAAC;QACvC,IAAA,mBAAW,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAElD,MAAM,UAAU,GAAsB;YACpC,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,gBAAgB,EAAE,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC;YACpD,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../../libs/native-federation/src/builders/build/builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,12 +10,12 @@ const rollup_1 = require("./rollup");
|
|
|
10
10
|
const fs = require("fs");
|
|
11
11
|
const core_1 = require("@babel/core");
|
|
12
12
|
const AngularEsBuildAdapter = (options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
13
|
-
const { entryPoint, tsConfigPath, external, outfile, mappedPaths, kind } = options;
|
|
13
|
+
const { entryPoint, tsConfigPath, external, outfile, mappedPaths, kind, watch, } = options;
|
|
14
14
|
if (kind === 'shared-package') {
|
|
15
15
|
yield (0, rollup_1.runRollup)(entryPoint, external, outfile);
|
|
16
16
|
}
|
|
17
17
|
else {
|
|
18
|
-
yield runEsbuild(entryPoint, external, outfile, tsConfigPath, mappedPaths);
|
|
18
|
+
yield runEsbuild(entryPoint, external, outfile, tsConfigPath, mappedPaths, watch);
|
|
19
19
|
}
|
|
20
20
|
if (kind === 'shared-package' && fs.existsSync(outfile)) {
|
|
21
21
|
yield link(outfile);
|
|
@@ -51,7 +51,7 @@ function link(outfile) {
|
|
|
51
51
|
}
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
|
-
function runEsbuild(entryPoint, external, outfile, tsConfigPath, mappedPaths, plugins = null, absWorkingDir = undefined, logLevel = 'warning') {
|
|
54
|
+
function runEsbuild(entryPoint, external, outfile, tsConfigPath, mappedPaths, watch, plugins = null, absWorkingDir = undefined, logLevel = 'warning') {
|
|
55
55
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
56
56
|
return yield esbuild.build({
|
|
57
57
|
entryPoints: [entryPoint],
|
|
@@ -59,6 +59,7 @@ function runEsbuild(entryPoint, external, outfile, tsConfigPath, mappedPaths, pl
|
|
|
59
59
|
external,
|
|
60
60
|
outfile,
|
|
61
61
|
logLevel,
|
|
62
|
+
watch: !!watch,
|
|
62
63
|
bundle: true,
|
|
63
64
|
sourcemap: true,
|
|
64
65
|
minify: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-esbuild-adapter.js","sourceRoot":"","sources":["../../../../../libs/native-federation/src/utils/angular-esbuild-adapter.ts"],"names":[],"mappings":";;;;AAAA,4DAI0C;AAC1C,mCAAmC;AACnC,gHAAkH;AAClH,qEAAsE;AACtE,qCAAkD;AAClD,yBAAyB;AACzB,sCAAyD;AAElD,MAAM,qBAAqB,GAAiB,CAAO,OAAO,EAAE,EAAE;IACnE,MAAM,
|
|
1
|
+
{"version":3,"file":"angular-esbuild-adapter.js","sourceRoot":"","sources":["../../../../../libs/native-federation/src/utils/angular-esbuild-adapter.ts"],"names":[],"mappings":"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"}
|