Skip to content

Commit a8e1291

Browse files
Merge branch 'main' into fix/logger
2 parents b4abf91 + d3b8500 commit a8e1291

41 files changed

Lines changed: 1083 additions & 402 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

packages/.eslintrc.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"extends": ["../.eslintrc.json"],
3+
"ignorePatterns": ["!**/*", "dist/**/*", "**/*.d.ts"],
4+
"overrides": [
5+
{
6+
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
7+
"rules": {}
8+
},
9+
{
10+
"files": ["*.ts", "*.tsx"],
11+
"rules": {}
12+
},
13+
{
14+
"files": ["*.js", "*.jsx"],
15+
"rules": {}
16+
},
17+
{
18+
"files": ["*.json"],
19+
"parser": "jsonc-eslint-parser",
20+
"rules": {}
21+
}
22+
]
23+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": ["../.eslintrc.json"]
3+
}

packages/bridge/bridge-react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,6 @@
169169
"vite-plugin-dts": "^4.3.0",
170170
"@module-federation/runtime": "workspace:*",
171171
"@module-federation/runtime-core": "workspace:*",
172-
"hono": "4.11.10"
172+
"hono": "4.12.7"
173173
}
174174
}

packages/cli/.eslintrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": ["../.eslintrc.json"]
3+
}

packages/cli/src/utils/readConfig.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import path from 'path';
22
import type { moduleFederationPlugin } from '@module-federation/sdk';
3-
4-
const { createJiti } = require('jiti');
3+
import { createJiti } from 'jiti';
54
const DEFAULT_CONFIG_PATH = 'module-federation.config.ts';
65

76
export const getConfigPath = (userConfigPath?: string) => {
@@ -16,7 +15,6 @@ export async function readConfig(userConfigPath?: string) {
1615
const configPath = getConfigPath(userConfigPath);
1716
const jit = createJiti(__filename, {
1817
interopDefault: true,
19-
esmResolve: true,
2018
});
2119
const configModule = await jit(configPath);
2220
const resolvedConfig = (
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": ["../.eslintrc.json"]
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": ["../.eslintrc.json"]
3+
}

packages/data-prefetch/src/cli/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { fileExistsWithCaseSync, fixPrefetchPath } from '../common/node-utils';
1717
import { getPrefetchId } from '../common/runtime-utils';
1818
import { SHARED_STRATEGY } from '../constant';
1919

20+
// eslint-disable-next-line @typescript-eslint/no-require-imports
2021
const { RuntimeGlobals, Template } = require(
2122
normalizeWebpackPath('webpack'),
2223
) as typeof import('webpack');

packages/dts-plugin/.eslintrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": ["../.eslintrc.json"]
3+
}

packages/dts-plugin/src/core/lib/DtsWorker.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ describe('generateTypesInChildProcess', () => {
4949
it('generateTypesInChildProcess', async () => {
5050
// createRpcWorker will use dist assets , so it need to test dist
5151
const { DtsWorker } =
52+
// eslint-disable-next-line @typescript-eslint/no-require-imports
5253
require('../../../dist/core') as typeof import('../index');
5354
const dtsWorker = new DtsWorker({
5455
host: hostOptions,
@@ -273,6 +274,7 @@ describe('DtsWorker Unit Tests', () => {
273274
vi.spyOn(console, 'error').mockImplementation(() => {});
274275
originalKill = process.kill;
275276
originalDebugMode = isDebugMode;
277+
// eslint-disable-next-line @typescript-eslint/no-require-imports
276278
DtsWorkerClass = require('../../../dist/core').DtsWorker;
277279
// Reset isDebugMode for each test
278280
vi.mock('./utils', () => ({

0 commit comments

Comments
 (0)