fix polyfills package, don't publish polyfills package (#1023)

penumbra-zone · May 2, 2024 · 423e1d2 · 423e1d2
1 parent aa49e49
commit 423e1d2
Show file tree

Hide file tree

Showing 28 changed files with 17 additions and 146 deletions.
diff --git a/.changeset/afraid-lizards-camp.md b/.changeset/afraid-lizards-camp.md
@@ -0,0 +1,6 @@
+---
+'@penumbra-zone/polyfills': major
+---
+
+- don't publish
+- remove polyfills now present in esnext
diff --git a/apps/extension/package.json b/apps/extension/package.json
@@ -53,7 +53,6 @@
   },
   "devDependencies": {
     "@penumbra-zone/keys": "workspace:*",
-    "@penumbra-zone/polyfills": "workspace:*",
     "@penumbra-zone/protobuf": "workspace:*",
     "@radix-ui/react-icons": "^1.3.0",
     "@types/firefox-webext-browser": "^120.0.3",

diff --git a/apps/extension/src/approve-origin.ts b/apps/extension/src/approve-origin.ts
@@ -1,7 +1,6 @@
 import { localExtStorage } from '@penumbra-zone/storage/chrome/local';
 import { OriginApproval, PopupType } from './message/popup';
 import { popup } from './popup';
-import Map from '@penumbra-zone/polyfills/Map.groupBy';
 import { UserChoice } from '@penumbra-zone/types/user-choice';
 
 export const originAlreadyApproved = async (url: string): Promise<boolean> => {

diff --git a/apps/extension/src/content-scripts/injected-penumbra-global.ts b/apps/extension/src/content-scripts/injected-penumbra-global.ts
@@ -24,10 +24,9 @@ import {
 } from '@penumbra-zone/client/global';
 import { isPraxFailureMessageEvent, isPraxPortMessageEvent, PraxMessage } from './message-event';
 
-import '@penumbra-zone/polyfills/Promise.withResolvers';
 import { PraxConnection } from '../message/prax';
 
-const request = Promise.withResolvers();
+const request = Promise.withResolvers<void>();
 
 // this is just withResolvers, plus a sync-queryable state attribute
 const connection = Object.assign(Promise.withResolvers<MessagePort>(), { state: false });

diff --git a/apps/extension/src/routes/popup/settings/settings-connected-sites/index.tsx b/apps/extension/src/routes/popup/settings/settings-connected-sites/index.tsx
@@ -7,7 +7,6 @@ import { UserChoice } from '@penumbra-zone/types/user-choice';
 import { SettingsScreen } from '../settings-screen';
 import { useStoreShallow } from '../../../../utils/use-store-shallow';
 import { allSitesFilteredOutSelector } from '../../../../state/connected-sites';
-import Map from '@penumbra-zone/polyfills/Map.groupBy';
 import { KnownSitesGroup } from './known-sites-group';
 
 const settingsConnectedSitesSelector = (state: AllSlices) => ({

diff --git a/apps/extension/src/routes/popup/settings/settings-rpc.tsx b/apps/extension/src/routes/popup/settings/settings-rpc.tsx
@@ -2,15 +2,14 @@ import { useState } from 'react';
 import { ShareGradientIcon } from '../../../icons/share-gradient';
 import { GrpcEndpointForm } from '../../../shared/components/grpc-endpoint-form';
 import { SettingsScreen } from './settings-screen';
-import '@penumbra-zone/polyfills/Promise.withResolvers';
 
 export const SettingsRPC = () => {
   const [countdownTime, setCountdownTime] = useState<number>();
   const submitButtonLabel =
     Number(countdownTime) > 0 ? `Saved! Restarting in ${countdownTime}...` : 'Save';
 
   const countdown = (seconds: number) => {
-    const { promise, resolve } = Promise.withResolvers();
+    const { promise, resolve } = Promise.withResolvers<void>();
     setCountdownTime(seconds);
     setInterval(() => {
       if (!seconds) resolve(undefined);

diff --git a/apps/extension/src/service-worker.ts b/apps/extension/src/service-worker.ts
@@ -60,7 +60,7 @@ const fixEmptyGrpcEndpointAfterOnboarding = async () => {
  * requests against it.
  */
 const waitUntilGrpcEndpointExists = async () => {
-  const grpcEndpointPromise = Promise.withResolvers();
+  const grpcEndpointPromise = Promise.withResolvers<void>();
   const grpcEndpoint = await localExtStorage.get('grpcEndpoint');
 
   if (grpcEndpoint) {

diff --git a/apps/extension/src/shared/components/grpc-endpoint-form/confirm-changed-chain-id-dialog.tsx b/apps/extension/src/shared/components/grpc-endpoint-form/confirm-changed-chain-id-dialog.tsx
@@ -1,4 +1,3 @@
-import { PromiseWithResolvers } from '@penumbra-zone/polyfills/Promise.withResolvers';
 import { Button } from '@penumbra-zone/ui/components/ui/button';
 import {
   Dialog,

diff --git a/apps/extension/src/shared/components/grpc-endpoint-form/use-grpc-endpoint-form.ts b/apps/extension/src/shared/components/grpc-endpoint-form/use-grpc-endpoint-form.ts
@@ -6,7 +6,6 @@ import { AllSlices } from '../../../state';
 import { useStoreShallow } from '../../../utils/use-store-shallow';
 import { ServicesMessage } from '@penumbra-zone/types/services';
 import debounce from 'lodash/debounce';
-import { PromiseWithResolvers } from '@penumbra-zone/polyfills/Promise.withResolvers';
 import { useRpcEndpoints } from '../../../hooks/registry';
 
 const randomSort = () => (Math.random() >= 0.5 ? 1 : -1);
@@ -105,7 +104,7 @@ export const useGrpcEndpointForm = () => {
 
     // If the chain id has changed, our cache is invalid
     if (chainIdChanged) {
-      const promiseWithResolvers = Promise.withResolvers();
+      const promiseWithResolvers = Promise.withResolvers<void>();
       setConfirmChangedChainIdPromise(promiseWithResolvers);
 
       try {

diff --git a/apps/minifront/array-from-async.d.ts b/apps/minifront/array-from-async.d.ts
diff --git a/packages/eslint-config-custom/index.js b/packages/eslint-config-custom/index.js
@@ -35,6 +35,7 @@ module.exports = {
     '@typescript-eslint/no-confusing-void-expression': ['error', { ignoreArrowShorthand: true }],
     '@typescript-eslint/switch-exhaustiveness-check': 'error',
     '@typescript-eslint/no-unnecessary-condition': ['error', { allowConstantLoopConditions: true }],
+    '@typescript-eslint/no-invalid-void-type': 'off',
     'react/react-in-jsx-scope': 'off',
     'react/prop-types': 'off',
     // Catches untyped let declarations

diff --git a/packages/polyfills/array-from-async.d.ts b/packages/polyfills/array-from-async.d.ts
diff --git a/packages/polyfills/package.json b/packages/polyfills/package.json
@@ -1,33 +1,17 @@
 {
   "name": "@penumbra-zone/polyfills",
   "version": "3.0.0",
+  "private": true,
   "license": "(MIT OR Apache-2.0)",
   "type": "module",
   "scripts": {
-    "build": "tsc && vite build",
-    "clean": "rm -rfv dist",
     "lint": "eslint \"**/*.ts*\"",
     "test": "vitest run"
   },
   "exports": {
     "./ReadableStream[Symbol.asyncIterator]": "./src/ReadableStream_Symbol.asyncIterator_.ts",
     "./*": "./src/*.ts"
   },
-  "publishConfig": {
-    "files": [
-      "dist"
-    ],
-    "exports": {
-      "./ReadableStream[Symbol.asyncIterator]": {
-        "import": "./dist/ReadableStream_Symbol.asyncIterator_.js",
-        "types": "./src/ReadableStream_Symbol.asyncIterator_.d.ts"
-      },
-      "./*": {
-        "import": "./dist/*.js",
-        "types": "./dist/*.d.ts"
-      }
-    }
-  },
   "dependencies": {
     "array-from-async": "^3.0.0"
   }

diff --git a/packages/polyfills/src/Array.fromAsync.ts b/packages/polyfills/src/Array.fromAsync.ts
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/triple-slash-reference
+/// <reference path="./array-from-async.d.ts" />
 import fromAsync from 'array-from-async';
 
 type FromAsync = <T, U = T>(

diff --git a/packages/polyfills/src/Map.groupBy.ts b/packages/polyfills/src/Map.groupBy.ts
diff --git a/packages/polyfills/src/Promise.withResolvers.test.ts b/packages/polyfills/src/Promise.withResolvers.test.ts
diff --git a/packages/polyfills/src/Promise.withResolvers.ts b/packages/polyfills/src/Promise.withResolvers.ts
diff --git a/apps/extension/array-from-async.d.ts → packages/polyfills/src/array-from-async.d.ts b/apps/extension/array-from-async.d.ts → packages/polyfills/src/array-from-async.d.ts
diff --git a/packages/polyfills/vite.config.ts b/packages/polyfills/vite.config.ts
diff --git a/packages/query/package.json b/packages/query/package.json
@@ -16,7 +16,6 @@
     "@penumbra-zone/constants": "workspace:*",
     "@penumbra-zone/crypto-web": "workspace:*",
     "@penumbra-zone/getters": "workspace:*",
-    "@penumbra-zone/polyfills": "workspace:*",
     "@penumbra-zone/types": "workspace:*",
     "@penumbra-zone/wasm": "workspace:*",
     "exponential-backoff": "^3.1.1"

diff --git a/packages/services-context/package.json b/packages/services-context/package.json
@@ -24,8 +24,7 @@
   },
   "devDependencies": {
     "@buf/penumbra-zone_penumbra.bufbuild_es": "1.9.0-20240501193854-ea3cc743390d.1",
-    "@bufbuild/protobuf": "^1.9.0",
-    "@penumbra-zone/polyfills": "workspace:*"
+    "@bufbuild/protobuf": "^1.9.0"
   },
   "peerDependencies": {
     "@buf/penumbra-zone_penumbra.bufbuild_es": "1.9.0-20240501193854-ea3cc743390d.1",

diff --git a/packages/services-context/src/index.ts b/packages/services-context/src/index.ts
@@ -6,7 +6,6 @@ import { syncLastBlockWithLocal } from '@penumbra-zone/storage/chrome/syncer';
 import { ViewServer } from '@penumbra-zone/wasm/view-server';
 import { ServicesInterface, ServicesMessage, WalletServices } from '@penumbra-zone/types/services';
 import type { JsonValue } from '@bufbuild/protobuf';
-import '@penumbra-zone/polyfills/Promise.withResolvers';
 import {
   FullViewingKey,
   WalletId,

diff --git a/packages/services/array-from-async.d.ts b/packages/services/array-from-async.d.ts
diff --git a/packages/services/src/view-service/util/build-tx.ts b/packages/services/src/view-service/util/build-tx.ts
@@ -13,7 +13,6 @@ import {
 import { PartialMessage } from '@bufbuild/protobuf';
 import { ConnectError } from '@connectrpc/connect';
 
-import '@penumbra-zone/polyfills/Promise.withResolvers';
 import { FullViewingKey } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb';
 
 export const optimisticBuild = async function* (
@@ -56,7 +55,7 @@ export const optimisticBuild = async function* (
 
 const progressStream = async function* <T>(tasks: PromiseLike<T>[], cancel: PromiseLike<never>) {
   // deliberately not a 'map' - tasks and promises have no direct relationship.
-  const tasksRemaining = Array.from(tasks, () => Promise.withResolvers());
+  const tasksRemaining = Array.from(tasks, () => Promise.withResolvers<void>());
 
   // tasksRemaining will be consumed in order, as tasks complete in any order.
   tasks.forEach(task => void task.then(() => tasksRemaining.shift()?.resolve()));

diff --git a/packages/transport-dom/array-from-async.d.ts b/packages/transport-dom/array-from-async.d.ts
diff --git a/packages/transport-dom/src/create.ts b/packages/transport-dom/src/create.ts
@@ -25,7 +25,6 @@ import {
 
 import '@penumbra-zone/polyfills/ReadableStream[Symbol.asyncIterator]';
 import ReadableStream from '@penumbra-zone/polyfills/ReadableStream.from';
-import '@penumbra-zone/polyfills/Promise.withResolvers';
 
 const forceTransportOptions = {
   httpClient: null as never,

diff --git a/packages/tsconfig/base.json b/packages/tsconfig/base.json
@@ -23,7 +23,7 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "resolveJsonModule": true,
-    "target": "ES2022",
+    "target": "ESNext",
     "module": "ES2022"
   },
   "exclude": ["node_modules"]

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml