Skip to content

Commit 56ab9d2

Browse files
committed
fix: 修复了大量模块导入的问题,期望这次能成功构建
1 parent 740326b commit 56ab9d2

File tree

18 files changed

+62
-59
lines changed

18 files changed

+62
-59
lines changed
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
const assert = require('node:assert')
22

3-
// Ensure CLI entrypoints load without throwing synchronously
4-
(() => {
5-
assert.doesNotThrow(() => require('../src/index.js'))
6-
assert.doesNotThrow(() => require('../src/mitmproxy.js'))
7-
console.log('cliEntrypointTest passed: CLI modules load')
8-
})()
3+
// Ensure CLI entrypoints load without throwing synchronously
4+
(() => {
5+
assert.doesNotThrow(() => require('../src/index.js'))
6+
assert.doesNotThrow(() => require('../src/mitmproxy.js'))
7+
console.log('cliEntrypointTest passed: CLI modules load')
8+
})()

packages/core/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"name": "@docmirror/dev-sidecar",
3-
"type": "module",
43
"version": "2.0.1",
54
"private": false,
65
"description": "给开发者的加速代理工具",

packages/core/src/config-api.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import fs from 'node:fs'
22
import jsonApi from '@docmirror/mitmproxy/src/json.js'
33
import lodash from 'lodash'
44
import request from 'request'
5-
import defConfig from './config/index.js'
6-
import mergeApi from './merge.js'
5+
import defConfig from './config'
6+
import mergeApi from './merge'
77
import Shell from './shell'
88
import log from './utils/util.log.core.js'
99
import configLoader from './config/local-config-loader.js'

packages/core/src/expose.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import lodash from 'lodash'
22
import config from './config-api.js'
33
import event from './event.js'
44
import modules from './modules'
5-
import shell from './shell.js'
5+
import shell from './shell'
66
import status from './status.js'
77
import log from './utils/util.log.core.js'
88

packages/core/src/merge.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import lodash from 'lodash';
1+
import lodash from 'lodash'
22

33
/**
44
* 找出 newObj 相对于 oldObj 有差异的部分
@@ -84,4 +84,4 @@ export default {
8484
},
8585
doDiff,
8686
deleteNullItems,
87-
};
87+
}

packages/core/src/modules/index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
import Server from './server'
2+
import Proxy from './proxy'
3+
import Plugin from './plugin'
4+
15
export default {
2-
server: require('./server.js'),
3-
proxy: require('./proxy.js'),
4-
plugin: require('./plugin.js'),
6+
server: Server,
7+
proxy: Proxy,
8+
plugin: Plugin,
59
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export default {
2-
node: require('./node.js'),
3-
git: require('./git.js'),
4-
pip: require('./pip.js'),
5-
overwall: require('./overwall.js'),
6-
free_eye: require('./free-eye.js'),
7-
};
2+
node: require('./node'),
3+
git: require('./git'),
4+
pip: require('./pip'),
5+
overwall: require('./overwall'),
6+
free_eye: require('./free-eye'),
7+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import mainConfig from '../../../config.js';
1+
import mainConfig from '../../../config'
22

33
export default {
44
name: '梯子',
55
enabled: false, // 默认关闭梯子
66
...mainConfig.server.plugin.overwall,
7-
};
7+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
import mainConfig from '../../config.js';
2-
export default mainConfig.server.proxy;
1+
import mainConfig from '../../config'
2+
export default mainConfig.server.proxy

packages/core/src/shell/index.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import enableLoopback from './scripts/enable-loopback.js';
2-
import extraPath from './scripts/extra-path/index.js';
3-
import getNpmEnv from './scripts/get-npm-env.js';
4-
import getSystemEnv from './scripts/get-system-env.js';
5-
import killByPort from './scripts/kill-by-port.js';
6-
import setNpmEnv from './scripts/set-npm-env.js';
7-
import setSystemEnv from './scripts/set-system-env.js';
8-
import setSystemProxy from './scripts/set-system-proxy.js';
9-
import setupCa from './scripts/setup-ca.js';
10-
import shell from './shell.js';
11-
import sudo from './sudo.js';
1+
import enableLoopback from './scripts/enable-loopback.js'
2+
import extraPath from './scripts/extra-path'
3+
import getNpmEnv from './scripts/get-npm-env.js'
4+
import getSystemEnv from './scripts/get-system-env.js'
5+
import killByPort from './scripts/kill-by-port.js'
6+
import setNpmEnv from './scripts/set-npm-env.js'
7+
import setSystemEnv from './scripts/set-system-env.js'
8+
import setSystemProxy from './scripts/set-system-proxy'
9+
import setupCa from './scripts/setup-ca.js'
10+
import shell from './shell.js'
11+
import sudo from './sudo.js'
1212

1313
export default {
1414
killByPort,
@@ -25,4 +25,4 @@ export default {
2525
return shell.getSystemShell().exec(cmds, args)
2626
},
2727
getSystemPlatform: shell.getSystemPlatform,
28-
};
28+
}

0 commit comments

Comments
 (0)