codeplay-common 3.1.7 → 3.1.9

package/files/buildCodeplay/{codeplayBeforeBuild-6.0.js → codeplayBeforeBuild-6.1.js}

@@ -327,13 +327,16 @@ checkAppUniqueId();
 
 const jsDir = path.join(__dirname, "..", "src", "js");
 
-// ✅ OLD structure check
+// 🔍 Detect OLD structure
 const oldEditorDirs = fs.readdirSync(jsDir)
   .filter(name => /^editor-\d+\.\d+$/.test(name));
 
-// ✅ NEW structure path
+// 📁 New structure path (optional, not mandatory)
 const newEditorBaseDir = path.join(jsDir, "editor");
 
+// ======================================================
+// ❌ CASE 1: OLD STRUCTURE FOUND → STOP
+// ======================================================
 if (oldEditorDirs.length > 0) {
 
   console.error(`
@@ -342,127 +345,98 @@ if (oldEditorDirs.length > 0) {
 You are using outdated folder structure:
   src/js/editor-x.x/
 
-🚨 This structure is no longer supported.
-
-✅ NEW STRUCTURE REQUIRED:
-  src/js/editor/editor-x.x/
+🚨 This is no longer supported.
 
-📦 Your existing folders:
+📦 Found folders:
 ${oldEditorDirs.map(d => "  - " + d).join("\n")}
 
-👉 Please move them manually like this:
+👉 Please move them manually:
 
   src/js/editor-1.6
-      ⬇ MOVE TO
+      ⬇
   src/js/editor/editor-1.6
 
-⚠️ After moving, re-run the build.
+⚠️ Also ensure:
+  src/js/editor/configuration.json exists
 
-❌ Build stopped to prevent runtime errors.
+❌ Build stopped.
 `);
 
   process.exit(1);
 }
 
