Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to yarn v4 #2551

Closed
wants to merge 11 commits into from
Closed

Upgrade to yarn v4 #2551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
38b0075
Initial commit after installing modern yarn and regenerating yarn.lock
smallsaucepan Nov 11, 2023
2955479
Adding some files to ignore as per https://yarnpkg.com/getting-starte…
smallsaucepan Nov 11, 2023
361e7d7
Needed to add quotes to build and test npm-run-all scripts. lerna run…
smallsaucepan Nov 11, 2023
1c85a58
Syncing yarn.lock with a few dependency changes made since starting t…
smallsaucepan Dec 2, 2023
573ede9
Yarn flag --frozen-lockfile used in github action has been changed to…
smallsaucepan Dec 2, 2023
67aaa59
Adding single quotes around glob uses of npm-run-all. Modern yarn doe…
smallsaucepan Dec 4, 2023
eef7488
Simplifying if statement that always resolves to true. Fixes #2462
smallsaucepan Dec 4, 2023
533eaad
Updating and committing yarn.lock after merging upstream commits.
smallsaucepan Dec 5, 2023
8a6c85b
Shouldn't be committing yarn install-state.gz. git configured to igno…
smallsaucepan Dec 5, 2023
73753da
Adding 'corepack enable' to github build workflow as it's as environm…
smallsaucepan Dec 7, 2023
8561f29
Not the way to enable corepack. Trying as a config option on actions/…
smallsaucepan Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/turf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
corepack: true
cache: "yarn"

- run: yarn --frozen-lockfile
- run: yarn --immutable
- run: git diff --exit-code
- run: yarn prepare
- run: yarn test
8 changes: 8 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,11 @@ npm-debug.log*
node_modules

.vscode

