@module-federation/nextjs-mf 6.1.3 → 6.1.4

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,16 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
+ ## [6.1.4](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.1.3...nextjs-mf-6.1.4) (2023-03-08)
6
+
7
+
8
+ ### Bug Fixes
9
+
10
+ * exclude next middleware from async boundary loader ([#615](https://github.com/module-federation/nextjs-mf/issues/615)) ([9560d92](https://github.com/module-federation/nextjs-mf/commit/9560d926de176e08b6e1b7a32488f5036cb04be3))
11
+ * include src folder in paths validation ([#605](https://github.com/module-federation/nextjs-mf/issues/605)) ([89a9417](https://github.com/module-federation/nextjs-mf/commit/89a9417faaad50533c4bca1683ea94406ca6f532))
12
+
13
+
14
+
5
15
  ## [6.1.3](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.1.2...nextjs-mf-6.1.3) (2023-02-17)
6
16
 
7
17
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@module-federation/nextjs-mf",
3
- "version": "6.1.3",
3
+ "version": "6.1.4",
4
4
  "license": "MIT",
5
5
  "main": "src/index.js",
6
6
  "types": "src/index.d.ts",
@@ -85,11 +85,11 @@ class NextFederationPlugin {
85
85
  name: this._options.name,
86
86
  };
87
87
  }
88
+ const allowedPaths = ['pages/', 'app/', 'src/pages/', 'src/app/'];
88
89
  //patch next
89
90
  compiler.options.module.rules.push({
90
91
  test(req) {
91
- if (req.includes(path_1.default.join(compiler.context, 'pages/')) ||
92
- req.includes(path_1.default.join(compiler.context, 'app/'))) {
92
+ if (allowedPaths.some(p => req.includes(path_1.default.join(compiler.context, p)))) {
93
93
  return /\.(js|jsx|ts|tsx|md|mdx|mjs)$/i.test(req);
94
94
  }
95
95
  return false;
@@ -106,8 +106,7 @@ class NextFederationPlugin {
106
106
  test(req) {
107
107
  if (isServer) {
108
108
  // server has no common chunk or entry to hoist into
109
- if (req.includes(path_1.default.join(compiler.context, 'pages/')) ||
110
- req.includes(path_1.default.join(compiler.context, 'app/'))) {
109
+ if (allowedPaths.some(p => req.includes(path_1.default.join(compiler.context, p)))) {
111
110
  return /\.(js|jsx|ts|tsx|md|mdx|mjs)$/i.test(req);
112
111
  }
113
112
  }
@@ -136,13 +135,12 @@ class NextFederationPlugin {
136
135
  if (this._extraOptions.automaticAsyncBoundary) {
137
136
  compiler.options.module.rules.push({
138
137
  test: (request) => {
139
- if (request.includes(path_1.default.join(compiler.context, 'pages/')) ||
140
- request.includes(path_1.default.join(compiler.context, 'app/'))) {
138
+ if (allowedPaths.some(p => request.includes(path_1.default.join(compiler.context, p)))) {
141
139
  return /\.(js|jsx|ts|tsx|md|mdx|mjs)$/i.test(request);
142
140
  }
143
141
  return false;
144
142
  },
145
- exclude: [/node_modules/, /_document/, /_middleware/, /pages[\\/]api/],
143
+ exclude: [/node_modules/, /_document/, /_middleware/, /pages[\\/]middleware/, /pages[\\/]api/],
146
144
  resourceQuery: (query) => !query.includes('hasBoundary'),
147
145
  loader: path_1.default.resolve(__dirname, '../loaders/async-boundary-loader'),
148
146
  });
@@ -1 +1 @@
1
- {"version":3,"file":"NextFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/NextFederationPlugin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NextFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/NextFederationPlugin.ts"],"names":[],"mappings":"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"}