Unverified Commit 87e31380 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: avoid REEXPORTED_OBJECTS property on Module object (#82622)

### What?

Avoid a property on the module object by using a WeakMap
parent 3c142be7
...@@ -105,7 +105,6 @@ interface Module { ...@@ -105,7 +105,6 @@ interface Module {
| EsmNamespaceObject | EsmNamespaceObject
| Promise<EsmNamespaceObject> | Promise<EsmNamespaceObject>
| AsyncModulePromise<EsmNamespaceObject> | AsyncModulePromise<EsmNamespaceObject>
[REEXPORTED_OBJECTS]?: any[]
} }
interface ModuleWithDirection extends Module { interface ModuleWithDirection extends Module {
......
...@@ -17,7 +17,7 @@ declare function getOrInstantiateModuleFromParent<M>( ...@@ -17,7 +17,7 @@ declare function getOrInstantiateModuleFromParent<M>(
sourceModule: M sourceModule: M
): M ): M
const REEXPORTED_OBJECTS = Symbol('reexported objects') const REEXPORTED_OBJECTS = new WeakMap<Module, ReexportedObjects>()
/** /**
* Constructs the `__turbopack_context__` object for a module. * Constructs the `__turbopack_context__` object for a module.
...@@ -102,7 +102,6 @@ function createModuleObject(id: ModuleId): Module { ...@@ -102,7 +102,6 @@ function createModuleObject(id: ModuleId): Module {
error: undefined, error: undefined,
id, id,
namespaceObject: undefined, namespaceObject: undefined,
[REEXPORTED_OBJECTS]: undefined,
} }
} }
...@@ -162,10 +161,10 @@ function ensureDynamicExports( ...@@ -162,10 +161,10 @@ function ensureDynamicExports(
exports: Exports exports: Exports
): ReexportedObjects { ): ReexportedObjects {
let reexportedObjects: ReexportedObjects | undefined = let reexportedObjects: ReexportedObjects | undefined =
module[REEXPORTED_OBJECTS] REEXPORTED_OBJECTS.get(module)
if (!reexportedObjects) { if (!reexportedObjects) {
module[REEXPORTED_OBJECTS] = reexportedObjects = [] REEXPORTED_OBJECTS.set(module, (reexportedObjects = []))
module.exports = module.namespaceObject = new Proxy(exports, { module.exports = module.namespaceObject = new Proxy(exports, {
get(target, prop) { get(target, prop) {
if ( if (
......
...@@ -7,7 +7,7 @@ const ASSET_PREFIX = "/"; ...@@ -7,7 +7,7 @@ const ASSET_PREFIX = "/";
* *
* It will be prepended to the runtime code of each runtime. * It will be prepended to the runtime code of each runtime.
*/ /* eslint-disable @typescript-eslint/no-unused-vars */ /// <reference path="./runtime-types.d.ts" /> */ /* eslint-disable @typescript-eslint/no-unused-vars */ /// <reference path="./runtime-types.d.ts" />
const REEXPORTED_OBJECTS = Symbol('reexported objects'); const REEXPORTED_OBJECTS = new WeakMap();
/** /**
* Constructs the `__turbopack_context__` object for a module. * Constructs the `__turbopack_context__` object for a module.
*/ function Context(module, exports) { */ function Context(module, exports) {
...@@ -44,8 +44,7 @@ function getOverwrittenModule(moduleCache, id) { ...@@ -44,8 +44,7 @@ function getOverwrittenModule(moduleCache, id) {
exports: {}, exports: {},
error: undefined, error: undefined,
id, id,
namespaceObject: undefined, namespaceObject: undefined
[REEXPORTED_OBJECTS]: undefined
}; };
} }
/** /**
...@@ -95,9 +94,9 @@ function getOverwrittenModule(moduleCache, id) { ...@@ -95,9 +94,9 @@ function getOverwrittenModule(moduleCache, id) {
} }
contextPrototype.s = esmExport; contextPrototype.s = esmExport;
function ensureDynamicExports(module, exports) { function ensureDynamicExports(module, exports) {
let reexportedObjects = module[REEXPORTED_OBJECTS]; let reexportedObjects = REEXPORTED_OBJECTS.get(module);
if (!reexportedObjects) { if (!reexportedObjects) {
module[REEXPORTED_OBJECTS] = reexportedObjects = []; REEXPORTED_OBJECTS.set(module, reexportedObjects = []);
module.exports = module.namespaceObject = new Proxy(exports, { module.exports = module.namespaceObject = new Proxy(exports, {
get (target, prop) { get (target, prop) {
if (hasOwnProperty.call(target, prop) || prop === 'default' || prop === '__esModule') { if (hasOwnProperty.call(target, prop) || prop === 'default' || prop === '__esModule') {
......
...@@ -17,7 +17,7 @@ const RUNTIME_PUBLIC_PATH = ""; ...@@ -17,7 +17,7 @@ const RUNTIME_PUBLIC_PATH = "";
* *
* It will be prepended to the runtime code of each runtime. * It will be prepended to the runtime code of each runtime.
*/ /* eslint-disable @typescript-eslint/no-unused-vars */ /// <reference path="./runtime-types.d.ts" /> */ /* eslint-disable @typescript-eslint/no-unused-vars */ /// <reference path="./runtime-types.d.ts" />
const REEXPORTED_OBJECTS = Symbol('reexported objects'); const REEXPORTED_OBJECTS = new WeakMap();
/** /**
* Constructs the `__turbopack_context__` object for a module. * Constructs the `__turbopack_context__` object for a module.
*/ function Context(module, exports) { */ function Context(module, exports) {
...@@ -54,8 +54,7 @@ function getOverwrittenModule(moduleCache, id) { ...@@ -54,8 +54,7 @@ function getOverwrittenModule(moduleCache, id) {
exports: {}, exports: {},
error: undefined, error: undefined,
id, id,
namespaceObject: undefined, namespaceObject: undefined
[REEXPORTED_OBJECTS]: undefined
}; };
} }
/** /**
...@@ -105,9 +104,9 @@ function getOverwrittenModule(moduleCache, id) { ...@@ -105,9 +104,9 @@ function getOverwrittenModule(moduleCache, id) {
} }
contextPrototype.s = esmExport; contextPrototype.s = esmExport;
function ensureDynamicExports(module, exports) { function ensureDynamicExports(module, exports) {
let reexportedObjects = module[REEXPORTED_OBJECTS]; let reexportedObjects = REEXPORTED_OBJECTS.get(module);
if (!reexportedObjects) { if (!reexportedObjects) {
module[REEXPORTED_OBJECTS] = reexportedObjects = []; REEXPORTED_OBJECTS.set(module, reexportedObjects = []);
module.exports = module.namespaceObject = new Proxy(exports, { module.exports = module.namespaceObject = new Proxy(exports, {
get (target, prop) { get (target, prop) {
if (hasOwnProperty.call(target, prop) || prop === 'default' || prop === '__esModule') { if (hasOwnProperty.call(target, prop) || prop === 'default' || prop === '__esModule') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment