Update cleanup() of script and test.

Author: jdalton

script/clean.js

@@ -9,8 +9,8 @@ const trash = require("./trash.js")
 const rootPath = path.resolve(__dirname, "..")
 const nodeModulesPath = path.resolve(rootPath, "node_modules")
 
-const trashPaths = ignorePaths
-  .filter((thePath) => thePath !== nodeModulesPath)
+const keptPaths = [nodeModulesPath]
+const trashPaths = ignorePaths.filter(isKept)
 
 function cleanEmptyDirs() {
   return Promise
@@ -38,6 +38,10 @@ function isEmpty(dirPath) {
   return ! fs.readdirSync(dirPath).length
 }
 
+function isKept(thePath) {
+  return keptPaths.every((dirname) => ! thePath.startsWith(dirname))
+}
+
 cleanRepo()
   .then(cleanEmptyDirs)
   .then(cleanNodeModules)

script/test.js

@@ -16,30 +16,11 @@ const isWin = process.platform === "win32"
 
 const rootPath = path.resolve(__dirname, "..")
 const testPath = path.resolve(rootPath, "test")
-const buildPath = path.resolve(rootPath, "build")
 const envPath = path.resolve(testPath, "env")
 const esmPath = path.resolve(rootPath, "esm.js")
 const indexPath = path.resolve(rootPath, "index.js")
-const loaderDirPath = path.resolve(rootPath, "esm")
 const mochaPath = path.resolve(rootPath, "node_modules/mocha/bin/_mocha")
 const nodePath = path.resolve(envPath, "prefix", isWin ? "node.exe" : "bin/node")
-const nodeModulesPath = path.resolve(rootPath, "node_modules")
-const vendorPath = path.resolve(rootPath, "src/vendor")
-
-const uglifyOptions = fs.readJSONSync(path.resolve(rootPath, ".uglifyrc"))
-
-const jsPaths = [
-  esmPath,
-  indexPath
-]
-
-const trashPaths = ignorePaths
-  .filter((thePath) =>
-    thePath !== loaderDirPath &&
-    thePath !== nodeModulesPath &&
-    ! thePath.startsWith(buildPath) &&
-    ! thePath.startsWith(vendorPath)
-  )
 
 const NODE_ENV = argv.prod ? "production" : "development"
 const ESM_ENV = NODE_ENV + "-test"
@@ -50,6 +31,19 @@ const NODE_PATH = [
   path.resolve(envPath, "node_path/relative")
 ].join(path.delimiter)
 
+const jsPaths = [
+  esmPath,
+  indexPath
+]
+
+const keptPaths = [
+  path.resolve(rootPath, "build"),
+  path.resolve(rootPath, "esm"),
+  path.resolve(rootPath, "node_modules"),
+  path.resolve(rootPath, "src/vendor"),
+  path.resolve(rootPath, "test/vendor")
+]
+
 const nodeArgs = []
 
 if (process.env.HARMONY) {
@@ -63,6 +57,9 @@ nodeArgs.push(
   "tests.js"
 )
 
+const trashPaths = ignorePaths.filter(isKept)
+const uglifyOptions = fs.readJSONSync(path.resolve(rootPath, ".uglifyrc"))
+
 function cleanJS() {
   jsPaths.forEach((filename) => {
     const content = fs.readFileSync(filename, "utf8")
@@ -77,6 +74,10 @@ function cleanRepo() {
   return Promise.all(trashPaths.map(trash))
 }
 
+function isKept(thePath) {
+  return keptPaths.every((dirname) => ! thePath.startsWith(dirname))
+}
+
 function minifyJS(content) {
   return uglify(content, uglifyOptions).code
 }