-// ✅ Ensure new structure exists
-if (!fs.existsSync(newEditorBaseDir)) {
-
-  console.error(`
-❌ MISSING EDITOR DIRECTORY
-
-Expected path:
-  src/js/editor/
-
-But it was not found.
-
-👉 Please create the folder and move editor-x.x inside it.
-
-Example:
-  src/js/editor/editor-1.6/
-`);
-
-  process.exit(1);
-}
+// ======================================================
+// ✅ CASE 2: NEW STRUCTURE EXISTS → VALIDATE
+// ======================================================
+if (fs.existsSync(newEditorBaseDir)) {
 
+  // 🔍 Find editor-x.x inside new folder
+  const editorDirs = fs.readdirSync(newEditorBaseDir)
+    .filter(name => /^editor-\d+\.\d+$/.test(name));
 
+  // 👉 If editor folder exists but no versions → skip safely
+  if (editorDirs.length === 0) {
+    console.log("ℹ️ No editor-x.x folders found inside src/js/editor/");
+    return;
+  }
 
-// ======================================================
-// Validate editor configuration structure
-// ======================================================
+  // ======================================================
+  // ✅ Validate configuration.json (NEW RULE)
+  // ======================================================
 
-const editorConfigPath = path.join(newEditorBaseDir, "configuration.json");
+  const editorConfigPath = path.join(newEditorBaseDir, "configuration.json");
 
-// ❌ Check if configuration.json exists in correct place
-if (!fs.existsSync(editorConfigPath)) {
-  console.error(`
+  // ❌ Missing config
+  if (!fs.existsSync(editorConfigPath)) {
+    console.error(`
 ❌ MISSING EDITOR CONFIGURATION FILE
 
-Required file not found:
+Required:
   src/js/editor/configuration.json
 
-👉 This file is mandatory in new editor structure.
-
-📦 Please ensure:
-  src/js/editor/configuration.json exists
-
 ❌ Build stopped.
 `);
-  process.exit(1);
-}
-
-// ❌ Check for OLD structure mistake inside version folders
-const invalidConfigLocations = [];
+    process.exit(1);
+  }
 
-const editorSubDirs = fs.readdirSync(newEditorBaseDir)
-  .filter(name => /^editor-\d+\.\d+$/.test(name));
+  // ❌ Check wrong placement
+  const invalidConfigs = [];
 
-editorSubDirs.forEach(dir => {
-  const wrongPath = path.join(newEditorBaseDir, dir, "configuration.json");
+  editorDirs.forEach(dir => {
+    const wrongPath = path.join(newEditorBaseDir, dir, "configuration.json");
+    if (fs.existsSync(wrongPath)) {
+      invalidConfigs.push(`src/js/editor/${dir}/configuration.json`);
+    }
+  });
 
-  if (fs.existsSync(wrongPath)) {
-    invalidConfigLocations.push(`src/js/editor/${dir}/configuration.json`);
-  }
-});
-
-if (invalidConfigLocations.length > 0) {
-  console.error(`
-❌ INVALID EDITOR CONFIGURATION STRUCTURE DETECTED
+  if (invalidConfigs.length > 0) {
+    console.error(`
+❌ INVALID CONFIGURATION LOCATION
 
 🚫 configuration.json must NOT be inside version folders.
 
-Found invalid files:
-${invalidConfigLocations.map(p => "  - " + p).join("\n")}
+Found:
+${invalidConfigs.map(p => "  - " + p).join("\n")}
 
-✅ Correct structure:
+✅ Correct:
   src/js/editor/configuration.json
 
-👉 Please MOVE or DELETE the above files.
-
 ❌ Build stopped.
 `);
-  process.exit(1);
-}
-
-console.log("✅ Editor configuration structure validated.");
-
+    process.exit(1);
+  }
 
+  console.log("✅ Editor structure validated.");
 
+  // ======================================================
+  // 🚀 Continue execution (run.js)
+  // ======================================================
 
-// ✅ Now use new structure
-const editorDirs = fs.readdirSync(newEditorBaseDir)
-  .filter(name => /^editor-\d+\.\d+$/.test(name))
-  .sort((a, b) => {
-    const getVersion = str => str.match(/(\d+)\.(\d+)/).slice(1).map(Number);
-    const [aMajor, aMinor] = getVersion(a);
-    const [bMajor, bMinor] = getVersion(b);
-    return bMajor - aMajor || bMinor - aMinor;
-  });
-
-if (editorDirs.length === 0) {
-  console.log("@Codemirror editor(s) not found inside src/js/editor/");
-} else {
-
-  const latestEditorDir = editorDirs[0];
+  const latestEditorDir = editorDirs.sort((a, b) => {
+    const vA = parseFloat(a.split('-')[1]);
+    const vB = parseFloat(b.split('-')[1]);
+    return vB - vA;
+  })[0];
 
   const runJsPath = path.join(newEditorBaseDir, latestEditorDir, "run.js");
 
@@ -475,6 +449,13 @@ if (editorDirs.length === 0) {
   execSync(`node "${runJsPath}"`, { stdio: "inherit" });
 }
 
+// ======================================================
+// ✅ CASE 3: NOTHING EXISTS → DO NOTHING
+// ======================================================
+else {
+  console.log("ℹ️ Editor not used in this project. Skipping...");
+}
+
 //@Codemirror check and install/uninstall the packages END
 
 
@@ -2136,6 +2117,113 @@ validateAndRestoreSignDetails()
 
 execSync('node buildCodeplay/fix-onesignal-plugin.js', { stdio: 'inherit' });
 
+
+
+
+
+
+
+//##################################  SystemBars.java update for "@capacitor/android": "^8.3.0" plugin START ###############################
+
+
+const filePath = path.join(
+  __dirname,
+  "../node_modules/@capacitor/android/capacitor/src/main/java/com/getcapacitor/plugin/SystemBars.java"
+);
+
+// 🔍 OLD BLOCK (anchor)
+const OLD_BLOCK = `if (shouldPassthroughInsets) {
+                // We need to correct for a possible shown IME
+                v.setPadding(0, 0, 0, keyboardVisible ? imeInsets.bottom : 0);
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && hasViewportCover && insetHandlingEnabled) {
+                    Insets safeAreaInsets = calcSafeAreaInsets(insets);
+                    injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
+                }
+
+                return new WindowInsetsCompat.Builder(insets)
+                    .setInsets(
+                        WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout(),
+                        Insets.of(
+                            systemBarsInsets.left,
+                            systemBarsInsets.top,
+                            systemBarsInsets.right,
+                            getBottomInset(systemBarsInsets, keyboardVisible)
+                        )
+                    )
+                    .build();
+            }`;
+
+// ✅ NEW BLOCK
+const NEW_BLOCK = `if (shouldPassthroughInsets) {
+    /* 🔴 ORIGINAL CODE (COMMENTED FOR SAFETY)
+${OLD_BLOCK.split("\n").map(line => "    " + line).join("\n")}
+    */
+
+    // ✅ NEW LOGIC (CUSTOM FIX)
+    v.setPadding(0, 0, 0, 0);
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && hasViewportCover && insetHandlingEnabled) {
+        Insets safeAreaInsets = calcSafeAreaInsets(insets);
+        injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
+    }
+
+    return insets; // WebView handles everything
+}`;
+
+// 🚨 ERROR MESSAGE
+const ERROR_MSG = `
+❌ Capacitor SystemBars.java structure changed!
+
+Plugin: @capacitor/android
+
+👉 Expected code block not found.
+
+This usually means Capacitor updated internally.
+
+Please:
+1. Open SystemBars.java
+2. Update patch script
+3. Re-run build
+
+⛔ Build stopped.
+`;
+
+function patchFile() {
+  if (!fs.existsSync(filePath)) {
+    console.error("❌ SystemBars.java not found!");
+    process.exit(1);
+  }
+
+  let content = fs.readFileSync(filePath, "utf8");
+
+  // ✅ Already patched?
+  if (content.includes("🔴 ORIGINAL CODE (COMMENTED FOR SAFETY)")) {
+    console.log("✅ Already SystemBars.java patched. Skipping...");
+    return;
+  }
+
+  // 🔍 Check old block exists
+  if (!content.includes(OLD_BLOCK)) {
+    console.error(ERROR_MSG);
+    process.exit(1);
+  }
+
+  // 🔁 Replace
+  const updated = content.replace(OLD_BLOCK, NEW_BLOCK);
+
+  fs.writeFileSync(filePath, updated, "utf8");
+
+  console.log("✅ SystemBars.java patched (comment + new logic)!");
+}
+
+patchFile();
+
+//##################################  SystemBars.java update for "@capacitor/android": "^8.3.0" plugin END ###############################
+
+
+
+
 /*
 Release Notes