Merge branch 'feature/extensibility-v2' into feature/@W-18895152@/update-next-with-v4

Author: bfeister

packages/pwa-kit-create-app/scripts/create-mobify-app.js

@@ -886,8 +886,9 @@ const main = async (opts) => {
         process.exit(1)
     }
 
-    if (presetId && !context.preset) {
-        context.preset = PRESETS.find(({id}) => id === presetId)
+    // If no preset is provided, use the first preset or the preset specified by the GENERATOR_PRESET environment variable
+    if (!context.preset) {
+        context.preset = presetId ? PRESETS.find(({id}) => id === presetId) : PRESETS[0]
     }
 
     const {interactive = false, getQuestions, answers = {}} = context.preset

packages/pwa-kit-create-app/scripts/trim-extensions.js

@@ -210,17 +210,19 @@ function processFile(filePath, plugins) {
 
     // Only write output if we made changes
     if (modified) {
-        // Generate code from modified AST
-        const output = generate(ast, {
-            retainLines: true,
-            compact: false
-        }).code
-
-        // console.log(JSON.stringify(output.split('\n').slice(0, 100), null, 2));
-
-        // Replace the original file with the trimmed version
-        fs.writeFileSync(filePath, output)
-        console.log(`Updated file ${filePath}`)
+        try {
+            // Generate code from modified AST
+            const output = generate(ast, {
+                retainLines: true,
+                compact: false
+            }).code
+            // Replace the original file with the trimmed version
+            fs.writeFileSync(filePath, output)
+            console.log(`Updated file ${filePath}`)
+        } catch (e) {
+            console.error(`Error updating file ${filePath}: ${e.message}`)
+            throw e
+        }
     }
 }