fix(midway-bin): use resolveModule() instead of findFramework() (#344)

BREAKING CHANGE: remove findFramework()
midwayjs · Oct 11, 2019 · 8c24e2e · 8c24e2e
1 parent 1809d17
commit 8c24e2e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 25 deletions.
diff --git a/packages/midway-bin/index.js b/packages/midway-bin/index.js
@@ -22,5 +22,4 @@ exports.DebugCommand = require('./lib/cmd/debug');
 exports.PkgfilesCommand = require('./lib/cmd/pkgfiles');
 exports.CleanCommand = require('./lib/cmd/clean');
 exports.DocCommand = require('./lib/cmd/doc');
-exports.findFramework = require('./lib/util').findFramework;
 exports.resolveModule = require('./lib/util').resolveModule;
diff --git a/packages/midway-bin/lib/util.js b/packages/midway-bin/lib/util.js
@@ -2,26 +2,6 @@
 const fs = require('fs');
 const path = require('path');
 
-
-/**
- * Resolve mono-repo's full path
- * @param {string} module - module name
- * @return {string} full path or blank
- */
-function findFramework(module) {
-  let framePath = '';
-  const modPath = resolveModule(module);
-
-  if (modPath) {
-    framePath = path.join(modPath, '../../');
-  } else {
-    console.log(`[midway-bin] Not found framework "${module}" and skip.`);
-  }
-
-  return framePath;
-}
-
-
 /**
  * Resolve module's full path
  * @param {string} moduleName module name
@@ -63,6 +43,4 @@ function retrieveModulePath(moduleName) {
   return moduleDir ? path.join(moduleDir, moduleName) : '';
 }
 
-
-exports.findFramework = findFramework;
 exports.resolveModule = resolveModule;
diff --git a/packages/midway-mock/src/mock.ts b/packages/midway-mock/src/mock.ts
@@ -1,5 +1,5 @@
 import * as mock from 'egg-mock';
-import { findFramework } from 'midway-bin';
+import { resolveModule } from 'midway-bin';
 
 import { MidwayApplicationOptions, MidwayMockApplication } from './interface';
 
@@ -20,7 +20,7 @@ function mockContainer(options: MidwayApplicationOptions): MockContainer {
   return new MockContainer(options);
 }
 
-const defaultFramework: string = findFramework('midway') || findFramework('midway-mirror');
+const defaultFramework: string = resolveModule('midway') || resolveModule('midway-mirror');
 
 export const mm = Object.assign({}, mock, {
   container: mockContainer,