From 8d2497b096c4a47211bf58df6b244f51f114c3b2 Mon Sep 17 00:00:00 2001 From: Jakub Romanczyk Date: Tue, 28 Jan 2025 17:01:10 +0100 Subject: [PATCH 1/2] fix: use static entry for polyfill --- packages/polygen/package.json | 12 ++---------- packages/polygen/polyfill.js | 5 +++++ packages/polygen/src/polyfill.ts | 6 ------ 3 files changed, 7 insertions(+), 16 deletions(-) create mode 100644 packages/polygen/polyfill.js delete mode 100644 packages/polygen/src/polyfill.ts diff --git a/packages/polygen/package.json b/packages/polygen/package.json index bf4de148..09855e14 100644 --- a/packages/polygen/package.json +++ b/packages/polygen/package.json @@ -18,16 +18,7 @@ "default": "./lib/commonjs/index.js" } }, - "./polyfill": { - "import": { - "types": "./lib/typescript/module/polyfill.d.ts", - "default": "./lib/module/polyfill.js" - }, - "require": { - "types": "./lib/typescript/commonjs/polyfill.d.ts", - "default": "./lib/commonjs/polyfill.js" - } - }, + "./polyfill": "./polyfill.js", "./package.json": "./package.json" }, "files": [ @@ -37,6 +28,7 @@ "ios", "cpp", "*.podspec", + "polyfill.js", "!ios/build", "!android/build", "!android/gradle", diff --git a/packages/polygen/polyfill.js b/packages/polygen/polyfill.js new file mode 100644 index 00000000..98d67384 --- /dev/null +++ b/packages/polygen/polyfill.js @@ -0,0 +1,5 @@ +'use strict'; + +var polygen = require('@callstack/polygen'); + +global.WebAssembly = Object.freeze(polygen.WebAssembly); diff --git a/packages/polygen/src/polyfill.ts b/packages/polygen/src/polyfill.ts deleted file mode 100644 index b86407b5..00000000 --- a/packages/polygen/src/polyfill.ts +++ /dev/null @@ -1,6 +0,0 @@ -// @ts-ignore -import { WebAssembly } from '@callstack/polygen'; -// @ts-ignore -global.WebAssembly = Object.freeze(WebAssembly) as any; -// @ts-ignore -globalThis.WebAssembly = Object.freeze(WebAssembly); From ff133824bfb43bb5e8c4f27b22edd994211cf18a Mon Sep 17 00:00:00 2001 From: Jakub Romanczyk Date: Tue, 28 Jan 2025 17:17:19 +0100 Subject: [PATCH 2/2] fix: remove use of packageExports --- apps/example/metro.config.js | 3 --- packages/metro-config/src/index.ts | 1 - packages/polygen/react-native.config.js | 3 --- 3 files changed, 7 deletions(-) diff --git a/apps/example/metro.config.js b/apps/example/metro.config.js index 5ee85cf6..4be67f3b 100644 --- a/apps/example/metro.config.js +++ b/apps/example/metro.config.js @@ -11,9 +11,6 @@ const root = path.resolve(__dirname, '..', '..'); * @type {import('metro-config').MetroConfig} */ const config = { - resolver: { - // unstable_enablePackageExports: true, - }, watchFolders: [root], transformer: { getTransformOptions: async () => ({ diff --git a/packages/metro-config/src/index.ts b/packages/metro-config/src/index.ts index db5c9554..6eb650f7 100644 --- a/packages/metro-config/src/index.ts +++ b/packages/metro-config/src/index.ts @@ -73,7 +73,6 @@ export function withPolygenConfig( ...defaultConfig, resolver: { ...defaultConfig.resolver, - unstable_enablePackageExports: true, resolveRequest, // sourceExts: ['ts', 'tsx', 'js', 'jsx', 'json', 'wasm'], }, diff --git a/packages/polygen/react-native.config.js b/packages/polygen/react-native.config.js index a8ff2d51..c1c97930 100644 --- a/packages/polygen/react-native.config.js +++ b/packages/polygen/react-native.config.js @@ -2,9 +2,6 @@ * @type {import('@react-native-community/cli-types').UserDependencyConfig} */ module.exports = { - resolver: { - unstable_enablePackageExports: true, - }, dependency: { platforms: { android: {