@fontoxml/fontoxml-development-tools 3.9.0-beta.7 → 3.10.0-beta.2

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
 	"name": "@fontoxml/fontoxml-development-tools",
-	"version": "3.9.0-beta.7",
+	"version": "3.10.0-beta.2",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@fontoxml/fontoxml-development-tools",
-			"version": "3.9.0-beta.7",
+			"version": "3.10.0-beta.2",
 			"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.9.0-beta.7",
+	"version": "3.10.0-beta.2",
 	"author": "The Fonto Team",
 	"license": "MIT",
 	"keywords": [

package/src/modules/editor/dev-cms/connectors-cms-standard/configureDevelopmentCmsMiddleware.js

@@ -1,3 +1,4 @@
+import correlationIdRepository from './correlationIdRepository.js';
 import DevelopmentCms from './stores/DevelopmentCms.js';
 
 export default function (config) {
@@ -6,6 +7,10 @@ export default function (config) {
 	return (req, _res, next) => {
 		req.cms = cms;
 
+		req.repositories = {
+			correlationId: correlationIdRepository,
+		};
+
 		next();
 	};
 }

package/src/modules/editor/src/getPatternsForSpecialFileType.js

@@ -16,7 +16,7 @@ export default function getPatternsForSpecialFileType(type) {
 			return ['src/*.@(js|jsx|ts|tsx)', '!src/*.d.ts'];
 		case 'unitTestSpecs':
 			return ['test/**/*.tests.@(js|ts)'];
-		case 'unitTestUseConfigurationManager':
+		case 'unitTestConfigurationManager':
 			return [];
 		default:
 			throw new Error(`Unsupported special file type "${type}".`);

package/src/modules/editor/src/getWebpackConfig.js

@@ -109,23 +109,23 @@ export default function getWebpackConfig(appConfig, appManifest, options) {
 							!regExps.json.test(resource)),
 					type: 'asset/source',
 				},
-				{
-					test: (resource) =>
-						regExps.platform.test(resource) &&
-						!regExps.platformVendors.test(resource) &&
-						!regExps.assets.test(resource) &&
-						regExps.code.test(resource),
-					use: [
-						{
-							loader: paths.platformSourceMapLoader,
-							options: {
-								platformFolder: paths.platformFolder,
-								platformSourceMapFile:
-									paths.platformSourceMapFile,
-							},
-						},
-					],
-				},
+				// {
+				// 	test: (resource) =>
+				// 		regExps.platform.test(resource) &&
+				// 		!regExps.platformVendors.test(resource) &&
+				// 		!regExps.assets.test(resource) &&
+				// 		regExps.code.test(resource),
+				// 	use: [
+				// 		{
+				// 			loader: paths.platformSourceMapLoader,
+				// 			options: {
+				// 				platformFolder: paths.platformFolder,
+				// 				platformSourceMapFile:
+				// 					paths.platformSourceMapFile,
+				// 			},
+				// 		},
+				// 	],
+				// },
 				{
 					test: (resource) =>
 						regExps.platformLinkedVendors.test(resource) &&

package/src/modules/editor/src/helpers/getNamesAndPaths.js

@@ -113,7 +113,7 @@ export default function getNamesAndPaths(appConfig, options) {
 		platformSourceMapLoader: path.posix.join(
 			srcFolder,
 			'webpackLoaders',
-			'vendorsSourceMapLoader.cjs'
+			'platformSourceMapLoader.cjs'
 		),
 		srcFolder,
 		symbolLoader: path.posix.join(
@@ -129,7 +129,7 @@ export default function getNamesAndPaths(appConfig, options) {
 		vendorsSourceMapLoader: path.posix.join(
 			srcFolder,
 			'webpackLoaders',
-			'platformSourceMapLoader.cjs'
+			'vendorsSourceMapLoader.cjs'
 		),
 	};
 	paths.generatedFile = path.posix.join(paths.templatesFolder, 'generated');

package/src/modules/editor/src/webpackLoaders/generatedLoader.cjs

@@ -311,7 +311,7 @@ async function handleUnitTest({
 		code = statements
 			.map((statement) => `import '${statement.path}';`)
 			.join('\n');
-	} else if (type === 'unitTestUseConfigurationManager') {
+	} else if (type === 'unitTestConfigurationManager') {
 		// packagesInfoInLoadOrder is filtered for the unit test types, so get them all again.
 		const allPackagesInfoInLoadOrder =
 			loaderContext._compilation.packagesInfoInLoadOrder;
@@ -323,7 +323,9 @@ async function handleUnitTest({
 			);
 
 		const useConfigurationManager = !!dependsOnFontoxmlConfigurationPackage;
-		code = `export default ${useConfigurationManager};`;
+		code = useConfigurationManager
+			? `export { default } from 'fontoxml-configuration/src/configurationManager';`
+			: `export default null;`;
 	}
 
 	code = code.trim();
@@ -386,7 +388,7 @@ module.exports = async function generatedLoader(input, inputMap) {
 		case 'unitTestConfiguration':
 		case 'unitTestSmokeTest':
 		case 'unitTestSpecs':
-		case 'unitTestUseConfigurationManager':
+		case 'unitTestConfigurationManager':
 			return handleUnitTest(handlerOptions);
 		case 'versionInfo':
 			return handleVersionInfo(handlerOptions);

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();
-				}
-			);
-		});
+						}
+					})
+				);
+			}
+		);
 	}
 }