Revert "fix: use custom set in transpiled module to bypass polyfill of Array,from (#6604)"

This reverts commit 206da7c.

Author: DeMoorJasper

packages/sandpack-core/src/manager.ts

@@ -626,13 +626,11 @@ export default class Manager implements IEvaluator {
   }
 
   verifyTreeTranspiled() {
-    const promises = [];
-    for (const tModule of this.getTranspiledModules()) {
-      if (tModule.shouldTranspile()) {
-        promises.push(tModule.transpile(this));
-      }
-    }
-    return Promise.all(promises);
+    return Promise.all(
+      this.getTranspiledModules()
+        .filter(tModule => tModule.shouldTranspile())
+        .map(tModule => tModule.transpile(this))
+    );
   }
 
   clearCompiledCache() {

packages/sandpack-core/src/transpiled-module/CustomSet.ts

@@ -23,7 +23,6 @@ import HMR from './hmr';
 import { splitQueryFromPath } from './utils/query-path';
 import { getModuleUrl } from './module-url';
 import delay from '../utils/delay';
-import { CustomSet } from './CustomSet';
 
 declare const BrowserFS: any;
 
@@ -164,11 +163,11 @@ export class TranspiledModule {
   errors: Array<ModuleError>;
   warnings: Array<ModuleWarning>;
   compilation: Compilation | null = null;
-  initiators: CustomSet<TranspiledModule>; // eslint-disable-line no-use-before-define
-  dependencies: CustomSet<TranspiledModule>; // eslint-disable-line no-use-before-define
+  initiators: Set<TranspiledModule>; // eslint-disable-line no-use-before-define
+  dependencies: Set<TranspiledModule>; // eslint-disable-line no-use-before-define
   asyncDependencies: Array<Promise<TranspiledModule>>; // eslint-disable-line no-use-before-define
-  transpilationDependencies: CustomSet<TranspiledModule>;
-  transpilationInitiators: CustomSet<TranspiledModule>;
+  transpilationDependencies: Set<TranspiledModule>;
+  transpilationInitiators: Set<TranspiledModule>;
 
   // Unique identifier
   hash: string;
@@ -197,11 +196,11 @@ export class TranspiledModule {
     this.errors = [];
     this.warnings = [];
     this.childModules = [];
-    this.transpilationDependencies = new CustomSet();
-    this.dependencies = new CustomSet();
+    this.transpilationDependencies = new Set();
+    this.dependencies = new Set();
     this.asyncDependencies = [];
-    this.transpilationInitiators = new CustomSet();
-    this.initiators = new CustomSet();
+    this.transpilationInitiators = new Set();
+    this.initiators = new Set();
     this.isEntry = false;
     this.isTestFile = false;
 
@@ -221,7 +220,7 @@ export class TranspiledModule {
     this.reset();
 
     // Reset parents
-    this.initiators.values().forEach(tModule => {
+    this.initiators.forEach(tModule => {
       tModule.resetTranspilation();
     });
 
@@ -252,8 +251,7 @@ export class TranspiledModule {
   }
 
   resetTranspilation() {
-    this.transpilationInitiators
-      .values()
+    Array.from(this.transpilationInitiators)
       .filter(t => t.source)
       .forEach(dep => {
         dep.resetTranspilation();
@@ -265,7 +263,7 @@ export class TranspiledModule {
     this.errors = [];
     this.warnings = [];
 
-    this.dependencies.values().forEach(t => {
+    Array.from(this.dependencies).forEach(t => {
       t.initiators.delete(this);
     });
     // Don't do it for transpilation dependencies, since those cannot be traced back since we also reset transpilation of them.
@@ -283,15 +281,13 @@ export class TranspiledModule {
     if (this.hmrConfig && this.hmrConfig.isHot()) {
       this.hmrConfig.setDirty(true);
     } else {
-      this.initiators
-        .values()
+      Array.from(this.initiators)
         .filter(t => t.compilation)
         .forEach(initiator => {
           initiator.resetCompilation();
         });
 
-      this.transpilationInitiators
-        .values()
+      Array.from(this.transpilationInitiators)
         .filter(t => t.compilation)
         .forEach(dep => {
           dep.resetCompilation();
@@ -300,8 +296,7 @@ export class TranspiledModule {
       // If this is an entry we want all direct entries to be reset as well.
       // Entries generally have side effects
       if (this.isEntry) {
-        this.dependencies
-          .values()
+        Array.from(this.dependencies)
           .filter(t => t.compilation && t.isEntry)
           .forEach(dep => {
             dep.resetCompilation();
@@ -318,7 +313,7 @@ export class TranspiledModule {
     return (
       !this.source &&
       !this.isTestFile &&
-      !(this.initiators.size() === 0 && this.transpilationInitiators.size() > 0)
+      !(this.initiators.size === 0 && this.transpilationInitiators.size > 0)
     );
   }
 
@@ -566,16 +561,15 @@ export class TranspiledModule {
 
     // Remove this module from the initiators of old deps, so we can populate a
     // fresh cache
-    this.dependencies.values().forEach(tModule => {
+    this.dependencies.forEach(tModule => {
       tModule.initiators.delete(this);
     });
-    this.transpilationDependencies.values().forEach(tModule => {
+    this.transpilationDependencies.forEach(tModule => {
       tModule.transpilationInitiators.delete(this);
     });
     this.childModules.forEach(tModule => {
       tModule.dispose(manager);
     });
-
     this.dependencies.clear();
     this.transpilationDependencies.clear();
     this.childModules.length = 0;
@@ -697,8 +691,10 @@ export class TranspiledModule {
     this.asyncDependencies = [];
 
     await Promise.all([
-      ...this.transpilationInitiators.values().map(t => t.transpile(manager)),
-      ...this.dependencies.values().map(t => t.transpile(manager)),
+      ...Array.from(this.transpilationInitiators).map(t =>
+        t.transpile(manager)
+      ),
+      ...Array.from(this.dependencies).map(t => t.transpile(manager)),
     ]);
 
     return this;
@@ -951,8 +947,7 @@ export class TranspiledModule {
             this.hmrConfig = this.hmrConfig || new HMR();
 
             // We have to bubble up, so reset compilation of parents
-            this.initiators
-              .values()
+            Array.from(this.initiators)
               .filter(t => t.compilation)
               .forEach(dep => {
                 dep.resetCompilation();
@@ -1098,8 +1093,8 @@ export class TranspiledModule {
 
   postTranspile(manager: Manager) {
     if (
-      this.initiators.size() === 0 &&
-      this.transpilationInitiators.size() === 0 &&
+      this.initiators.size === 0 &&
+      this.transpilationInitiators.size === 0 &&
       !this.isEntry &&
       !manager.isFirstLoad &&
       // Don't delete stubbed modules, they are here for a reason, most probably
@@ -1133,7 +1128,6 @@ export class TranspiledModule {
     const sourceEqualsCompiled = Boolean(
       this.source && this.source.sourceEqualsCompiled
     );
-
     const serializableObject: SerializedTranspiledModule = {
       query: this.query,
       module: this.module,
@@ -1142,16 +1136,14 @@ export class TranspiledModule {
 
       sourceEqualsCompiled,
       childModules: this.childModules.map(m => m.getId()),
-      dependencies: this.dependencies.values().map(m => {
-        return m.getId();
-      }),
-      initiators: this.initiators.values().map(m => m.getId()),
-      transpilationDependencies: this.transpilationDependencies
-        .values()
-        .map(m => m.getId()),
-      transpilationInitiators: this.transpilationInitiators
-        .values()
-        .map(m => m.getId()),
+      dependencies: Array.from(this.dependencies).map(m => m.getId()),
+      initiators: Array.from(this.initiators).map(m => m.getId()),
+      transpilationDependencies: Array.from(
+        this.transpilationDependencies
+      ).map(m => m.getId()),
+      transpilationInitiators: Array.from(this.transpilationInitiators).map(m =>
+        m.getId()
+      ),
       asyncDependencies: await Promise.all(
         Array.from(this.asyncDependencies).map(m => m.then(x => x.getId()))
       ),