Skip to content

Commit 44a9ee6

Browse files
committed
Fix @turf/turf
1 parent 9d45647 commit 44a9ee6

9 files changed

+2172
-96
lines changed

.monorepolint.config.ts

+2-9
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,6 @@ module.exports = {
9393
// Example of a URL that will keep working: https://unpkg.com/@turf/turf
9494
browser: "turf.min.js",
9595
files: ["dist", "index.d.ts", "turf.min.js"],
96-
exports: {
97-
"./package.json": "./package.json",
98-
".": {
99-
import: "./dist/es/index.js",
100-
require: "./dist/js/index.js",
101-
},
102-
},
10396
},
10497
},
10598
includePackages: [MAIN_PACKAGE],
@@ -130,7 +123,7 @@ module.exports = {
130123
},
131124
},
132125
},
133-
includePackages: [...TS_PACKAGES, ...JS_PACKAGES],
126+
includePackages: [MAIN_PACKAGE, ...TS_PACKAGES, ...JS_PACKAGES],
134127
},
135128
{
136129
options: {
@@ -163,7 +156,7 @@ module.exports = {
163156
options: {
164157
scripts: {
165158
build:
166-
'rollup -c rollup.config.js && echo \'{"type":"module"}\' > dist/es/package.json',
159+
"tsup --config ../../tsup.config.ts && rollup -c ./rollup.config.js",
167160
},
168161
},
169162
includePackages: [MAIN_PACKAGE],

packages/turf/babel.config.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"presets": [
3+
[
4+
"@babel/preset-env",
5+
{
6+
"targets": "> 0.25%, last 2 versions, fully supports es5, not dead"
7+
}
8+
]
9+
]
10+
}
File renamed without changes.

packages/turf/package.json

+27-13
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,22 @@
4343
"jenks",
4444
"sample"
4545
],
46-
"main": "dist/js/index.js",
47-
"module": "dist/es/index.js",
48-
"types": "index.d.ts",
46+
"type": "commonjs",
47+
"main": "dist/cjs/index.js",
48+
"module": "dist/esm/index.mjs",
49+
"types": "dist/cjs/index.d.ts",
4950
"browser": "turf.min.js",
5051
"exports": {
5152
"./package.json": "./package.json",
5253
".": {
53-
"import": "./dist/es/index.js",
54-
"require": "./dist/js/index.js"
54+
"import": {
55+
"types": "./dist/esm/index.d.mts",
56+
"default": "./dist/esm/index.mjs"
57+
},
58+
"require": {
59+
"types": "./dist/cjs/index.d.ts",
60+
"default": "./dist/cjs/index.js"
61+
}
5562
}
5663
},
5764
"sideEffects": false,
@@ -61,22 +68,29 @@
6168
"turf.min.js"
6269
],
6370
"scripts": {
64-
"build": "rollup -c rollup.config.js && echo '{\"type\":\"module\"}' > dist/es/package.json",
71+
"build": "tsup --config ../../tsup.config.ts && rollup -c ./rollup.config.js",
6572
"last-checks": "npm-run-all last-checks:testjs last-checks:example",
6673
"last-checks:example": "node test.example.js",
6774
"last-checks:testjs": "node test.js",
6875
"test": "echo '@turf/turf tests run in the last-checks step'"
6976
},
7077
"devDependencies": {
71-
"@rollup/plugin-commonjs": "^17.0.0",
72-
"@rollup/plugin-node-resolve": "^11.0.0",
73-
"camelcase": "*",
78+
"@babel/core": "^7.23.2",
79+
"@babel/preset-env": "^7.23.2",
80+
"@rollup/plugin-babel": "^6.0.4",
81+
"@rollup/plugin-commonjs": "^25.0.7",
82+
"@rollup/plugin-node-resolve": "^15.2.3",
83+
"@rollup/plugin-terser": "^0.4.4",
84+
"@types/tape": "^4.2.32",
85+
"camelcase": "^8.0.0",
7486
"documentation": "^13.2.5",
75-
"glob": "*",
76-
"rollup": "^2.34.2",
87+
"glob": "^10.3.10",
88+
"rollup": "^2.79.1",
89+
"rollup-plugin-polyfill-node": "^0.13.0",
7790
"rollup-plugin-terser": "^7.0.2",
78-
"tape": "*",
79-
"tsup": "^8.0.1"
91+
"tape": "^5.7.2",
92+
"tsup": "^8.0.1",
93+
"typescript": "^5.2.2"
8094
},
8195
"dependencies": {
8296
"@turf/along": "^6.5.0",

packages/turf/rollup.config.js

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
import node from "@rollup/plugin-node-resolve";
1+
import nodeResolve from "@rollup/plugin-node-resolve";
22
import commonjs from "@rollup/plugin-commonjs";
3-
import { terser } from "rollup-plugin-terser";
4-
import base from "../../rollup.config";
3+
import terser from "@rollup/plugin-terser";
4+
import { babel } from "@rollup/plugin-babel";
5+
import nodePolyfills from "rollup-plugin-polyfill-node";
56

67
const pckg = require("./package.json");
7-
const input = "index.mjs";
8+
const input = "index.ts";
89

910
export default [
10-
{ ...base, input },
1111
{
1212
input,
1313
output: [{ file: pckg.browser, format: "umd", name: "turf" }],
14-
plugins: [commonjs(), node(), terser()],
14+
plugins: [
15+
commonjs(),
16+
nodeResolve(),
17+
nodePolyfills(),
18+
babel({ babelHelpers: "bundled" }),
19+
terser(),
20+
],
1521
},
1622
];

packages/turf/test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const glob = require("glob");
44
const test = require("tape");
55
const camelcase = require("camelcase");
66
const documentation = require("documentation");
7-
const turf = require("./dist/js/index.js");
7+
const turf = require("./dist/cjs/index.js");
88

99
// Helpers
1010
const directory = path.join(__dirname, "..");

packages/turf/tsconfig.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "../../tsconfig.shared.json"
3+
}

rollup.config.js

-10
This file was deleted.

0 commit comments

Comments
 (0)