alpinejs: Remove the custom memory patch

I have seen some rare cleanup errors that points to my patch which I consider worse than the problem the patch was supposed to solve. Thiw commit brings AlpineJS in line with the tag v3.13.2 with no modifications.
gohugoio · Nov 16, 2023 · 6ccb109 · 6ccb109
1 parent 830d00b
commit 6ccb109
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 94 deletions.
diff --git a/alpinejs/packages/alpinejs/dist/cdn.js b/alpinejs/packages/alpinejs/dist/cdn.js
@@ -519,12 +519,7 @@
         enumerable: false
       });
     });
-    return {
-      obj,
-      cleanup: () => {
-        el = null;
-      }
-    };
+    return obj;
   }
 
   // packages/alpinejs/src/utils/error.js
@@ -568,8 +563,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
   }
   function normalEvaluator(el, expression) {
     let overriddenMagics = {};
-    let cleanup2 = injectMagics(overriddenMagics, el).cleanup;
-    onAttributeRemoved(el, "evaluator", cleanup2);
+    injectMagics(overriddenMagics, el);
     let dataStack = [overriddenMagics, ...closestDataStack(el)];
     let evaluator = typeof expression === "function" ? generateEvaluatorFromFunction(dataStack, expression) : generateEvaluatorFromString(dataStack, expression, el);
     return tryCatch.bind(null, el, expression, evaluator);
@@ -2921,22 +2915,20 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       return;
     expression = expression === "" ? "{}" : expression;
     let magicContext = {};
-    let cleanup1 = injectMagics(magicContext, el).cleanup;
+    injectMagics(magicContext, el);
     let dataProviderContext = {};
     injectDataProviders(dataProviderContext, magicContext);
     let data2 = evaluate(el, expression, { scope: dataProviderContext });
     if (data2 === void 0 || data2 === true)
       data2 = {};
-    let cleanup22 = injectMagics(data2, el).cleanup;
+    injectMagics(data2, el);
     let reactiveData = reactive(data2);
     initInterceptors2(reactiveData);
     let undo = addScopeToNode(el, reactiveData);
     reactiveData["init"] && evaluate(el, reactiveData["init"]);
     cleanup2(() => {
       reactiveData["destroy"] && evaluate(el, reactiveData["destroy"]);
       undo();
-      cleanup1();
-      cleanup22();
     });
   });
 

diff --git a/alpinejs/packages/alpinejs/dist/cdn.min.js b/alpinejs/packages/alpinejs/dist/cdn.min.js
diff --git a/alpinejs/packages/alpinejs/dist/module.cjs.js b/alpinejs/packages/alpinejs/dist/module.cjs.js
@@ -1931,12 +1931,7 @@ function injectMagics(obj, el) {
       enumerable: false
     });
   });
-  return {
-    obj,
-    cleanup: () => {
-      el = null;
-    }
-  };
+  return obj;
 }
 
 // packages/alpinejs/src/utils/error.js
@@ -1980,8 +1975,7 @@ function setEvaluator(newEvaluator) {
 }
 function normalEvaluator(el, expression) {
   let overriddenMagics = {};
-  let cleanup = injectMagics(overriddenMagics, el).cleanup;
-  onAttributeRemoved(el, "evaluator", cleanup);
+  injectMagics(overriddenMagics, el);
   let dataStack = [overriddenMagics, ...closestDataStack(el)];
   let evaluator = typeof expression === "function" ? generateEvaluatorFromFunction(dataStack, expression) : generateEvaluatorFromString(dataStack, expression, el);
   return tryCatch.bind(null, el, expression, evaluator);
@@ -3628,22 +3622,20 @@ directive("data", (el, { expression }, { cleanup }) => {
     return;
   expression = expression === "" ? "{}" : expression;
   let magicContext = {};
-  let cleanup1 = injectMagics(magicContext, el).cleanup;
+  injectMagics(magicContext, el);
   let dataProviderContext = {};
   injectDataProviders(dataProviderContext, magicContext);
   let data2 = evaluate(el, expression, { scope: dataProviderContext });
   if (data2 === void 0 || data2 === true)
     data2 = {};
-  let cleanup2 = injectMagics(data2, el).cleanup;
+  injectMagics(data2, el);
   let reactiveData = reactive(data2);
   initInterceptors2(reactiveData);
   let undo = addScopeToNode(el, reactiveData);
   reactiveData["init"] && evaluate(el, reactiveData["init"]);
   cleanup(() => {
     reactiveData["destroy"] && evaluate(el, reactiveData["destroy"]);
     undo();
-    cleanup1();
-    cleanup2();
   });
 });
 

diff --git a/alpinejs/packages/alpinejs/dist/module.esm.js b/alpinejs/packages/alpinejs/dist/module.esm.js
@@ -518,12 +518,7 @@ function injectMagics(obj, el) {
       enumerable: false
     });
   });
-  return {
-    obj,
-    cleanup: () => {
-      el = null;
-    }
-  };
+  return obj;
 }
 
 // packages/alpinejs/src/utils/error.js
