manual changes

Turfjs · Nov 17, 2020 · 1d360cc · 1d360cc
1 parent 23d5cb9
commit 1d360cc
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 11 deletions.
diff --git a/.monorepolint.config.ts b/.monorepolint.config.ts
@@ -50,6 +50,7 @@ module.exports = {
           "keywords",
           "main",
           "module",
+          "exports",
           "browser",
           "types",
           "sideEffects",
@@ -75,7 +76,11 @@ module.exports = {
             // Example of a URL that will break: https://unpkg.com/@turf/turf/dist/turf.min.js
             // Example of a URL that will keep working: https://unpkg.com/@turf/turf
             browser: "turf.min.js",
-            files: ["dist", "index.d.ts", "turf.min.js"]
+            files: ["dist", "index.d.ts", "turf.min.js"],
+            exports: {
+              import: "./dist/es/index.js",
+              require: "./dist/js/index.js"
+            }
           }
         },
         includePackages: [MAIN_PACKAGE]
@@ -87,7 +92,11 @@ module.exports = {
             module: "dist/es/index.js",
             sideEffects: false,
             publishConfig: {
-              access: "public"
+              access: "public",
+            },
+            exports: {
+              import: "./dist/es/index.js",
+              require: "./dist/js/index.js"
             }
           }
         },
@@ -131,20 +140,28 @@ module.exports = {
             prepare: "npm-run-all prepare:*",
             "prepare:js": "tsc",
             "prepare:es":
-              "tsc --outDir dist/es --module esnext --declaration false"
+              "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json"
           }
         },
         includePackages: TS_PACKAGES
       },
       {
         options: {
           scripts: {
-            prepare: "rollup -c ../../rollup.config.js",
+            prepare: "rollup -c ../../rollup.config.js && echo '{\"type\":\"module\"}' > dist/es/package.json",
             posttest: "node -r esm ../../scripts/validate-es5-dependencies.js"
           }
         },
         includePackages: JS_PACKAGES
       },
+      {
+        options: {
+          scripts: {
+            prepare: "rollup -c rollup.config.js && echo '{\"type\":\"module\"}' > dist/es/package.json"
+          }
+        },
+        includePackages: [MAIN_PACKAGE]
+      },
       {
         options: {
           scripts: {

diff --git a/packages/turf-along/package.json b/packages/turf-along/package.json
@@ -24,6 +24,10 @@
   ],
   "main": "dist/js/index.js",
   "module": "dist/es/index.js",
+  "exports": {
+    "import": "./dist/es/index.js",
+    "require": "./dist/js/index.js"
+  },
   "types": "dist/js/index.d.ts",
   "sideEffects": false,
   "files": [
@@ -34,7 +38,7 @@
     "bench:run": "node bench.js",
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "npm-run-all prepare:*",
-    "prepare:es": "tsc --outDir dist/es --module esnext --declaration false",
+    "prepare:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
     "prepare:js": "tsc",
     "test": "npm-run-all prepare test:*",
     "test:tape": "node -r esm test.js"

diff --git a/packages/turf-angle/package.json b/packages/turf-angle/package.json
@@ -24,6 +24,10 @@
   ],
   "main": "dist/js/index.js",
   "module": "dist/es/index.js",
+  "exports": {
+    "import": "./dist/es/index.js",
+    "require": "./dist/js/index.js"
+  },
   "types": "dist/js/index.d.ts",
   "sideEffects": false,
   "files": [
@@ -34,7 +38,7 @@
     "bench:run": "node bench.js",
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "npm-run-all prepare:*",
-    "prepare:es": "tsc --outDir dist/es --module esnext --declaration false",
+    "prepare:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
     "prepare:js": "tsc",
     "test": "npm-run-all prepare test:*",
     "test:tape": "node -r esm test.js"

diff --git a/packages/turf-area/package.json b/packages/turf-area/package.json
@@ -23,6 +23,10 @@
   ],
   "main": "dist/js/index.js",
   "module": "dist/es/index.js",
+  "exports": {
+    "import": "./dist/es/index.js",
+    "require": "./dist/js/index.js"
+  },
   "types": "dist/js/index.d.ts",
   "sideEffects": false,
   "files": [
@@ -33,7 +37,7 @@
     "bench:run": "node bench.js",
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "npm-run-all prepare:*",
-    "prepare:es": "tsc --outDir dist/es --module esnext --declaration false",
+    "prepare:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
     "prepare:js": "tsc",
     "test": "npm-run-all prepare test:*",
     "test:tape": "node -r esm test.js"

diff --git a/packages/turf-bbox-clip/package.json b/packages/turf-bbox-clip/package.json
@@ -29,6 +29,10 @@
   ],
   "main": "dist/js/index.js",
   "module": "dist/es/index.js",
+  "exports": {
+    "import": "./dist/es/index.js",
+    "require": "./dist/js/index.js"
+  },
   "types": "dist/js/index.d.ts",
   "sideEffects": false,
   "files": [
@@ -39,7 +43,7 @@
     "bench:run": "node bench.js",
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "npm-run-all prepare:*",
-    "prepare:es": "tsc --outDir dist/es --module esnext --declaration false",
+    "prepare:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
     "prepare:js": "tsc",
     "test": "npm-run-all prepare test:*",
     "test:tape": "node -r esm test.js"

diff --git a/packages/turf-bbox-polygon/package.json b/packages/turf-bbox-polygon/package.json
@@ -24,6 +24,10 @@
   ],
   "main": "dist/js/index.js",
   "module": "dist/es/index.js",
+  "exports": {
+    "import": "./dist/es/index.js",
+    "require": "./dist/js/index.js"
+  },
   "types": "dist/js/index.d.ts",
   "sideEffects": false,
   "files": [
@@ -34,7 +38,7 @@
     "bench:run": "node bench.js",
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "npm-run-all prepare:*",
-    "prepare:es": "tsc --outDir dist/es --module esnext --declaration false",
+    "prepare:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
     "prepare:js": "tsc",
     "test": "npm-run-all prepare test:*",
     "test:tape": "node -r esm test.js"

diff --git a/scripts/create-new-module b/scripts/create-new-module
@@ -62,7 +62,7 @@ fs.writeFileSync(path.join(folderPath, 'package.json'), `{
     "main.es.js"
   ],
   "scripts": {
-    "pretest": "rollup -c ../../rollup.config.js",
+    "pretest": "rollup -c ../../rollup.config.js && echo '{"type":"module"}' > dist/es/package.json",
     "test": "node -r @std/esm test.js",
     "posttest": "node -r @std/esm ../../scripts/validate-es5-dependencies.js",
     "bench": "node -r @std/esm bench.js",

diff --git a/scripts/set-uniforms b/scripts/set-uniforms
@@ -24,7 +24,7 @@ glob.sync(path.join(__dirname, '..', 'packages', 'turf-*', 'package.json')).forE
         types: 'index.d.ts',
         files: [...files],
         scripts: {
-            'pretest': 'rollup -c ../../rollup.config.js',
+            'pretest': 'rollup -c ../../rollup.config.js && echo \'{"type":"module"}\' > dist/es/package.json',
             'test': 'node -r @std/esm test.js',
             'posttest': 'node -r @std/esm ../../scripts/validate-es5-dependencies.js',
             'bench': 'node -r @std/esm bench.js',