@module-federation/utilities 2.0.5 → 2.0.7

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/CHANGELOG.md CHANGED
@@ -2,6 +2,69 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
+ ## [2.0.7](https://github.com/module-federation/nextjs-mf/compare/utils-2.0.6...utils-2.0.7) (2023-08-14)
6
+
7
+
8
+ ### Bug Fixes
9
+
10
+ * no barrel exports ([5bc775d](https://github.com/module-federation/nextjs-mf/commit/5bc775d9ce685161fc3ea2e1bd179d11526d365a))
11
+
12
+
13
+
14
+ ## [2.0.6](https://github.com/module-federation/nextjs-mf/compare/utils-2.0.5...utils-2.0.6) (2023-08-14)
15
+
16
+
17
+ ### Bug Fixes
18
+
19
+ * workaround to self ref module error in prod ([#1205](https://github.com/module-federation/nextjs-mf/issues/1205)) ([1d88beb](https://github.com/module-federation/nextjs-mf/commit/1d88beb0da629f036e132573fee9f05494b1f540))
20
+
21
+
22
+
23
+ ## [2.0.6](https://github.com/module-federation/nextjs-mf/compare/utils-2.0.5...utils-2.0.6) (2023-08-14)
24
+
25
+
26
+ ### Bug Fixes
27
+
28
+ * workaround to self ref module error in prod ([#1205](https://github.com/module-federation/nextjs-mf/issues/1205)) ([1d88beb](https://github.com/module-federation/nextjs-mf/commit/1d88beb0da629f036e132573fee9f05494b1f540))
29
+
30
+
31
+
32
+ ## [2.0.6](https://github.com/module-federation/nextjs-mf/compare/utils-2.0.5...utils-2.0.6) (2023-08-14)
33
+
34
+
35
+ ### Bug Fixes
36
+
37
+ * workaround to self ref module error in prod ([#1205](https://github.com/module-federation/nextjs-mf/issues/1205)) ([1d88beb](https://github.com/module-federation/nextjs-mf/commit/1d88beb0da629f036e132573fee9f05494b1f540))
38
+
39
+
40
+
41
+ ## [2.0.6](https://github.com/module-federation/nextjs-mf/compare/utils-2.0.5...utils-2.0.6) (2023-08-14)
42
+
43
+
44
+ ### Bug Fixes
45
+
46
+ * workaround to self ref module error in prod ([#1205](https://github.com/module-federation/nextjs-mf/issues/1205)) ([1d88beb](https://github.com/module-federation/nextjs-mf/commit/1d88beb0da629f036e132573fee9f05494b1f540))
47
+
48
+
49
+
50
+ ## [2.0.6](https://github.com/module-federation/nextjs-mf/compare/utils-2.0.5...utils-2.0.6) (2023-08-14)
51
+
52
+
53
+ ### Bug Fixes
54
+
55
+ * workaround to self ref module error in prod ([#1205](https://github.com/module-federation/nextjs-mf/issues/1205)) ([1d88beb](https://github.com/module-federation/nextjs-mf/commit/1d88beb0da629f036e132573fee9f05494b1f540))
56
+
57
+
58
+
59
+ ## [2.0.6](https://github.com/module-federation/nextjs-mf/compare/utils-2.0.5...utils-2.0.6) (2023-08-14)
60
+
61
+
62
+ ### Bug Fixes
63
+
64
+ * workaround to self ref module error in prod ([e134caa](https://github.com/module-federation/nextjs-mf/commit/e134caa9a914da6a226e73dc877a108456b1053f))
65
+
66
+
67
+
5
68
  ## [2.0.5](https://github.com/module-federation/nextjs-mf/compare/utils-2.0.4...utils-2.0.5) (2023-08-11)
6
69
 
7
70
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@module-federation/utilities",
3
- "version": "2.0.5",
3
+ "version": "2.0.7",
4
4
  "type": "commonjs",
5
5
  "main": "src/index.js",
6
6
  "types": "src/index.d.ts",
package/src/index.d.ts CHANGED
@@ -1,8 +1,10 @@
1
1
  export * from './types';
2
- export * from './utils/common';
3
- export * from './utils/isEmpty';
4
- export * from './utils/importRemote';
5
- export * from './utils/correctImportPath';
6
- export * from './Logger';
2
+ export type { ImportRemoteOptions } from './utils/importRemote';
3
+ export type { LoggerInstance } from './Logger';
4
+ export { createDelegatedModule, createRuntimeVariables, getContainer, injectScript, getModule } from './utils/common';
5
+ export { isObjectEmpty } from './utils/isEmpty';
6
+ export { importRemote } from './utils/importRemote';
7
+ export { correctImportPath } from './utils/correctImportPath';
8
+ export { Logger } from './Logger';
7
9
  export { getRuntimeRemotes } from './utils/getRuntimeRemotes';
8
10
  export { importDelegatedModule } from './utils/importDelegatedModule';
package/src/index.js CHANGED
@@ -14,13 +14,22 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.importDelegatedModule = exports.getRuntimeRemotes = void 0;
17
+ exports.importDelegatedModule = exports.getRuntimeRemotes = exports.Logger = exports.correctImportPath = exports.importRemote = exports.isObjectEmpty = exports.getModule = exports.injectScript = exports.getContainer = exports.createRuntimeVariables = exports.createDelegatedModule = void 0;
18
18
  __exportStar(require("./types"), exports);
19
- __exportStar(require("./utils/common"), exports);
20
- __exportStar(require("./utils/isEmpty"), exports);
21
- __exportStar(require("./utils/importRemote"), exports);
22
- __exportStar(require("./utils/correctImportPath"), exports);
23
- __exportStar(require("./Logger"), exports);
19
+ var common_1 = require("./utils/common");
20
+ Object.defineProperty(exports, "createDelegatedModule", { enumerable: true, get: function () { return common_1.createDelegatedModule; } });
21
+ Object.defineProperty(exports, "createRuntimeVariables", { enumerable: true, get: function () { return common_1.createRuntimeVariables; } });
22
+ Object.defineProperty(exports, "getContainer", { enumerable: true, get: function () { return common_1.getContainer; } });
23
+ Object.defineProperty(exports, "injectScript", { enumerable: true, get: function () { return common_1.injectScript; } });
24
+ Object.defineProperty(exports, "getModule", { enumerable: true, get: function () { return common_1.getModule; } });
25
+ var isEmpty_1 = require("./utils/isEmpty");
26
+ Object.defineProperty(exports, "isObjectEmpty", { enumerable: true, get: function () { return isEmpty_1.isObjectEmpty; } });
27
+ var importRemote_1 = require("./utils/importRemote");
28
+ Object.defineProperty(exports, "importRemote", { enumerable: true, get: function () { return importRemote_1.importRemote; } });
29
+ var correctImportPath_1 = require("./utils/correctImportPath");
30
+ Object.defineProperty(exports, "correctImportPath", { enumerable: true, get: function () { return correctImportPath_1.correctImportPath; } });
31
+ var Logger_1 = require("./Logger");
32
+ Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return Logger_1.Logger; } });
24
33
  var getRuntimeRemotes_1 = require("./utils/getRuntimeRemotes");
25
34
  Object.defineProperty(exports, "getRuntimeRemotes", { enumerable: true, get: function () { return getRuntimeRemotes_1.getRuntimeRemotes; } });
26
35
  var importDelegatedModule_1 = require("./utils/importDelegatedModule");
package/src/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/utilities/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,iDAA+B;AAC/B,kDAAgC;AAChC,uDAAqC;AACrC,4DAA0C;AAC1C,2CAAyB;AACzB,+DAA8D;AAArD,sHAAA,iBAAiB,OAAA;AAC1B,uEAAsE;AAA7D,8HAAA,qBAAqB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/utilities/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0CAAwB;AAIxB,yCAAgH;AAAxG,+GAAA,qBAAqB,OAAA;AAAC,gHAAA,sBAAsB,OAAA;AAAC,sGAAA,YAAY,OAAA;AAAC,sGAAA,YAAY,OAAA;AAAC,mGAAA,SAAS,OAAA;AACxF,2CAA8C;AAAtC,wGAAA,aAAa,OAAA;AACrB,qDAAkD;AAA1C,4GAAA,YAAY,OAAA;AACpB,+DAA4D;AAApD,sHAAA,iBAAiB,OAAA;AACzB,mCAAgC;AAAxB,gGAAA,MAAM,OAAA;AACd,+DAA8D;AAArD,sHAAA,iBAAiB,OAAA;AAC1B,uEAAsE;AAA7D,8HAAA,qBAAqB,OAAA"}
@@ -40,7 +40,11 @@ class DelegateModulesPlugin {
40
40
  const dependencyModule = compilation.moduleGraph.getModule(dependency);
41
41
  if (dependencyModule &&
42
42
  !compilation.chunkGraph.isModuleInChunk(dependencyModule, chunk)) {
43
- this.addModuleAndDependenciesToChunk(dependencyModule, chunk, compilation);
43
+ // this.addModuleAndDependenciesToChunk(
44
+ // dependencyModule,
45
+ // chunk,
46
+ // compilation
47
+ // );
44
48
  }
45
49
  }
46
50
  }
@@ -1 +1 @@
1
- {"version":3,"file":"DelegateModulesPlugin.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/plugins/DelegateModulesPlugin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DelegateModulesPlugin.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/plugins/DelegateModulesPlugin.ts"],"names":[],"mappings":"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"}