codeplay-common 3.2.14 → 3.2.16

package/files/buildCodeplay/codeplayBeforeBuild-6.1.js

@@ -635,12 +635,17 @@ const SKIP_FILES = [
   ,'index.browser.js'
 ];
 
-const STATUSBAR_FILE = path.resolve(__dirname, '../src/js/common-configuration.js');
 
-// Match StatusBar.setStyle (ignore comments)
+
+const STATUSBAR_FILE = path.resolve(__dirname, '../src/js/common-configuration.js');
 const STATUSBAR_REGEX = /^(?!\s*\/\/).*Capacitor\.Plugins\.StatusBar\.setStyle/m;
 
 
+const ONESIGNAL_OLD_FILES = [
+  path.resolve(__dirname, '../src/js/onesignal-settings.js')
+];
+const ONESIGNAL_VERSION_REGEX = /^onesignal-\d+(\.\d+)*\.js$/;
+
 function scanDirectory(dir) {
 
 /*
@@ -656,11 +661,43 @@ function scanDirectory(dir) {
   if (stat.isFile()) {
 
 
+
+    const baseName = path.basename(dir);
+
+    const JS_ROOT = path.resolve(__dirname, '../src/js');
+    const ONESIGNAL_DIR = path.join(JS_ROOT, 'onesignal');
+
+    // 🚨 Block old OneSignal file locations (ONLY in src/js root)
+    if (path.dirname(dir) === JS_ROOT) {
+
+      // ❌ onesignal-settings.js
+      if (ONESIGNAL_OLD_FILES.includes(dir)) {
+        console.error(`\n❌ ERROR: onesignal-settings.js should not be in src/js/`);
+        console.error(`📁 Move it to: src/js/onesignal/`);
+        console.error(`📄 File: ${dir}\n`);
+        process.exit(1);
+      }
+
+      // ❌ onesignal-x.x.js
+      if (ONESIGNAL_VERSION_REGEX.test(baseName)) {
+        console.error(`\n❌ ERROR: ${baseName} should not be in src/js/`);
+        console.error(`📁 Move it to: src/js/onesignal/`);
+        console.error(`📄 File: ${dir}\n`);
+        process.exit(1);
+      }
+    } 
+
     // 🚨 Special check ONLY for common-configuration.js
     if (dir === STATUSBAR_FILE) {
-      const content = fs.readFileSync(dir, 'utf8');
+      let content = fs.readFileSync(dir, 'utf8');
+
+      // 🧹 Remove ALL comments (single-line + multi-line)
+      const contentWithoutComments = content
+        .replace(/\/\/.*$/gm, '')          // remove // comments
+        .replace(/\/\*[\s\S]*?\*\//g, ''); // remove /* */ comments
 
-      if (STATUSBAR_REGEX.test(content)) {
+      // ✅ Now check only real code
+      if (contentWithoutComments.includes('Capacitor.Plugins.StatusBar.setStyle')) {
         console.error(`\n❌ ERROR: StatusBar.setStyle should NOT be used in common-configuration.js`);
         console.error(`🚫 iOS status bar is controlled via other methods. Remove this line.`);
         console.error(`📄 File: ${dir}\n`);
@@ -669,7 +706,7 @@ function scanDirectory(dir) {
     }
 
     // 🔥 Skip files in SKIP_FILES array
-    const baseName = path.basename(dir);
+
     if (SKIP_FILES.includes(baseName)) {
       // Just skip silently
       return;

package/files/buildCodeplay/newly added.txt

@@ -25,15 +25,53 @@ Note: This changes are added with my old(current) code. Might we need to integra
 2) Statusbar color set in app startup is checked and through erro
 
     const STATUSBAR_FILE = path.resolve(__dirname, '../src/js/common-configuration.js');
-
-    // Match StatusBar.setStyle (ignore comments)
     const STATUSBAR_REGEX = /^(?!\s*\/\/).*Capacitor\.Plugins\.StatusBar\.setStyle/m;
+
+
+    const ONESIGNAL_OLD_FILES = [
+    path.resolve(__dirname, '../src/js/onesignal-settings.js')
+    ];
+    const ONESIGNAL_VERSION_REGEX = /^onesignal-\d+(\.\d+)*\.js$/;
+    
     ....
     ....
+    ....
+
+
+    const JS_ROOT = path.resolve(__dirname, '../src/js');
+    const ONESIGNAL_DIR = path.join(JS_ROOT, 'onesignal');
+
+    // 🚨 Block old OneSignal file locations (ONLY in src/js root)
+    if (path.dirname(dir) === JS_ROOT) {
+
+      // ❌ onesignal-settings.js
+      if (ONESIGNAL_OLD_FILES.includes(dir)) {
+        console.error(`\n❌ ERROR: onesignal-settings.js should not be in src/js/`);
+        console.error(`📁 Move it to: src/js/onesignal/`);
+        console.error(`📄 File: ${dir}\n`);
+        process.exit(1);
+      }
+
+      // ❌ onesignal-x.x.js
+      if (ONESIGNAL_VERSION_REGEX.test(baseName)) {
+        console.error(`\n❌ ERROR: ${baseName} should not be in src/js/`);
+        console.error(`📁 Move it to: src/js/onesignal/`);
+        console.error(`📄 File: ${dir}\n`);
+        process.exit(1);
+      }
+    } 
+
+    // 🚨 Special check ONLY for common-configuration.js
     if (dir === STATUSBAR_FILE) {
-      const content = fs.readFileSync(dir, 'utf8');
+      let content = fs.readFileSync(dir, 'utf8');
+
+      // 🧹 Remove ALL comments (single-line + multi-line)
+      const contentWithoutComments = content
+        .replace(/\/\/.*$/gm, '')          // remove // comments
+        .replace(/\/\*[\s\S]*?\*\//g, ''); // remove /* */ comments
 
-      if (STATUSBAR_REGEX.test(content)) {
+      // ✅ Now check only real code
+      if (contentWithoutComments.includes('Capacitor.Plugins.StatusBar.setStyle')) {
         console.error(`\n❌ ERROR: StatusBar.setStyle should NOT be used in common-configuration.js`);
         console.error(`🚫 iOS status bar is controlled via other methods. Remove this line.`);
         console.error(`📄 File: ${dir}\n`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeplay-common",
-  "version": "3.2.14",
+  "version": "3.2.16",
   "description": "Common build scripts and files",
   "scripts": {
 	"postinstall": "node scripts/sync-files.js",