Adjust to the new API of core

Author: moonglum

index.js

@@ -5,23 +5,12 @@ let FileFinder = require("faucet-pipeline-core/lib/util/files/finder");
 let readFile = promisify(require("fs").readFile);
 let stat = promisify(require("fs").stat);
 
-module.exports = (pluginConfig, assetManager, { watcher }) => {
-	let copyAll = buildCopyAll(pluginConfig, assetManager);
-
-	// Run once for all files
-	copyAll();
-
-	if(watcher) {
-		watcher.on("edit", copyAll);
-	}
-};
-
-function buildCopyAll(copyConfigs, assetManager) {
-	let copiers = copyConfigs.map(copyConfig =>
+module.exports = (pluginConfig, assetManager) => {
+	let copiers = pluginConfig.map(copyConfig =>
 		buildCopier(copyConfig, assetManager));
 
-	return files => copiers.forEach(copier => copier(files));
-}
+	return files => Promise.all(copiers.map(copier => copier(files)));
+};
 
 function buildCopier(copyConfig, assetManager) {
 	let source = assetManager.resolvePath(copyConfig.source);
@@ -32,11 +21,10 @@ function buildCopier(copyConfig, assetManager) {
 		skipDotfiles: true,
 		filter: copyConfig.filter
 	});
-
 	let { fingerprint } = copyConfig;
 
 	return files => {
-		Promise.all([
+		return Promise.all([
 			(files ? fileFinder.match(files) : fileFinder.all()),
 			determineTargetDir(source, target)
 		]).then(([fileNames, targetDir]) => {

package.json

@@ -19,7 +19,7 @@
 	},
 	"homepage": "http://www.faucet-pipeline.org",
 	"dependencies": {
-		"faucet-pipeline-core": "~1.0.0-rc.10"
+		"faucet-pipeline-core": "^1.0.0-rc.11"
 	},
 	"devDependencies": {
 		"eslint-config-fnd": "^1.6.0",

test/test_basic/faucet.config.js

@@ -7,6 +7,9 @@ module.exports = {
 		target: "./dist"
 	}],
 	plugins: {
-		"static": path.resolve("../..")
+		"static": {
+			plugin: path.resolve("../.."),
+			bucket: "static"
+		}
 	}
 };

test/test_fingerprint/faucet.config.js

@@ -10,6 +10,9 @@ module.exports = {
 		target: "./dist/manifest.json"
 	},
 	plugins: {
-		"static": path.resolve("../..")
+		"static": {
+			plugin: path.resolve("../.."),
+			bucket: "static"
+		}
 	}
 };

test/test_key_config/faucet.config.js

@@ -11,6 +11,9 @@ module.exports = {
 		key: (f, targetDir) => path.relative(targetDir, f)
 	},
 	plugins: {
-		"static": path.resolve("../..")
+		"static": {
+			plugin: path.resolve("../.."),
+			bucket: "static"
+		}
 	}
 };

test/test_key_for_single_file/faucet.config.js

@@ -11,6 +11,9 @@ module.exports = {
 		key: (f, targetDir) => path.relative(targetDir, f)
 	},
 	plugins: {
-		"static": path.resolve("../..")
+		"static": {
+			plugin: path.resolve("../.."),
+			bucket: "static"
+		}
 	}
 };

test/test_manifest_base_uri/faucet.config.js

@@ -11,6 +11,9 @@ module.exports = {
 		value: f => `/assets/${path.relative("./dist", f)}`
 	},
 	plugins: {
-		"static": path.resolve("../..")
+		"static": {
+			plugin: path.resolve("../.."),
+			bucket: "static"
+		}
 	}
 };

test/test_match_dirname/faucet.config.js

@@ -8,6 +8,9 @@ module.exports = {
 		filter: path => path.startsWith("inner/")
 	}],
 	plugins: {
-		"static": path.resolve("../..")
+		"static": {
+			plugin: path.resolve("../.."),
+			bucket: "static"
+		}
 	}
 };

test/test_match_extension/faucet.config.js

@@ -8,6 +8,9 @@ module.exports = {
 		filter: path => path.endsWith(".txt")
 	}],
 	plugins: {
-		"static": path.resolve("../..")
+		"static": {
+			plugin: path.resolve("../.."),
+			bucket: "static"
+		}
 	}
 };

test/test_match_multiple/faucet.config.js

@@ -8,6 +8,9 @@ module.exports = {
 		filter: path => path.endsWith(".txt") && !path.startsWith("inner/")
 	}],
 	plugins: {
-		"static": path.resolve("../..")
+		"static": {
+			plugin: path.resolve("../.."),
+			bucket: "static"
+		}
 	}
 };