Skip to content

Commit

Permalink
fix: should add egg to peerDependencies (#139)
Browse files Browse the repository at this point in the history
  • Loading branch information
fengmk2 authored Jan 7, 2023
1 parent d5b5b26 commit 2134fc7
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 38 deletions.
2 changes: 1 addition & 1 deletion app/extend/application.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const debug = require('debug')('egg-mock:application');
const debug = require('util').debuglog('egg-mock:application');
const mm = require('mm');
const http = require('http');
const fs = require('fs');
Expand Down
4 changes: 1 addition & 3 deletions app/middleware/cluster_app_mock.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
'use strict';

const debug = require('debug')('egg-mock:middleware:cluster_app_mock');
const debug = require('util').debuglog('egg-mock:middleware:cluster_app_mock');
const is = require('is-type-of');
const co = require('co');

Expand Down
13 changes: 5 additions & 8 deletions lib/app.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
'use strict';

const co = require('co');
const debug = require('util').debuglog('egg-mock');
const os = require('os');
const path = require('path');
const EventEmitter = require('events');
const co = require('co');
const is = require('is-type-of');
const ready = require('get-ready');
const detectPort = require('detect-port');
const debug = require('debug')('egg-mock');
const EventEmitter = require('events');
const os = require('os');
const ConsoleLogger = require('egg-logger').EggConsoleLogger;
const { sleep, rimraf } = require('./utils');
const formatOptions = require('./format_options');
const context = require('./context');
const mockCustomLoader = require('./mock_custom_loader');
const mockHttpServer = require('./mock_http_server');

const ConsoleLogger = require('egg-logger').EggConsoleLogger;
const consoleLogger = new ConsoleLogger({ level: 'INFO' });

const apps = new Map();
const INIT = Symbol('init');
const APP_INIT = Symbol('appInit');
Expand Down
7 changes: 2 additions & 5 deletions lib/cluster.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
'use strict';

const debug = require('debug')('egg-mock:cluster');
const debug = require('util').debuglog('egg-mock:cluster');
const path = require('path');
const os = require('os');
const childProcess = require('child_process');
const Coffee = require('coffee').Coffee;
const ready = require('get-ready');
const os = require('os');
const co = require('co');
const awaitEvent = require('await-event');
const supertestRequest = require('./supertest');
const { sleep, rimrafSync } = require('./utils');

const formatOptions = require('./format_options');

const clusters = new Map();
Expand Down
4 changes: 1 addition & 3 deletions lib/format_options.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
'use strict';

const debug = require('util').debuglog('mm');
const path = require('path');
const mm = require('mm');
const debug = require('debug')('mm');
const utils = require('egg-utils');

/**
Expand Down
8 changes: 2 additions & 6 deletions lib/parallel/agent.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
'use strict';

const debug = require('debug')('egg-mock');
const Base = require('sdk-base');
const debug = require('util').debuglog('egg-mock');
const path = require('path');
const Base = require('sdk-base');
const detectPort = require('detect-port');

const context = require('../context');
const formatOptions = require('../format_options');
const { sleep, rimraf } = require('../utils');
const mockCustomLoader = require('../mock_custom_loader');

const {
APP_INIT,
INIT_ONCE_LISTENER,
Expand Down
5 changes: 1 addition & 4 deletions lib/parallel/app.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
'use strict';

const debug = require('debug')('egg-mock');
const debug = require('util').debuglog('egg-mock');
const Base = require('sdk-base');

const context = require('../context');
const formatOptions = require('../format_options');
const { sleep } = require('../utils');
Expand Down
5 changes: 2 additions & 3 deletions lib/parallel/util.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
const debug = require('debug')('egg-mock');
const { getProperty } = require('../utils');
const debug = require('util').debuglog('egg-mock');
const ConsoleLogger = require('egg-logger').EggConsoleLogger;
const { getProperty } = require('../utils');

const consoleLogger = new ConsoleLogger({ level: 'INFO' });

const MOCK_APP_METHOD = [
'ready',
'closed',
Expand Down
2 changes: 1 addition & 1 deletion lib/prerequire.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const debug = require('util').debuglog('egg-mock:prerequire');
const path = require('path');
const { existsSync } = require('fs');
const globby = require('globby');
const debug = require('debug')('egg-mock:prerequire');

const cwd = process.cwd();
const dirs = [];
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"await-event": "^2.1.0",
"co": "^4.6.0",
"coffee": "^5.2.1",
"debug": "^4.1.1",
"detect-port": "^1.3.0",
"egg-logger": "^2.4.1",
"egg-utils": "^2.4.1",
Expand All @@ -44,10 +43,12 @@
"supertest": "^6.2.4",
"urllib-next": "^3.2.3"
},
"peerDependencies": {
"egg": "^3.12.0"
},
"devDependencies": {
"@types/node": "^14.18.34",
"coffee": "^5.4.0",
"egg": "^3.3.3",
"egg": "^3.12.0",
"egg-bin": "^5.2.0",
"egg-errors": "^2.2.1",
"eslint": "^8.24.0",
Expand Down
2 changes: 1 addition & 1 deletion test/cluster.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ describe('test/cluster.test.js', () => {

it('should load files', async () => {
mm(process.env, 'EGG_BIN_PREREQUIRE', 'true');
mm(process.env, 'DEBUG', 'egg-mock:prerequire');
mm(process.env, 'NODE_DEBUG', 'egg-mock:prerequire');
app = mm.cluster({
baseDir: 'yadan_app',
workers: 1,
Expand Down

0 comments on commit 2134fc7

Please sign in to comment.