Skip to content

Commit 1537ad5

Browse files
author
Baitu Huang
committed
fix: remove node_modules files
1 parent a842f31 commit 1537ad5

File tree

6 files changed

+18
-17
lines changed

6 files changed

+18
-17
lines changed

lib/utils.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,14 @@ exports.toFunc = function toFunc (exp, useWith = true) {
3838
const Module = require('module')
3939
const path = require('path')
4040
const clearModule = require('clear-module')
41+
const slash = require('slash')
4142
exports.getDependencies = function getDependencies (callback, deps) {
4243
deps = new Set(deps)
4344
const resolveFilename = Module._resolveFilename
4445
Module._resolveFilename = function _resolveFilename (req, ...args) {
4546
const filename = resolveFilename.call(this, req, ...args)
46-
if (path.isAbsolute(req) && !/node_modules/.test(req)) {
47-
deps.add(filename)
48-
}
49-
if (/^\.{1,2}\//.test(req)) {
47+
const unixFn = slash(filename)
48+
if ((path.isAbsolute(req) || /^\.{1,2}\//.test(req)) && !/\/node_modules\//.test(unixFn)) {
5049
deps.add(filename)
5150
}
5251
return filename

package-lock.json

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,12 @@
4646
"chalk": "^2.4.1",
4747
"clear-module": "^3.2.0",
4848
"find-cache-dir": "^3.0.0",
49+
"fs-extra": "^7.0.1",
4950
"loader-utils": "^1.2.0",
5051
"schema-utils": "^1.0.0",
5152
"semver": "^6.0.0",
52-
"watchpack": "^1.6.0",
53-
"fs-extra": "^7.0.1"
53+
"slash": "^2.0.0",
54+
"watchpack": "^1.6.0"
5455
},
5556
"peerDependencies": {
5657
"webpack": "^4.1.0"

test/utils/loadCompiler.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = async function loadCompiler (version = 'latest') {
1010
if (fse.pathExistsSync(cachePath)) {
1111
try {
1212
const compiler = require(cachePath)
13-
if ('parseComponent' in compiler) {
13+
if (typeof compiler.parseComponent === 'function') {
1414
return compiler
1515
}
1616
} catch (e) {}

test/utils/loadTemplates.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ const fs = require('fs')
22
const path = require('path')
33

44
module.exports = (dir) => {
5-
const templates = {}
6-
fs.readdirSync(dir).map(file => {
5+
return fs.readdirSync(dir).reduce((mp, file) => {
76
if (path.extname(file) === '.vue' && file[0] !== '_') {
8-
templates[file.split('.')[0]] = fs.readFileSync(path.join(dir, file), 'utf8')
7+
mp[file.split('.')[0]] = fs.readFileSync(path.join(dir, file), 'utf8')
98
}
10-
})
11-
return templates
9+
return mp
10+
}, {})
1211
}

test/webpack-build.test.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
const Module = require('module')
2+
const test = require('tape')
3+
const chalk = require('chalk')
4+
const clearModule = require('clear-module')
5+
26
const rfp = Module._resolveFilename
37
const mmap = [
48
'webpack', 'vue-loader', 'vue-loader/lib/plugin', 'vue-template-compiler/package.json'
@@ -12,10 +16,9 @@ Module._resolveFilename = function _resolveFilename (req, ...args) {
1216
return rfp.call(this, req, ...args)
1317
}
1418

19+
test.onFinish(() => { Module._resolveFilename = rfp })
20+
1521
const { build, dev } = require('./webpack-test')
16-
const test = require('tape')
17-
const chalk = require('chalk')
18-
const clearModule = require('clear-module')
1922

2023
const has = (flag, result, watch, useVue = true) => {
2124
return new RegExp(`(${useVue ? 'template|' : ''}${watch ? '' : 'script|'}style):${flag}{5,}`).test(result)

0 commit comments

Comments
 (0)