Merge branch 'master' into master

.monorepolint.config.ts

@@ -32,13 +32,70 @@ glob.sync(path.join(__dirname, "packages", "turf-*")).forEach(pk => {
 
 module.exports = {
   rules: {
+    ":package-order": {
+      options: {
+        order: [
+          "name",
+          "version",
+          "private",
+          "description",
+          "workspaces",
+          "author",
+          "contributors",
+          "license",
+          "bugs",
+          "homepage",
+          "repository",
+          "publishConfig",
+          "keywords",
+          "main",
+          "module",
+          "browser",
+          "types",
+          "sideEffects",
+          "files",
+          "scripts",
+          "husky",
+          "lint-staged",
+          "devDependencies",
+          "dependencies"
+        ]
+      },
+      includeWorkspaceRoot: true
+    },
+
     ":alphabetical-scripts": {},
 
     ":package-entry": [
+      {
+        options: {
+          entries: {
+            // @turf/turf is commonly consumed through CDNs, moving this output file is a breaking change for anyone
+            // who has a hardcoded reference to this specific file, instead of letting the CDN pick the path.
+            // 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"]
+          }
+        },
+        includePackages: [MAIN_PACKAGE]
+      },
       {
         options: {
           entries: {
             main: "dist/js/index.js",
+            module: "dist/es/index.js",
+            sideEffects: false,
+            publishConfig: {
+              access: "public"
+            }
+          }
+        },
+        includePackages: [...TS_PACKAGES, ...JS_PACKAGES]
+      },
+      {
+        options: {
+          entries: {
             types: "dist/js/index.d.ts",
             files: ["dist"]
           }
@@ -48,8 +105,6 @@ module.exports = {
       {
         options: {
           entries: {
-            main: "dist/js/index.js",
-            module: "dist/es/index.js",
             types: "index.d.ts",
             files: ["dist", "index.d.ts"]
           }
@@ -65,16 +120,26 @@ module.exports = {
             bench: "npm-run-all prepare bench:run",
             "bench:run": "node bench.js",
             docs: "node ../../scripts/generate-readmes",
-            prepare: "tsc",
-            pretest: "tsc"
+            test: "npm-run-all prepare test:*"
+          }
+        },
+        excludePackages: [MAIN_PACKAGE]
+      },
+      {
+        options: {
+          scripts: {
+            prepare: "npm-run-all prepare:*",
+            "prepare:js": "tsc",
+            "prepare:es":
+              "tsc --outDir dist/es --module esnext --declaration false"
           }
         },
         includePackages: TS_PACKAGES
       },
       {
         options: {
           scripts: {
-            pretest: "rollup -c ../../rollup.config.js",
+            prepare: "rollup -c ../../rollup.config.js",
             posttest: "node -r esm ../../scripts/validate-es5-dependencies.js"
           }
         },
@@ -95,14 +160,37 @@ module.exports = {
           }
         },
         includePackages: TYPES_PACKAGES
+      }
+    ],
+
+    ":alphabetical-dependencies": {
+      includeWorkspaceRoot: true
+    },
+
+    ":require-dependency": [
+      {
+        options: {
+          devDependencies: {
+            "npm-run-all": "*"
+          }
+        },
+        includePackages: [...TS_PACKAGES, ...JS_PACKAGES]
       },
       {
         options: {
-          scripts: {
-            test: "npm-run-all test:*"
+          devDependencies: {
+            typescript: "*"
           }
         },
-        excludePackages: [MAIN_PACKAGE]
+        includePackages: TS_PACKAGES
+      },
+      {
+        options: {
+          devDependencies: {
+            rollup: "*"
+          }
+        },
+        includePackages: JS_PACKAGES
       }
     ]
   }

CHANGELOG.md

@@ -1,3 +1,53 @@
+# 6.2.0-alpha.1
+
+After a bit of hiatus, TurfJS is resuming releases.
+
+## ⭐️ Major Updates
+
+- ES Modules available for all packages
+- Tree shaking should significantly reduce import size of @turf/turf
+
+## New Modules
+
+### [`@turf/boolean-touches`][boolean-touches]
+
+Determines if two features touch but do not intersect
+
+### [`@turf/boolean-valid`][boolean-valid]
+
+Checks if the geometry is a valid according to the OGC Simple Feature Specification
+
+### [`@turf/quadrat-analysis`][quadrat-analysis]
+
+Performs a quadrat analysis on a set of points
+
+### [`@turf/rectangle-grid`][rectangle-grid]
+
+Creates a grid of rectangles from a bounding box
+
+## [`@turf/voroni`][voronoi]
+
+Typescript types for the options parameter have been fixed
+(PR https://github.com/Turfjs/turf/pull/1424 - Author @stevage)
+
+## [`@turf/points-within-polygon`][points-within-polygon]
+
+Typescript types around the Feature's Properties will now be preserved.
+(PR https://github.com/Turfjs/turf/pull/1761 - Author @rugheid)
+
+## [`@turf/rewind`][rewind]
+
+Typescript types for the 'reverse' option are now correct. Previously it was misnamed as 'reversed'.
+(PR https://github.com/Turfjs/turf/pull/1786 - Author @jonnycornwell)
+
+## [`@turf/difference`][difference]
+
+No longer publishes an .mjs file.
+
+## [`@turf/meta`][meta]
+
+No longer publishes an .mjs file.
+
 # 5.0.0 🎉
 
 ## ⭐️ Major Updates

lerna.json

@@ -1,9 +1,12 @@
 {
-  "lerna": "2.8.0",
   "packages": [
     "packages/*"
   ],
-  "version": "independent",
+  "command": {
+    "publish": {
+      "registry": "https://registry.npmjs.org"
+    }
+  },
   "npmClient": "yarn",
-  "useWorkspaces": true
+  "version": "6.2.0-alpha.1"
 }

package.json

@@ -7,7 +7,7 @@
     "lint": "echo 'eslint will be moved to TSLint'",
     "postlint": "documentation lint packages/turf-*/index.js",
     "pretest": "lerna bootstrap --use-workspaces && npm run lint",
-    "test": "lerna run test --use-workspaces",
+    "test": "lerna run test",
     "posttest": "lerna run --scope @turf/turf last-checks",
     "docs": "node ./scripts/generate-readmes",
     "postinstall": "opencollective postinstall"
@@ -34,11 +34,11 @@
     "esm": "^3.2.25",
     "fs-extra": "*",
     "husky": "^4.2.3",
-    "lerna": "2.8.0",
+    "lerna": "^3.20.2",
     "lint-staged": "^10.0.8",
     "load-json-file": "*",
     "meow": "*",
-    "monorepolint": "^0.5.0-alpha.17",
+    "monorepolint": "^0.5.0-alpha.20",
     "npm-run-all": "^4.1.5",
     "progress": "*",
     "rollup": "*",

packages/turf-along/package.json

@@ -1,51 +1,58 @@
 {
   "name": "@turf/along",
-  "version": "6.1.0",
+  "version": "6.2.0-alpha.1",
   "description": "turf along module",
-  "main": "dist/js/index.js",
-  "types": "dist/js/index.d.ts",
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "bench": "npm-run-all prepare bench:run",
-    "bench:run": "node bench.js",
-    "docs": "node ../../scripts/generate-readmes",
-    "prepare": "tsc",
-    "pretest": "tsc",
-    "test": "npm-run-all test:*",
-    "test:tape": "node -r esm test.js"
+  "author": "Turf Authors",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/Turfjs/turf/issues"
   },
+  "homepage": "https://github.com/Turfjs/turf",
   "repository": {
     "type": "git",
     "url": "git://github.com/Turfjs/turf.git"
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "keywords": [
     "along",
     "line",
     "linestring",
     "turf",
     "distance"
   ],
-  "author": "Turf Authors",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/Turfjs/turf/issues"
+  "main": "dist/js/index.js",
+  "module": "dist/es/index.js",
+  "types": "dist/js/index.d.ts",
+  "sideEffects": false,
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "bench": "npm-run-all prepare bench:run",
+    "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:js": "tsc",
+    "test": "npm-run-all prepare test:*",
+    "test:tape": "node -r esm test.js"
   },
-  "homepage": "https://github.com/Turfjs/turf",
   "devDependencies": {
     "@types/tape": "*",
     "benchmark": "*",
     "load-json-file": "*",
+    "npm-run-all": "*",
     "tape": "*",
     "tslint": "*",
     "typescript": "*"
   },
   "dependencies": {
-    "@turf/bearing": "6.x",
-    "@turf/destination": "6.x",
-    "@turf/distance": "6.x",
-    "@turf/helpers": "6.x",
-    "@turf/invariant": "6.x"
+    "@turf/bearing": "^6.2.0-alpha.1",
+    "@turf/destination": "^6.2.0-alpha.1",
+    "@turf/distance": "^6.2.0-alpha.1",
+    "@turf/helpers": "^6.2.0-alpha.1",
+    "@turf/invariant": "^6.2.0-alpha.1"
   }
 }