Build Standardization (Turfjs#1860)

- Enforce some TS configurations that we already standardized - Standardize rollup builds to put artifacts under dist - Standardize test scripts with tape and tsc testing - Small bench/test fixes - Standardize packages/turf builds - Move turf-difference and turf-meta from index.mjs to index.js Co-authored-by: Matt Fedderly <[email protected]>
mglasgow · Mar 17, 2020 · 878a1d3 · 878a1d3
1 parent 0239428
commit 878a1d3
Show file tree

Hide file tree

Showing 202 changed files with 505 additions and 470 deletions.
diff --git a/.monorepolint.config.ts b/.monorepolint.config.ts
@@ -32,6 +32,78 @@ glob.sync(path.join(__dirname, "packages", "turf-*")).forEach(pk => {
 
 module.exports = {
   rules: {
-    ":alphabetical-scripts": {}
+    ":alphabetical-scripts": {},
+
+    ":package-entry": [
+      {
+        options: {
+          entries: {
+            main: "dist/js/index.js",
+            types: "dist/js/index.d.ts",
+            files: ["dist"]
+          }
+        },
+        includePackages: TS_PACKAGES
+      },
+      {
+        options: {
+          entries: {
+            main: "dist/js/index.js",
+            module: "dist/es/index.js",
+            types: "index.d.ts",
+            files: ["dist", "index.d.ts"]
+          }
+        },
+        includePackages: JS_PACKAGES
+      }
+    ],
+
+    ":package-script": [
+      {
+        options: {
+          scripts: {
+            bench: "npm-run-all prepare bench:run",
+            "bench:run": "node bench.js",
+            docs: "node ../../scripts/generate-readmes",
+            prepare: "tsc",
+            pretest: "tsc"
+          }
+        },
+        includePackages: TS_PACKAGES
+      },
+      {
+        options: {
+          scripts: {
+            pretest: "rollup -c ../../rollup.config.js",
+            posttest: "node -r esm ../../scripts/validate-es5-dependencies.js"
+          }
+        },
+        includePackages: JS_PACKAGES
+      },
+      {
+        options: {
+          scripts: {
+            "test:tape": "node -r esm test.js"
+          }
+        },
+        includePackages: TAPE_PACKAGES
+      },
+      {
+        options: {
+          scripts: {
+            "test:types": "tsc --noEmit types.ts"
+          }
+        },
+        includePackages: TYPES_PACKAGES
+      },
+      {
+        options: {
+          scripts: {
+            test: "npm-run-all test:*"
+          }
+        },
+        excludePackages: [MAIN_PACKAGE]
+      }
+    ]
   }
 };
diff --git a/packages/turf-along/package.json b/packages/turf-along/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-angle/package.json b/packages/turf-angle/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-area/package.json b/packages/turf-area/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-bbox-clip/package.json b/packages/turf-bbox-clip/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-bbox-polygon/package.json b/packages/turf-bbox-polygon/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-bbox/package.json b/packages/turf-bbox/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-bearing/package.json b/packages/turf-bearing/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-bezier-spline/package.json b/packages/turf-bezier-spline/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-boolean-clockwise/package.json b/packages/turf-boolean-clockwise/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-boolean-concave/package.json b/packages/turf-boolean-concave/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-boolean-contains/package.json b/packages/turf-boolean-contains/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-boolean-crosses/package.json b/packages/turf-boolean-crosses/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-boolean-disjoint/package.json b/packages/turf-boolean-disjoint/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-boolean-equal/package.json b/packages/turf-boolean-equal/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-boolean-intersects/package.json b/packages/turf-boolean-intersects/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-boolean-overlap/package.json b/packages/turf-boolean-overlap/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-boolean-parallel/package.json b/packages/turf-boolean-parallel/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-boolean-point-in-polygon/package.json b/packages/turf-boolean-point-in-polygon/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-boolean-point-on-line/package.json b/packages/turf-boolean-point-on-line/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-boolean-touches/package.json b/packages/turf-boolean-touches/package.json
@@ -13,7 +13,7 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "npm-run-all test:tape test:types",
+    "test": "npm-run-all test:*",
     "test:tape": "node -r esm test.js",
     "test:types": "tsc --noEmit types.ts"
   },

diff --git a/packages/turf-boolean-valid/package.json b/packages/turf-boolean-valid/package.json
@@ -5,16 +5,16 @@
   "main": "dist/js/index.js",
   "types": "dist/js/index.d.ts",
   "files": [
-    "dist/js/index.js",
-    "dist/js/index.d.ts"
+    "dist"
   ],
   "scripts": {
     "bench": "npm-run-all prepare bench:run",
     "bench:run": "node bench.js",
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-boolean-within/package.json b/packages/turf-boolean-within/package.json
@@ -13,7 +13,7 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "npm-run-all test:tape test:types",
+    "test": "npm-run-all test:*",
     "test:tape": "node -r esm test.js",
     "test:types": "tsc --noEmit types.ts"
   },

diff --git a/packages/turf-buffer/bench.js b/packages/turf-buffer/bench.js
@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import load from 'load-json-file';
 import Benchmark from 'benchmark';
-import buffer from './';
+import buffer from './dist/js/index.js';
 
 const directory = path.join(__dirname, 'test', 'in') + path.sep;
 const fixtures = fs.readdirSync(directory).map(filename => {

diff --git a/packages/turf-buffer/package.json b/packages/turf-buffer/package.json
@@ -2,21 +2,19 @@
   "name": "@turf/buffer",
   "version": "5.1.5",
   "description": "turf buffer module",
-  "main": "main.js",
-  "module": "main.es.js",
+  "main": "dist/js/index.js",
+  "module": "dist/es/index.js",
   "types": "index.d.ts",
   "files": [
-    "index.js",
-    "index.d.ts",
-    "main.js",
-    "main.es.js"
+    "dist",
+    "index.d.ts"
   ],
   "scripts": {
     "bench": "node -r esm bench.js",
     "docs": "node ../../scripts/generate-readmes",
     "posttest": "node -r esm ../../scripts/validate-es5-dependencies.js",
     "pretest": "rollup -c ../../rollup.config.js",
-    "test": "npm-run-all test:tape test:types",
+    "test": "npm-run-all test:*",
     "test:tape": "node -r esm test.js",
     "test:types": "tsc --noEmit types.ts"
   },

diff --git a/packages/turf-buffer/test.js b/packages/turf-buffer/test.js
@@ -6,7 +6,7 @@ import write from 'write-json-file';
 import truncate from '@turf/truncate';
 import { featureEach } from '@turf/meta';
 import { featureCollection, point, polygon, geometryCollection } from '@turf/helpers';
-import buffer from '.';
+import buffer from './dist/js/index.js';
 
 const directories = {
     in: path.join(__dirname, 'test', 'in') + path.sep,

diff --git a/packages/turf-center-mean/package.json b/packages/turf-center-mean/package.json
@@ -13,7 +13,7 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "npm-run-all test:tape test:types",
+    "test": "npm-run-all test:*",
     "test:tape": "node -r esm test.js",
     "test:types": "tsc --noEmit types.ts"
   },

diff --git a/packages/turf-center-median/package.json b/packages/turf-center-median/package.json
@@ -13,7 +13,8 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "node test.js"
+    "test": "npm-run-all test:*",
+    "test:tape": "node -r esm test.js"
   },
   "repository": {
     "type": "git",

diff --git a/packages/turf-center-of-mass/package.json b/packages/turf-center-of-mass/package.json
@@ -13,7 +13,7 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "npm-run-all test:tape test:types",
+    "test": "npm-run-all test:*",
     "test:tape": "node -r esm test.js",
     "test:types": "tsc --noEmit types.ts"
   },

diff --git a/packages/turf-center/package.json b/packages/turf-center/package.json
@@ -13,7 +13,7 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "npm-run-all test:tape test:types",
+    "test": "npm-run-all test:*",
     "test:tape": "node -r esm test.js",
     "test:types": "tsc --noEmit types.ts"
   },

diff --git a/packages/turf-centroid/package.json b/packages/turf-centroid/package.json
@@ -13,7 +13,7 @@
     "docs": "node ../../scripts/generate-readmes",
     "prepare": "tsc",
     "pretest": "tsc",
-    "test": "npm-run-all test:tape test:types",
+    "test": "npm-run-all test:*",
     "test:tape": "node -r esm test.js",
     "test:types": "tsc --noEmit types.ts"
   },