Node.js ESM; full import paths and exports in package.json

package.json

@@ -19,9 +19,40 @@
   "engine": {
     "node": ">= 0.11"
   },
+  "type": "commonjs",
   "main": "index.js",
   "module": "esm/index.js",
   "types": "typings.d.ts",
+  "exports": {
+    ".": "./index.js",
+    "./format": "./format/index.js",
+    "./formatInTimeZone": "./formatInTimeZone/index.js",
+    "./getTimezoneOffset": "./getTimezoneOffset/index.js",
+    "./toDate": "./toDate/index.js",
+    "./utcToZonedTime": "./utcToZonedTime/index.js",
+    "./zonedTimeToUtc": "./zonedTimeToUtc/index.js",
+    "./fp": "./fp/index.js",
+    "./fp/format": "./fp/format/index.js",
+    "./fp/formatInTimeZone": "./fp/formatInTimeZone/index.js",
+    "./fp/getTimezoneOffset": "./fp/getTimezoneOffset/index.js",
+    "./fp/toDate": "./fp/toDate/index.js",
+    "./fp/utcToZonedTime": "./fp/utcToZonedTime/index.js",
+    "./fp/zonedTimeToUtc": "./fp/zonedTimeToUtc/index.js",
+    "./esm": "./esm/index.js",
+    "./esm/format": "./esm/format/index.js",
+    "./esm/formatInTimeZone": "./esm/formatInTimeZone/index.js",
+    "./esm/getTimezoneOffset": "./esm/getTimezoneOffset/index.js",
+    "./esm/toDate": "./esm/toDate/index.js",
+    "./esm/utcToZonedTime": "./esm/utcToZonedTime/index.js",
+    "./esm/zonedTimeToUtc": "./esm/zonedTimeToUtc/index.js",
+    "./esm/fp": "./esm/fp/index.js",
+    "./esm/fp/format": "./esm/fp/format/index.js",
+    "./esm/fp/formatInTimeZone": "./esm/fp/formatInTimeZone/index.js",
+    "./esm/fp/getTimezoneOffset": "./esm/fp/getTimezoneOffset/index.js",
+    "./esm/fp/toDate": "./esm/fp/toDate/index.js",
+    "./esm/fp/utcToZonedTime": "./esm/fp/utcToZonedTime/index.js",
+    "./esm/fp/zonedTimeToUtc": "./esm/fp/zonedTimeToUtc/index.js"
+  },
   "scripts": {
     "build": "./scripts/build/build.sh",
     "package": "./scripts/build/package.sh",

scripts/build/package.sh

@@ -59,13 +59,14 @@ done
 find "$dir" -type f -name "test.js" -delete
 find "$dir" -type f -name "benchmark.js" -delete
 
-# Clean up package.json pointing to the modules
-find "$dir/esm" -type f -name "package.json" -delete
+# Copy esm package.json
+cp ./src/esm/package.json "$dir/esm/package.json"
 
 # Rewrite import paths to use esm version of date-fns
-for fnFile in $(find $dir/esm -maxdepth 3 -mindepth 2 -type f -name index.js)
-do
-  sed -i "s/from 'date-fns/from 'date-fns\/esm/" "$fnFile"
-done
+# todo Restore once date-fns supports ESM: https://github.com/date-fns/date-fns/issues/1781
+# for fnFile in $(find $dir/esm -maxdepth 3 -mindepth 2 -type f -name index.js)
+# do
+#   sed -i "s/from 'date-fns/from 'date-fns\/esm/" "$fnFile"
+# done
 
 ./scripts/build/packages.js

scripts/build/packages.js

@@ -26,13 +26,21 @@ function writePackage(fullPath) {
   const dirPath = path.dirname(fullPath)
   const typingsRelativePath = path.relative(dirPath, `./src/typings.d.ts`)
   const packagePath = path.resolve(rootPath, `${dirPath.replace('./src/', './')}/package.json`)
+  const isESM = packagePath.includes('esm')
 
   return writeFile(
     packagePath,
     JSON.stringify(
-      Object.assign({ sideEffects: false }, initialPackages[fullPath] || {}, {
-        typings: typingsRelativePath,
-      }),
+      Object.assign(
+        {
+          sideEffects: false,
+          type: isESM ? 'module' : 'commonjs',
+        },
+        initialPackages[fullPath] || {},
+        {
+          typings: typingsRelativePath,
+        }
+      ),
       null,
       2
     )

src/esm/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

src/format/formatters/index.js

@@ -1,5 +1,5 @@
-import tzIntlTimeZoneName from '../../_lib/tzIntlTimeZoneName'
-import tzParseTimezone from '../../_lib/tzParseTimezone'
+import tzIntlTimeZoneName from '../../_lib/tzIntlTimeZoneName/index.js'
+import tzParseTimezone from '../../_lib/tzParseTimezone/index.js'
 
 var MILLISECONDS_IN_MINUTE = 60 * 1000
 

src/format/index.js

@@ -1,6 +1,6 @@
-import dateFnsFormat from 'date-fns/format'
-import formatters from './formatters'
-import toDate from '../toDate'
+import dateFnsFormat from 'date-fns/format/index.js'
+import formatters from './formatters/index.js'
+import toDate from '../toDate/index.js'
 
 var tzFormattingTokensRegExp = /([xXOz]+)|''|'(''|[^'])+('|$)/g
 

src/formatInTimeZone/index.js

@@ -1,6 +1,6 @@
-import cloneObject from 'date-fns/_lib/cloneObject'
-import format from '../format'
-import utcToZonedTime from '../utcToZonedTime'
+import cloneObject from 'date-fns/_lib/cloneObject/index.js'
+import format from '../format/index.js'
+import utcToZonedTime from '../utcToZonedTime/index.js'
 
 /**
  * @name formatInTimeZone

src/getTimezoneOffset/index.js

@@ -1,4 +1,4 @@
-import tzParseTimezone from '../_lib/tzParseTimezone'
+import tzParseTimezone from '../_lib/tzParseTimezone/index.js'
 
 /**
  * @name getTimezoneOffset

src/toDate/index.js

@@ -1,7 +1,7 @@
 import toInteger from 'date-fns/_lib/toInteger/index.js'
 import getTimezoneOffsetInMilliseconds from 'date-fns/_lib/getTimezoneOffsetInMilliseconds/index.js'
-import tzParseTimezone from '../_lib/tzParseTimezone'
-import tzPattern from '../_lib/tzPattern'
+import tzParseTimezone from '../_lib/tzParseTimezone/index.js'
+import tzPattern from '../_lib/tzPattern/index.js'
 
 var MILLISECONDS_IN_HOUR = 3600000
 var MILLISECONDS_IN_MINUTE = 60000

src/utcToZonedTime/index.js

@@ -1,5 +1,5 @@
-import tzParseTimezone from '../_lib/tzParseTimezone'
-import toDate from '../toDate'
+import tzParseTimezone from '../_lib/tzParseTimezone/index.js'
+import toDate from '../toDate/index.js'
 
 /**
  * @name utcToZonedTime

src/zonedTimeToUtc/index.js

@@ -1,7 +1,7 @@
-import cloneObject from 'date-fns/_lib/cloneObject'
-import toDate from '../toDate'
-import tzPattern from '../_lib/tzPattern'
-import tzParseTimezone from '../_lib/tzParseTimezone'
+import cloneObject from 'date-fns/_lib/cloneObject/index.js'
+import toDate from '../toDate/index.js'
+import tzPattern from '../_lib/tzPattern/index.js'
+import tzParseTimezone from '../_lib/tzParseTimezone/index.js'
 
 /**
  * @name zonedTimeToUtc