.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
4 changes: 2 additions & 2 deletions .monorepolint.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,15 @@ module.exports = {
options: {
scripts: {
docs: "tsx ../../scripts/generate-readmes.ts",
test: "npm-run-all --npm-path npm test:*",
test: "npm-run-all --npm-path npm 'test:*'",
},
},
excludePackages: [MAIN_PACKAGE],
},
{
options: {
scripts: {
build: "npm-run-all --npm-path npm build:*",
build: "npm-run-all --npm-path npm 'build:*'",
"build:js": "tsc",
"build:es":
'tsc --outDir dist/es --module esnext --declaration false && echo \'{"type":"module"}\' > dist/es/package.json',
Expand Down
1 change: 1 addition & 0 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
18 changes: 8 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,15 @@
],
"funding": "https://opencollective.com/turf",
"scripts": {
"lint": "npm-run-all lint:*",
"lint": "npm-run-all 'lint:*' && documentation lint packages/turf-*/index.js",
"lint:eslint": "eslint packages",
"lint:prettier": "prettier --check .",
"lint:mrl": "mrl check",
"lint:escheck-require": "es-check es8 packages/*/dist/js/index.js packages/turf/turf.min.js",
"lint:escheck-esm": "es-check --module es8 packages/*/dist/es/index.js",
"lint:escheck-es5": "es-check es5 packages/turf/turf.min.js",
"postlint": "documentation lint packages/turf-*/index.js",
"lint:mrl": "npx mrl check",
"lint:escheck-cjs": "es-check es8 packages/*/dist/js/index.js packages/turf/turf.min.js",
"lint:escheck-esm": "es-check es8 --module packages/*/dist/es/index.js",
"lint:escheck-web": "es-check es5 packages/turf/turf.min.js",
"prepare": "lerna run build && node ./scripts/add-import-extensions.js",
"pretest": "npm run lint",
"test": "lerna run test",
"posttest": "lerna run --scope @turf/turf last-checks",
"test": "npm run lint && lerna run test && lerna run --scope @turf/turf last-checks",
"docs": "tsx ./scripts/generate-readmes.ts"
},
"husky": {
Expand Down Expand Up @@ -68,5 +65,6 @@
"tsx": "^3.14.0",
"typescript": "^5.2.2",
"yamljs": "^0.3.0"
}
},
"packageManager": "[email protected]"
}
14 changes: 7 additions & 7 deletions packages/turf-along/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
],
"scripts": {
"bench": "tsx bench.ts",
"build": "npm-run-all --npm-path npm build:*",
"build": "npm-run-all --npm-path npm 'build:*'",
"build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
"build:js": "tsc",
"docs": "tsx ../../scripts/generate-readmes.ts",
"test": "npm-run-all --npm-path npm test:*",
"test": "npm-run-all --npm-path npm 'test:*'",
"test:tape": "tsx test.ts"
},
"devDependencies": {
Expand All @@ -58,11 +58,11 @@
"typescript": "^5.2.2"
},
"dependencies": {
"@turf/bearing": "^7.0.0-alpha.2",
"@turf/destination": "^7.0.0-alpha.2",
"@turf/distance": "^7.0.0-alpha.2",
"@turf/helpers": "^7.0.0-alpha.2",
"@turf/invariant": "^7.0.0-alpha.2",
"@turf/bearing": "workspace:^",
"@turf/destination": "workspace:^",
"@turf/distance": "workspace:^",
"@turf/helpers": "workspace:^",
"@turf/invariant": "workspace:^",
"tslib": "^2.6.2"
}
}
18 changes: 9 additions & 9 deletions packages/turf-angle/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
],
"scripts": {
"bench": "tsx bench.ts",
"build": "npm-run-all --npm-path npm build:*",
"build": "npm-run-all --npm-path npm 'build:*'",
"build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
"build:js": "tsc",
"docs": "tsx ../../scripts/generate-readmes.ts",
"test": "npm-run-all --npm-path npm test:*",
"test": "npm-run-all --npm-path npm 'test:*'",
"test:tape": "tsx test.ts"
},
"devDependencies": {
"@turf/distance": "^7.0.0-alpha.2",
"@turf/sector": "^7.0.0-alpha.2",
"@turf/truncate": "^7.0.0-alpha.2",
"@turf/distance": "workspace:^",
"@turf/sector": "workspace:^",
"@turf/truncate": "workspace:^",
"@types/benchmark": "^2.1.5",
"@types/tape": "^4.2.32",
"benchmark": "^2.1.4",
Expand All @@ -63,10 +63,10 @@
"write-json-file": "^5.0.0"
},
"dependencies": {
"@turf/bearing": "^7.0.0-alpha.2",
"@turf/helpers": "^7.0.0-alpha.2",
"@turf/invariant": "^7.0.0-alpha.2",
"@turf/rhumb-bearing": "^7.0.0-alpha.2",
"@turf/bearing": "workspace:^",
"@turf/helpers": "workspace:^",
"@turf/invariant": "workspace:^",
"@turf/rhumb-bearing": "workspace:^",
"tslib": "^2.6.2"
}
}
8 changes: 4 additions & 4 deletions packages/turf-area/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
],
"scripts": {
"bench": "tsx bench.ts",
"build": "npm-run-all --npm-path npm build:*",
"build": "npm-run-all --npm-path npm 'build:*'",
"build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
"build:js": "tsc",
"docs": "tsx ../../scripts/generate-readmes.ts",
"test": "npm-run-all --npm-path npm test:*",
"test": "npm-run-all --npm-path npm 'test:*'",
"test:tape": "tsx test.ts"
},
"devDependencies": {
Expand All @@ -58,8 +58,8 @@
"write-json-file": "^5.0.0"
},
"dependencies": {
"@turf/helpers": "^7.0.0-alpha.2",
"@turf/meta": "^7.0.0-alpha.2",
"@turf/helpers": "workspace:^",
"@turf/meta": "workspace:^",
"tslib": "^2.6.2"
}
}
10 changes: 5 additions & 5 deletions packages/turf-bbox-clip/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@
],
"scripts": {
"bench": "tsx bench.ts",
"build": "npm-run-all --npm-path npm build:*",
"build": "npm-run-all --npm-path npm 'build:*'",
"build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
"build:js": "tsc",
"docs": "tsx ../../scripts/generate-readmes.ts",
"test": "npm-run-all --npm-path npm test:*",
"test": "npm-run-all --npm-path npm 'test:*'",
"test:tape": "tsx test.ts"
},
"devDependencies": {
"@turf/bbox": "^7.0.0-alpha.2",
"@turf/bbox": "workspace:^",
"@types/benchmark": "^2.1.5",
"@types/tape": "^4.2.32",
"benchmark": "^2.1.4",
Expand All @@ -65,8 +65,8 @@
"write-json-file": "^5.0.0"
},
"dependencies": {
"@turf/helpers": "^7.0.0-alpha.2",
"@turf/invariant": "^7.0.0-alpha.2",
"@turf/helpers": "workspace:^",
"@turf/invariant": "workspace:^",
"tslib": "^2.6.2"
}
}
6 changes: 3 additions & 3 deletions packages/turf-bbox-polygon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
],
"scripts": {
"bench": "tsx bench.ts",
"build": "npm-run-all --npm-path npm build:*",
"build": "npm-run-all --npm-path npm 'build:*'",
"build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
"build:js": "tsc",
"docs": "tsx ../../scripts/generate-readmes.ts",
"test": "npm-run-all --npm-path npm test:*",
"test": "npm-run-all --npm-path npm 'test:*'",
"test:tape": "tsx test.ts"
},
"devDependencies": {
Expand All @@ -57,7 +57,7 @@
"typescript": "^5.2.2"
},
"dependencies": {
"@turf/helpers": "^7.0.0-alpha.2",
"@turf/helpers": "workspace:^",
"tslib": "^2.6.2"
}
}
8 changes: 4 additions & 4 deletions packages/turf-bbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
],
"scripts": {
"bench": "tsx bench.ts",
"build": "npm-run-all --npm-path npm build:*",
"build": "npm-run-all --npm-path npm 'build:*'",
"build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
"build:js": "tsc",
"docs": "tsx ../../scripts/generate-readmes.ts",
"test": "npm-run-all --npm-path npm test:*",
"test": "npm-run-all --npm-path npm 'test:*'",
"test:tape": "tsx test.ts"
},
"devDependencies": {
Expand All @@ -58,8 +58,8 @@
"typescript": "^5.2.2"
},
"dependencies": {
"@turf/helpers": "^7.0.0-alpha.2",
"@turf/meta": "^7.0.0-alpha.2",
"@turf/helpers": "workspace:^",
"@turf/meta": "workspace:^",
"tslib": "^2.6.2"
}
}
10 changes: 5 additions & 5 deletions packages/turf-bearing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@
],
"scripts": {
"bench": "tsx bench.ts",
"build": "npm-run-all --npm-path npm build:*",
"build": "npm-run-all --npm-path npm 'build:*'",
"build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
"build:js": "tsc",
"docs": "tsx ../../scripts/generate-readmes.ts",
"test": "npm-run-all --npm-path npm test:*",
"test": "npm-run-all --npm-path npm 'test:*'",
"test:tape": "tsx test.ts"
},
"devDependencies": {
"@turf/destination": "^7.0.0-alpha.2",
"@turf/destination": "workspace:^",
"@types/benchmark": "^2.1.5",
"@types/tape": "^4.2.32",
"benchmark": "^2.1.4",
Expand All @@ -56,8 +56,8 @@
"write-json-file": "^5.0.0"
},
"dependencies": {
"@turf/helpers": "^7.0.0-alpha.2",
"@turf/invariant": "^7.0.0-alpha.2",
"@turf/helpers": "workspace:^",
"@turf/invariant": "workspace:^",
"tslib": "^2.6.2"
}
}
8 changes: 4 additions & 4 deletions packages/turf-bezier-spline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
],
"scripts": {
"bench": "tsx bench.ts",
"build": "npm-run-all --npm-path npm build:*",
"build": "npm-run-all --npm-path npm 'build:*'",
"build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
"build:js": "tsc",
"docs": "tsx ../../scripts/generate-readmes.ts",
"test": "npm-run-all --npm-path npm test:*",
"test": "npm-run-all --npm-path npm 'test:*'",
"test:tape": "tsx test.ts"
},
"devDependencies": {
Expand All @@ -59,8 +59,8 @@
"write-json-file": "^5.0.0"
},
"dependencies": {
"@turf/helpers": "^7.0.0-alpha.2",
"@turf/invariant": "^7.0.0-alpha.2",
"@turf/helpers": "workspace:^",
"@turf/invariant": "workspace:^",
"tslib": "^2.6.2"
}
}
8 changes: 4 additions & 4 deletions packages/turf-boolean-clockwise/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
],
"scripts": {
"bench": "tsx bench.ts",
"build": "npm-run-all --npm-path npm build:*",
"build": "npm-run-all --npm-path npm 'build:*'",
"build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
"build:js": "tsc",
"docs": "tsx ../../scripts/generate-readmes.ts",
"test": "npm-run-all --npm-path npm test:*",
"test": "npm-run-all --npm-path npm 'test:*'",
"test:tape": "tsx test.ts"
},
"devDependencies": {
Expand All @@ -63,8 +63,8 @@
"typescript": "^5.2.2"
},
"dependencies": {
"@turf/helpers": "^7.0.0-alpha.2",
"@turf/invariant": "^7.0.0-alpha.2",
"@turf/helpers": "workspace:^",
"@turf/invariant": "workspace:^",
"tslib": "^2.6.2"
}
}
8 changes: 4 additions & 4 deletions packages/turf-boolean-concave/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
],
"scripts": {
"bench": "tsx bench.ts",
"build": "npm-run-all --npm-path npm build:*",
"build": "npm-run-all --npm-path npm 'build:*'",
"build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
"build:js": "tsc",
"docs": "tsx ../../scripts/generate-readmes.ts",
"test": "npm-run-all --npm-path npm test:*",
"test": "npm-run-all --npm-path npm 'test:*'",
"test:tape": "tsx test.ts"
},
"devDependencies": {
Expand All @@ -62,8 +62,8 @@
"typescript": "^5.2.2"
},
"dependencies": {
"@turf/helpers": "^7.0.0-alpha.2",
"@turf/invariant": "^7.0.0-alpha.2",
"@turf/helpers": "workspace:^",
"@turf/invariant": "workspace:^",
"tslib": "^2.6.2"
}
}
14 changes: 7 additions & 7 deletions packages/turf-boolean-contains/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
],
"scripts": {
"bench": "tsx bench.ts",
"build": "npm-run-all --npm-path npm build:*",
"build": "npm-run-all --npm-path npm 'build:*'",
"build:es": "tsc --outDir dist/es --module esnext --declaration false && echo '{\"type\":\"module\"}' > dist/es/package.json",
"build:js": "tsc",
"docs": "tsx ../../scripts/generate-readmes.ts",
"test": "npm-run-all --npm-path npm test:*",
"test": "npm-run-all --npm-path npm 'test:*'",
"test:tape": "tsx test.ts"
},
"devDependencies": {
Expand All @@ -64,11 +64,11 @@
"typescript": "^5.2.2"
},
"dependencies": {
"@turf/bbox": "^7.0.0-alpha.2",
"@turf/boolean-point-in-polygon": "^7.0.0-alpha.2",
"@turf/boolean-point-on-line": "^7.0.0-alpha.2",
"@turf/helpers": "^7.0.0-alpha.2",
"@turf/invariant": "^7.0.0-alpha.2",
"@turf/bbox": "workspace:^",
"@turf/boolean-point-in-polygon": "workspace:^",
"@turf/boolean-point-on-line": "workspace:^",
"@turf/helpers": "workspace:^",
"@turf/invariant": "workspace:^",
"tslib": "^2.6.2"
}
}
Loading
Loading