stuff

fullcalendar · Mar 5, 2024 · 095bf68 · 095bf68
1 parent 42dcb53
commit 095bf68
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/packages/temporal-polyfill/package.json b/packages/temporal-polyfill/package.json
@@ -51,11 +51,7 @@
       "./global": {
         "types": "typeOverrides/global",
         "iife": true
-      }
-    }
-  },
-  "disabledBuildConfig": {
-    "export": {
+      },
       "./fns/instant": {
         "src": "funcApi/instant"
       },

diff --git a/packages/temporal-polyfill/scripts/bundle.js b/packages/temporal-polyfill/scripts/bundle.js
@@ -61,6 +61,7 @@ async function buildConfigs(pkgDir, isDev) {
   const chunkNamesEnabled = isDev
   const chunkBase = 'chunks/' + (chunkNamesEnabled ? '[name]' : '[hash]')
   const internalSrcBase = resolvePath(pkgDir, 'dist/.tsc', 'internal') + pathSep
+  const funcApiSrcBase = resolvePath(pkgDir, 'dist/.tsc', 'funcApi') + pathSep
 
   for (const exportPath in exportMap) {
     const exportConfig = exportMap[exportPath]
@@ -136,7 +137,7 @@ async function buildConfigs(pkgDir, isDev) {
         // because temporal-spec/global was being imported from index.
         {
           renderChunk(code) {
-            return code.replace(/^import ['"][^'"]*['"](;|$)/m, '')
+            return code.replace(/^import ['"][^'"]*['"](;|$)/gm, '')
           },
         },
       ],
@@ -146,7 +147,21 @@ async function buildConfigs(pkgDir, isDev) {
         entryFileNames: '[name]' + extensions.dts,
         chunkFileNames: chunkBase + extensions.dts,
         minifyInternalExports: false,
-        manualChunks: manuallyResolveChunk,
+        manualChunks(id) {
+          // HACK to ensure fns/* files own their own stuff
+          if (id.startsWith(funcApiSrcBase)) {
+            const moduleName = id
+              .substring(funcApiSrcBase.length)
+              .replace(/\.d\.ts/, '')
+            if (!moduleName.includes(pathSep)) {
+              return 'fns/' + moduleName
+            }
+          }
+
+          if (id.startsWith(internalSrcBase)) {
+            return 'internal'
+          }
+        },
       },
     })
   }

diff --git a/packages/temporal-polyfill/src/internal/optionsRefine.ts b/packages/temporal-polyfill/src/internal/optionsRefine.ts
@@ -1,3 +1,4 @@
+import { Temporal as TemporalSpec } from 'temporal-spec'
 import {
   requireObjectLike,
   requirePropDefined,
@@ -105,47 +106,47 @@ export interface LargestUnitOptions<UN extends UnitName> {
 }
 
 export interface TotalUnitOptions {
-  unit: UnitName | DurationFieldName
+  unit: UnitName
 }
 
 export type InstantDisplayOptions<TA> = { timeZone?: TA } & TimeDisplayOptions
 
 export type InstantDisplayTuple<TA> = [TA | undefined, ...TimeDisplayTuple]
 
 export interface OverflowOptions {
-  overflow?: keyof typeof overflowMap
+  overflow?: TemporalSpec.AssignmentOptions['overflow']
 }
 
 export interface EpochDisambigOptions {
-  disambiguation?: keyof typeof epochDisambigMap
+  disambiguation?: TemporalSpec.ToInstantOptions['disambiguation']
 }
 
 export interface OffsetDisambigOptions {
-  offset?: keyof typeof offsetDisambigMap
+  offset?: TemporalSpec.OffsetDisambiguationOptions['offset']
 }
 
 export interface CalendarDisplayOptions {
-  calendarName?: keyof typeof calendarDisplayMap
+  calendarName?: TemporalSpec.ShowCalendarOption['calendarName']
 }
 
 export interface TimeZoneDisplayOptions {
-  timeZoneName?: keyof typeof timeZoneDisplayMap
+  timeZoneName?: TemporalSpec.ZonedDateTimeToStringOptions['timeZoneName']
 }
 
 export interface OffsetDisplayOptions {
-  offset?: keyof typeof offsetDisplayMap
+  offset?: TemporalSpec.ZonedDateTimeToStringOptions['offset']
 }
 
 export interface RoundingModeOptions {
-  roundingMode?: keyof typeof roundingModeMap
+  roundingMode?: TemporalSpec.DifferenceOptions<any>['roundingMode']
 }
 
 export interface RoundingIncOptions {
-  roundingIncrement?: number
+  roundingIncrement?: TemporalSpec.DifferenceOptions<any>['roundingIncrement']
 }
 
 export interface SubsecDigitsOptions {
-  fractionalSecondDigits?: SubsecDigits
+  fractionalSecondDigits?: SubsecDigits // TODO: accept 'auto' ?
 }
 
 // Config