@@ -567,8 +562,7 @@ function setEvaluator(newEvaluator) {
 }
 function normalEvaluator(el, expression) {
   let overriddenMagics = {};
-  let cleanup2 = injectMagics(overriddenMagics, el).cleanup;
-  onAttributeRemoved(el, "evaluator", cleanup2);
+  injectMagics(overriddenMagics, el);
   let dataStack = [overriddenMagics, ...closestDataStack(el)];
   let evaluator = typeof expression === "function" ? generateEvaluatorFromFunction(dataStack, expression) : generateEvaluatorFromString(dataStack, expression, el);
   return tryCatch.bind(null, el, expression, evaluator);
@@ -2920,22 +2914,20 @@ directive("data", (el, { expression }, { cleanup: cleanup2 }) => {
     return;
   expression = expression === "" ? "{}" : expression;
   let magicContext = {};
-  let cleanup1 = injectMagics(magicContext, el).cleanup;
+  injectMagics(magicContext, el);
   let dataProviderContext = {};
   injectDataProviders(dataProviderContext, magicContext);
   let data2 = evaluate(el, expression, { scope: dataProviderContext });
   if (data2 === void 0 || data2 === true)
     data2 = {};
-  let cleanup22 = injectMagics(data2, el).cleanup;
+  injectMagics(data2, el);
   let reactiveData = reactive(data2);
   initInterceptors2(reactiveData);
   let undo = addScopeToNode(el, reactiveData);
   reactiveData["init"] && evaluate(el, reactiveData["init"]);
   cleanup2(() => {
     reactiveData["destroy"] && evaluate(el, reactiveData["destroy"]);
     undo();
-    cleanup1();
-    cleanup22();
   });
 });
 

diff --git a/alpinejs/packages/alpinejs/src/directives/x-data.js b/alpinejs/packages/alpinejs/src/directives/x-data.js
@@ -16,7 +16,7 @@ directive('data', ((el, { expression }, { cleanup }) => {
     expression = expression === '' ? '{}' : expression
 
     let magicContext = {}
-    let cleanup1 = injectMagics(magicContext, el).cleanup
+    injectMagics(magicContext, el)
 
     let dataProviderContext = {}
     injectDataProviders(dataProviderContext, magicContext)
@@ -25,7 +25,7 @@ directive('data', ((el, { expression }, { cleanup }) => {
 
     if (data === undefined || data === true) data = {}
 
-    let cleanup2 = injectMagics(data, el).cleanup
+    injectMagics(data, el)
 
     let reactiveData = reactive(data)
 
@@ -39,9 +39,5 @@ directive('data', ((el, { expression }, { cleanup }) => {
         reactiveData['destroy'] && evaluate(el, reactiveData['destroy'])
 
         undo()
-
-         // MemLeak1: Issue #2140
-         cleanup1()
-         cleanup2()
     })
 }))
diff --git a/alpinejs/packages/alpinejs/src/evaluator.js b/alpinejs/packages/alpinejs/src/evaluator.js
@@ -1,7 +1,6 @@
 import { closestDataStack, mergeProxies } from './scope'
 import { injectMagics } from './magics'
 import { tryCatch, handleError } from './utils/error'
-import { onAttributeRemoved } from './mutation'
 
 let shouldAutoEvaluateFunctions = true
 
@@ -38,10 +37,7 @@ export function setEvaluator(newEvaluator) {
 export function normalEvaluator(el, expression) {
     let overriddenMagics = {}
 
-    let cleanup = injectMagics(overriddenMagics, el).cleanup
-
-     // MemLeak1: Issue #2140 (note: there are other uses of injectMagics)
-     onAttributeRemoved(el, "evaluator", cleanup)
+    injectMagics(overriddenMagics, el)
 
     let dataStack = [overriddenMagics, ...closestDataStack(el)]
 

diff --git a/alpinejs/packages/alpinejs/src/magics.js b/alpinejs/packages/alpinejs/src/magics.js
@@ -33,11 +33,5 @@ export function injectMagics(obj, el) {
         })
     })
 
-    return {
-        obj,
-        cleanup: () => {
-            // MemLeak1: Issue #2140
-            el = null;
-        }
-    };
+    return obj
 }
diff --git a/alpinejs/packages/csp/dist/cdn.js b/alpinejs/packages/csp/dist/cdn.js
@@ -519,12 +519,7 @@
         enumerable: false
       });
     });
-    return {
-      obj,
-      cleanup: () => {
-        el = null;
-      }
-    };
+    return obj;
   }
 
   // packages/alpinejs/src/utils/error.js
@@ -568,8 +563,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
   }
   function normalEvaluator(el, expression) {
     let overriddenMagics = {};
-    let cleanup2 = injectMagics(overriddenMagics, el).cleanup;
-    onAttributeRemoved(el, "evaluator", cleanup2);
+    injectMagics(overriddenMagics, el);
     let dataStack = [overriddenMagics, ...closestDataStack(el)];
     let evaluator = typeof expression === "function" ? generateEvaluatorFromFunction(dataStack, expression) : generateEvaluatorFromString(dataStack, expression, el);
     return tryCatch.bind(null, el, expression, evaluator);
@@ -2921,22 +2915,20 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       return;
     expression = expression === "" ? "{}" : expression;
     let magicContext = {};
-    let cleanup1 = injectMagics(magicContext, el).cleanup;
+    injectMagics(magicContext, el);
     let dataProviderContext = {};
     injectDataProviders(dataProviderContext, magicContext);
     let data2 = evaluate(el, expression, { scope: dataProviderContext });
     if (data2 === void 0 || data2 === true)
       data2 = {};
-    let cleanup22 = injectMagics(data2, el).cleanup;
+    injectMagics(data2, el);
     let reactiveData = reactive(data2);
     initInterceptors2(reactiveData);
     let undo = addScopeToNode(el, reactiveData);
     reactiveData["init"] && evaluate(el, reactiveData["init"]);
     cleanup2(() => {
       reactiveData["destroy"] && evaluate(el, reactiveData["destroy"]);
       undo();
-      cleanup1();
-      cleanup22();
     });
   });