fix: find node_modules

wya-team · Apr 9, 2020 · 52dc585 · 52dc585
1 parent 1b43d12
commit 52dc585
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/node/config.js b/node/config.js
@@ -1,12 +1,30 @@
 const path = require('path');
+const fs = require('fs-extra');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const webpack = require('webpack');
 const merge = require('webpack-merge');
 const VueLoaderPlugin = require('vue-loader/lib/plugin');
 const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin');
 
 const { resolve } = path;
-const r = (source) => resolve(__dirname, '../node_modules', source);
+const cwd = process.cwd();
+
+const r = (source) => {
+	let fullpath;
+
+	fullpath = resolve(__dirname, '../node_modules', source);
+	if (fs.pathExistsSync(fullpath)) {
+		return fullpath;
+	}
+
+	fullpath = resolve(cwd, './node_modules', source);
+	if (fs.pathExistsSync(fullpath)) {
+		return fullpath;
+	}
+
+	throw new Error(`@wya/doc: 未找到${source}`);
+};
+
 class Config {
 	constructor(type, parent) {
 
@@ -83,7 +101,7 @@ class Config {
 						// exclude: /node_modules/,
 						exclude,
 						use: {
-							loader: 'babel-loader',
+							loader: r('babel-loader'),
 							options: {
 								// 不使用sourceDir本地配置
 								babelrc: false,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wya/doc",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "wya-doc for js",
   "main": "index.js",
   "files": [