vxrn 1.1.490 → 1.1.491

package/dist/utils/patches.js

@@ -20,8 +20,14 @@ function bailIfExists(haystack, needle) {
 async function applyBuiltInPatches(options, extraPatches) {
   const all = [...depPatches];
   if (extraPatches)
-    for (const key in extraPatches)
-      all.push({ module: key, patchFiles: extraPatches[key] });
+    for (const key in extraPatches) {
+      const extraPatchFiles = extraPatches[key], existing = all.find((x) => x.module === key);
+      if (existing)
+        for (const patchKey in extraPatchFiles)
+          existing.patchFiles[patchKey] && console.warn("Warning: Overwriting One built-in patch with user patch", key, patchKey), existing.patchFiles[patchKey] = extraPatchFiles[patchKey];
+      else
+        all.push({ module: key, patchFiles: extraPatchFiles });
+    }
   await applyDependencyPatches(all, { root: options.root });
 }
 async function applyOptimizePatches(patches, config) {
@@ -72,7 +78,7 @@ async function applyDependencyPatches(patches, { root = process.cwd() } = {}) {
                     contentsIn = existingPatch;
                   }
                   const write = async (contents) => {
-                    await Promise.all([
+                    contentsIn = contents, await Promise.all([
                       FSExtra.writeFile(ogFile, contentsIn),
                       FSExtra.writeFile(fullPath, contents)
                     ]), hasLogged || (hasLogged = !0, console.info(` \u{1FA79} Patching ${patch.module}`)), process.env.DEBUG && console.info(`  - Applied patch to ${patch.module}: ${relativePath}`);

package/dist/utils/patches.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/utils/patches.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/utils/patches.mjs

@@ -16,10 +16,14 @@ function bailIfExists(haystack, needle) {
 }
 async function applyBuiltInPatches(options, extraPatches) {
   const all = [...depPatches];
-  if (extraPatches) for (const key in extraPatches) all.push({
-    module: key,
-    patchFiles: extraPatches[key]
-  });
+  if (extraPatches) for (const key in extraPatches) {
+    const extraPatchFiles = extraPatches[key],
+      existing = all.find(x => x.module === key);
+    if (existing) for (const patchKey in extraPatchFiles) existing.patchFiles[patchKey] && console.warn("Warning: Overwriting One built-in patch with user patch", key, patchKey), existing.patchFiles[patchKey] = extraPatchFiles[patchKey];else all.push({
+      module: key,
+      patchFiles: extraPatchFiles
+    });
+  }
   await applyDependencyPatches(all, {
     root: options.root
   });
@@ -74,7 +78,7 @@ async function applyDependencyPatches(patches, {
                 contentsIn = existingPatch;
               }
               const write = async contents => {
-                  await Promise.all([FSExtra.writeFile(ogFile, contentsIn), FSExtra.writeFile(fullPath, contents)]), hasLogged || (hasLogged = !0, console.info(` \u{1FA79} Patching ${patch.module}`)), process.env.DEBUG && console.info(`  - Applied patch to ${patch.module}: ${relativePath}`);
+                  contentsIn = contents, await Promise.all([FSExtra.writeFile(ogFile, contentsIn), FSExtra.writeFile(fullPath, contents)]), hasLogged || (hasLogged = !0, console.info(` \u{1FA79} Patching ${patch.module}`)), process.env.DEBUG && console.info(`  - Applied patch to ${patch.module}: ${relativePath}`);
                 },
                 patchDefinition = patch.patchFiles[file];
               if (typeof patchDefinition == "string") {

package/dist/utils/patches.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["transformFlow","transformSWC","findNodeModules","FSExtra","join","semver","depPatches","globDir","deepMergeOptimizeDeps","Bail","Error","bailIfUnchanged","obj1","obj2","JSON","stringify","bailIfExists","haystack","needle","includes","applyBuiltInPatches","options","extraPatches","all","key","push","module","patchFiles","applyDependencyPatches","root","applyOptimizePatches","patches","config","optimizeDeps","include","exclude","needsInterop","forEach","patch","optimize","filter","x","ssr","process","cwd","nodeModulesDirs","map","relativePath","Promise","flatMap","dir","nodeModuleDir","version","hasLogged","existsSync","pkgJSON","readJSON","satisfies","file","filesToApply","fullPath","ogFile","existingPatch","readFile","err","console","warn","contentsIn","env","VXRN_FORCE_PATCH","write","contents","writeFile","info","DEBUG","patchDefinition","Array","isArray","strategy","mode","environment","forceJSX","noHMR","fixNonTypeSpecificImports","code","out","error"],"sources":["../../src/utils/patches.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["transformFlow","transformSWC","findNodeModules","FSExtra","join","semver","depPatches","globDir","deepMergeOptimizeDeps","Bail","Error","bailIfUnchanged","obj1","obj2","JSON","stringify","bailIfExists","haystack","needle","includes","applyBuiltInPatches","options","extraPatches","all","key","extraPatchFiles","existing","find","x","module","patchKey","patchFiles","console","warn","push","applyDependencyPatches","root","applyOptimizePatches","patches","config","optimizeDeps","include","exclude","needsInterop","forEach","patch","optimize","filter","ssr","process","cwd","nodeModulesDirs","map","relativePath","Promise","flatMap","dir","nodeModuleDir","version","hasLogged","existsSync","pkgJSON","readJSON","satisfies","file","filesToApply","fullPath","ogFile","existingPatch","readFile","err","contentsIn","env","VXRN_FORCE_PATCH","write","contents","writeFile","info","DEBUG","patchDefinition","Array","isArray","strategy","mode","environment","forceJSX","noHMR","fixNonTypeSpecificImports","code","out","error"],"sources":["../../src/utils/patches.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/utils/patches.native.js

@@ -104,10 +104,19 @@ function bailIfExists(haystack, needle) {
 }
 async function applyBuiltInPatches(options, extraPatches) {
   var all = [...depPatches];
-  if (extraPatches) for (var key in extraPatches) all.push({
-    module: key,
-    patchFiles: extraPatches[key]
-  });
+  if (extraPatches) {
+    var _loop = function (key2) {
+      var extraPatchFiles = extraPatches[key2],
+        existing = all.find(function (x) {
+          return x.module === key2;
+        });
+      if (existing) for (var patchKey in extraPatchFiles) existing.patchFiles[patchKey] && console.warn("Warning: Overwriting One built-in patch with user patch", key2, patchKey), existing.patchFiles[patchKey] = extraPatchFiles[patchKey];else all.push({
+        module: key2,
+        patchFiles: extraPatchFiles
+      });
+    };
+    for (var key in extraPatches) _loop(key);
+  }
   await applyDependencyPatches(all, {
     root: options.root
   });
@@ -169,7 +178,7 @@ async function applyDependencyPatches(patches) {
                   contentsIn = existingPatch;
                 }
                 var write = async function (contents2) {
-                    await Promise.all([FSExtra.writeFile(ogFile, contentsIn), FSExtra.writeFile(fullPath, contents2)]), hasLogged || (hasLogged = !0, console.info(` \u{1FA79} Patching ${patch.module}`)), process.env.DEBUG && console.info(`  - Applied patch to ${patch.module}: ${relativePath}`);
+                    contentsIn = contents2, await Promise.all([FSExtra.writeFile(ogFile, contentsIn), FSExtra.writeFile(fullPath, contents2)]), hasLogged || (hasLogged = !0, console.info(` \u{1FA79} Patching ${patch.module}`)), process.env.DEBUG && console.info(`  - Applied patch to ${patch.module}: ${relativePath}`);
                   },
                   patchDefinition = patch.patchFiles[file2];
                 if (typeof patchDefinition == "string") {

package/dist/utils/patches.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["transformFlow","transformSWC","findNodeModules","FSExtra","join","semver","depPatches","globDir","deepMergeOptimizeDeps","_assert_this_initialized","self","ReferenceError","_call_super","_this","derived","args","_get_prototype_of","_possible_constructor_return","_is_native_reflect_construct","Reflect","construct","constructor","apply","_class_call_check","instance","Constructor","TypeError","_construct","Parent","Class","Parent2","args2","Class2","a","push","Function","bind","_set_prototype_of","prototype","arguments","o","Object","setPrototypeOf","getPrototypeOf","o2","__proto__","_inherits","subClass","superClass","create","value","writable","configurable","_is_native_function","fn","toString","call","indexOf","_type_of","p","p2","obj","Symbol","_wrap_native_super","_cache","Map","has","get","set","Wrapper","enumerable","result","Boolean","valueOf","Bail","Error1","Bail2","Error","bailIfUnchanged","obj1","obj2","JSON","stringify","bailIfExists","haystack","needle","includes","applyBuiltInPatches","options","extraPatches","all"],"sources":["../../src/utils/patches.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["transformFlow","transformSWC","findNodeModules","FSExtra","join","semver","depPatches","globDir","deepMergeOptimizeDeps","_assert_this_initialized","self","ReferenceError","_call_super","_this","derived","args","_get_prototype_of","_possible_constructor_return","_is_native_reflect_construct","Reflect","construct","constructor","apply","_class_call_check","instance","Constructor","TypeError","_construct","Parent","Class","Parent2","args2","Class2","a","push","Function","bind","_set_prototype_of","prototype","arguments","o","Object","setPrototypeOf","getPrototypeOf","o2","__proto__","_inherits","subClass","superClass","create","value","writable","configurable","_is_native_function","fn","toString","call","indexOf","_type_of","p","p2","obj","Symbol","_wrap_native_super","_cache","Map","has","get","set","Wrapper","enumerable","result","Boolean","valueOf","Bail","Error1","Bail2","Error","bailIfUnchanged","obj1","obj2","JSON","stringify","bailIfExists","haystack","needle","includes","applyBuiltInPatches","options","extraPatches","all","_loop","key2","extraPatchFiles","existing","find","x","module"],"sources":["../../src/utils/patches.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxrn",
-  "version": "1.1.490",
+  "version": "1.1.491",
   "sideEffects": false,
   "type": "module",
   "exports": {
@@ -62,16 +62,16 @@
     "@react-native/dev-middleware": "^0.76.5",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@tamagui/react-native-svg": "^1.126.18",
-    "@vxrn/compiler": "1.1.490",
-    "@vxrn/debug": "1.1.490",
-    "@vxrn/query-string": "1.1.490",
-    "@vxrn/react-native-prebuilt": "1.1.490",
-    "@vxrn/resolve": "1.1.490",
-    "@vxrn/safe-area": "1.1.490",
-    "@vxrn/url-parse": "1.1.490",
-    "@vxrn/utils": "1.1.490",
-    "@vxrn/vendor": "1.1.490",
-    "@vxrn/vite-flow": "1.1.490",
+    "@vxrn/compiler": "1.1.491",
+    "@vxrn/debug": "1.1.491",
+    "@vxrn/query-string": "1.1.491",
+    "@vxrn/react-native-prebuilt": "1.1.491",
+    "@vxrn/resolve": "1.1.491",
+    "@vxrn/safe-area": "1.1.491",
+    "@vxrn/url-parse": "1.1.491",
+    "@vxrn/utils": "1.1.491",
+    "@vxrn/vendor": "1.1.491",
+    "@vxrn/vite-flow": "1.1.491",
     "citty": "^0.1.6",
     "env-editor": "^1.1.0",
     "es-module-lexer": "^1.3.0",

package/src/utils/patches.ts

@@ -46,9 +46,21 @@ export async function applyBuiltInPatches(
 ) {
   const all = [...depPatches]
 
+  // merge user patches on top of built ins
   if (extraPatches) {
     for (const key in extraPatches) {
-      all.push({ module: key, patchFiles: extraPatches[key] })
+      const extraPatchFiles = extraPatches[key]
+      const existing = all.find((x) => x.module === key)
+      if (existing) {
+        for (const patchKey in extraPatchFiles) {
+          if (existing.patchFiles[patchKey]) {
+            console.warn(`Warning: Overwriting One built-in patch with user patch`, key, patchKey)
+          }
+          existing.patchFiles[patchKey] = extraPatchFiles[patchKey]
+        }
+      } else {
+        all.push({ module: key, patchFiles: extraPatchFiles })
+      }
     }
   }
 
@@ -147,6 +159,8 @@ export async function applyDependencyPatches(
                     }
 
                     const write = async (contents: string) => {
+                      // update contentsIn so the next patch gets the new value if it runs multiple
+                      contentsIn = contents
                       await Promise.all([
                         FSExtra.writeFile(ogFile, contentsIn),
                         FSExtra.writeFile(fullPath, contents),

package/types/utils/patches.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"patches.d.ts","sourceRoot":"","sources":["../../src/utils/patches.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAEtC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAI3D,KAAK,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,CAAA;AAExC,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAA;AAEzD,MAAM,MAAM,eAAe,GACvB,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,GAC/D,MAAM,GACN,UAAU,EAAE,CAAA;AAEhB,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE;QAAE,QAAQ,CAAC,EAAE,WAAW,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,CAAA;CAC9F,CAAA;AAID,wBAAgB,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,QAInD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAI5D;AAED,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAA;AAEzE,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,iBAAiB,EAC1B,YAAY,CAAC,EAAE,oBAAoB,iBAWpC;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,UAAU,iBA2BjF;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,QAAQ,EAAE,EACnB,EAAE,IAAoB,EAAE,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,iBAuIjD"}
+{"version":3,"file":"patches.d.ts","sourceRoot":"","sources":["../../src/utils/patches.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAEtC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAI3D,KAAK,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,CAAA;AAExC,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAA;AAEzD,MAAM,MAAM,eAAe,GACvB,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,GAC/D,MAAM,GACN,UAAU,EAAE,CAAA;AAEhB,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE;QAAE,QAAQ,CAAC,EAAE,WAAW,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,CAAA;CAC9F,CAAA;AAID,wBAAgB,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,QAInD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAI5D;AAED,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAA;AAEzE,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,iBAAiB,EAC1B,YAAY,CAAC,EAAE,oBAAoB,iBAuBpC;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,UAAU,iBA2BjF;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,QAAQ,EAAE,EACnB,EAAE,IAAoB,EAAE,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,iBAyIjD"}