@fontoxml/fontoxml-development-tools 3.10.0-beta.1 → 3.10.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
 	"name": "@fontoxml/fontoxml-development-tools",
-	"version": "3.10.0-beta.1",
+	"version": "3.10.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@fontoxml/fontoxml-development-tools",
-			"version": "3.10.0-beta.1",
+			"version": "3.10.0",
 			"license": "MIT",
 			"dependencies": {
 				"@babel/core": "7.14.6",

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@fontoxml/fontoxml-development-tools",
 	"description": "Development tools for Fonto.",
-	"version": "3.10.0-beta.1",
+	"version": "3.10.0",
 	"author": "The Fonto Team",
 	"license": "MIT",
 	"keywords": [

package/src/modules/editor/src/webpackPlugins/CopyPlugin.js

@@ -8,8 +8,6 @@ import webpack from 'webpack';
 
 import normalisePath from '../helpers/normalisePath.js';
 
-const emittedAssets = new Map();
-
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
@@ -26,12 +24,14 @@ export default class CopyPlugin {
 	 * @param {Compiler} compiler
 	 */
 	apply(compiler) {
+		const emittedAssets = new Map();
+
 		let packageInfos;
 
 		compiler.hooks.thisCompilation.tap(CopyPlugin.name, (compilation) => {
-			compilation.hooks.additionalAssets.tapAsync(
+			compilation.hooks.additionalAssets.tapPromise(
 				CopyPlugin.name,
-				async (callback) => {
+				async () => {
 					if (
 						compilation.packagesInfoInLoadOrderError ||
 						!compilation.packagesInfoInLoadOrder
@@ -43,7 +43,7 @@ export default class CopyPlugin {
 							);
 						packageInfos = error.packageInfos || [];
 						compilation.errors.push(error);
-						return callback();
+						return;
 					}
 
 					const templatesPath = normalisePath(
@@ -207,77 +207,64 @@ export default class CopyPlugin {
 							}
 						)
 					);
-
-					return callback();
 				}
 			);
+		});
 
-			compiler.hooks.afterEmit.tapAsync(
-				CopyPlugin.name,
-				async (compilation, callback) => {
-					await Promise.all(
-						packageInfos.map(async (packageInfo) => {
-							const packagePath = path.normalize(
-								packageInfo.path
-							);
+		compiler.hooks.afterEmit.tapPromise(
+			CopyPlugin.name,
+			async (compilation) => {
+				await Promise.all(
+					packageInfos.map(async (packageInfo) => {
+						const packagePath = path.normalize(packageInfo.path);
 
-							if (
-								packagePath ===
-								path.join(
-									this.options.platformFolder,
-									packageInfo.name
-								)
-							) {
-								return;
-							}
+						if (
+							packagePath ===
+							path.join(
+								this.options.platformFolder,
+								packageInfo.name
+							)
+						) {
+							return;
+						}
+
+						if (packageInfo.name === 'config') {
+							compilation.contextDependencies.add(packagePath);
+						} else {
+							const srcFolderPath = path.join(packagePath, 'src');
+							const hasSrcFolder = await fs.pathExists(
+								srcFolderPath
+							);
 
-							if (packageInfo.name === 'config') {
+							if (hasSrcFolder) {
 								compilation.contextDependencies.add(
-									packagePath
+									srcFolderPath
 								);
 							} else {
-								const srcFolderPath = path.join(
-									packagePath,
-									'src'
-								);
-								const hasSrcFolder = await fs.pathExists(
+								compilation.missingDependencies.add(
 									srcFolderPath
 								);
-
-								if (hasSrcFolder) {
-									compilation.contextDependencies.add(
-										srcFolderPath
-									);
-								} else {
-									compilation.missingDependencies.add(
-										srcFolderPath
-									);
-								}
 							}
+						}
 
-							const fontoManifestPath = path.join(
-								packagePath,
-								'fonto-manifest.json'
-							);
-							const hasManifest = await fs.pathExists(
+						const fontoManifestPath = path.join(
+							packagePath,
+							'fonto-manifest.json'
+						);
+						const hasManifest = await fs.pathExists(
+							fontoManifestPath
+						);
+
+						if (hasManifest) {
+							compilation.fileDependencies.add(fontoManifestPath);
+						} else {
+							compilation.missingDependencies.add(
 								fontoManifestPath
 							);
-
-							if (hasManifest) {
-								compilation.fileDependencies.add(
-									fontoManifestPath
-								);
-							} else {
-								compilation.missingDependencies.add(
-									fontoManifestPath
-								);
-							}
-						})
-					);
-
-					return callback();
-				}
-			);
-		});
+						}
+					})
+				);
+			}
+		);
 	}
 }