@merkur/integration 0.35.0 → 0.35.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/integration",
-  "version": "0.35.0",
+  "version": "0.35.3",
   "description": "Merkur module for easy integration with other apps.",
   "main": "lib/index",
   "module": "lib/index",
@@ -54,5 +54,5 @@
   "peerDependencies": {
     "@merkur/core": "*"
   },
-  "gitHead": "383f29bdf67a7f4252876867687371a8d26f53f2"
+  "gitHead": "6b65a5581c1c32a14479c3bb4702c394592d0a20"
 }

package/server/index.js

@@ -22,21 +22,34 @@ async function processAssetInFolder({
   fileName,
   staticFolder,
   staticBaseUrl,
+  cliConfig,
 }) {
   if (!asset.name || !fileName || typeof asset.source === 'string') {
     return asset;
   }
 
   if (asset.type.includes('inline')) {
-    asset.source = await fsp.readFile(
-      path.join(staticFolder, folder, fileName),
-      { encoding: 'utf-8' },
-    );
+    try {
+      asset.source = await fsp.readFile(
+        path.join(staticFolder, folder, fileName),
+        { encoding: 'utf-8' },
+      );
+    } catch (error) {
+      // TODO remove (process.env.NODE_ENV !== 'development' && !cliConfig)
+      if (
+        (process.env.NODE_ENV !== 'development' && !cliConfig) ||
+        (cliConfig?.writeToDisk && cliConfig?.command !== 'dev')
+      ) {
+        throw error;
+      }
+    }
 
-    return asset;
+    if (asset.source) {
+      return asset;
+    }
   }
 
-  if (asset.type === 'stylesheet') {
+  if (asset.type === 'stylesheet' || asset.type === 'inlineStyle') {
     asset.source = `${staticBaseUrl}/${folder}/${fileName}`;
 
     return asset;
@@ -48,11 +61,25 @@ async function processAssetInFolder({
   return asset;
 }
 
-async function createAssets({ assets, staticFolder, folders, staticBaseUrl }) {
+// TODO remove folders
+async function createAssets({
+  assets,
+  staticFolder,
+  staticBaseUrl,
+  folders,
+  cliConfig,
+  merkurConfig,
+}) {
   if (staticBaseUrl.endsWith('/')) {
     staticBaseUrl = staticBaseUrl.slice(0, -1);
   }
 
+  folders =
+    folders ||
+    Object.values(merkurConfig?.task)
+      .filter((task) => task.build.platform !== 'node')
+      .map((task) => task.name);
+
   const processedAssets = await folders.reduce(
     async (assets, folder) => {
       assets = await assets;
@@ -73,6 +100,8 @@ async function createAssets({ assets, staticFolder, folders, staticBaseUrl }) {
               fileName: manifest[asset.name],
               staticBaseUrl,
               staticFolder,
+              cliConfig,
+              merkurConfig,
             }),
           ),
         );
@@ -119,7 +148,6 @@ function deleteCache(modulePath, force = false) {
     });
   }
 }
-
 function searchCache(moduleName, callback) {
   if (moduleName && require.cache[moduleName] !== undefined) {
     const module = require.cache[moduleName];
@@ -147,7 +175,6 @@ function traverse(module, callback) {
 const memoPathResolve = memo(path.resolve);
 function requireUncached(module, options = {}) {
   const modulePath = memoPathResolve(module);
-
   if (process.env.NODE_WATCH === 'true') {
     if (options.optional && modulePath && !getFileStats(modulePath)) {
       return;