Merge pull request #59 from sitegeist/task/cleanupJsAndCssArtefacts

Task/cleanup js and css artefacts

Author: mficzel

DistributionPackages/Vendor.Site/Build/JavaScript/fusion-loader.js

@@ -21,10 +21,18 @@ module.exports = function (fusionSource) {
 			exportStatements.push('export {styles};');
 		}
 
+		if (!fs.existsSync(`${basePath}.css`) && fs.existsSync(`${basePath}.css.fusion`)) {
+			fs.unlinkSync(`${basePath}.css.fusion`);
+		}
+
 		if (fs.existsSync(`${basePath}.js`)) {
 			throw new Error(`Do not use JS files for components. Please create a "${path.basename(basePath)}.ts" instead.`);
 		}
 
+		if (!fs.existsSync(`${basePath}.ts`) && !fs.existsSync(`${basePath}.js`) && fs.existsSync(`${basePath}.js.fusion`)) {
+			fs.unlinkSync(`${basePath}.js.fusion`);
+		}
+
 		if (fs.existsSync(`${basePath}.ts`)) {
 			importStatements.push(`import script from '${basePath}.ts';`);
 			exportStatements.push('export {script};');

DistributionPackages/Vendor.Site/Resources/Private/Fusion/Root.ts

@@ -18,7 +18,11 @@ export default function main(components: ComponentsDefinition) {
 		if (componentName in components) {
 			const {script, prototypeName, styles} = components[componentName];
 
-			script(el, {prototypeName, styles});
+			if (script) {
+				script(el, {prototypeName, styles});
+				return;
+			}
+
 			return;
 		}
 

Makefile

@@ -77,9 +77,14 @@ install::
 flush::
 	@ddev composer flush
 
+remove-artefacts:
+	@ddev exec find ./DistributionPackages/ -type f -name '*.js.fusion' -delete
+	@ddev exec find ./DistributionPackages/ -type f -name '*.css.fusion' -delete
+
 cleanup::
 	@ddev composer cleanup:php
 	@ddev yarn cleanup:node
+	@$(MAKE) -s remove-artefacts
 
 ###############################################################################
 #                                LINTING & QA                                 #