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.

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

chore(deps): various cleanups and dependency fixes #5534

Merged
merged 11 commits into from
Feb 14, 2024
3 changes: 3 additions & 0 deletions .depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignores": ["@sanity/eslint-config-studio", "dotenv-flow", "esbuild", "esbuild-register"]
}
11 changes: 0 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,13 @@ yarn dev
- Rebase your feature branch regularly against `next`. Make sure its even with `next` before merging
- Once it's done, open a pull request targeting `next`
- After at least two reviewers has approved the pull request, you can merge it into `next` when you feel ready (if you're on the Sanity team, obviously)
- Everything except minor _trivial_ changes should go through pull-requests. If you're unsure whether it's a trivial change or not, submit a pull request just to be sure
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

- Pull requests should be as ready as possible for merge. Unless stated otherwise, it should be safe to assume that:

- The changes/feature are reviewed and tested by you
- You think it's production ready
- The code is linted and the test suite is passing

- It's fine to open a pull request to start a discussion / ask for help, but it should be stated clearly that it's not yet ready for merge.
- When the `next`-branch is thoroughly tested and ready to be released (either as a minor or major version bump), it should be merged into `current` and bumped.
- Critical fixes go straight into `current` (preferably through a pull request)

## Merging

Expand All @@ -47,14 +44,6 @@ Prefer squash + merge. If it makes sense to keep individual commits (e.g. differ
- `current`: This contains all the features and fixes included in the latest official release.
- `next`: This includes everything scheduled for the next, upcoming release.

## Publishing official releases

When `next` is ready for release, merge `next` into `current`, then run `yarn release` in the `current` branch and select version. After a successful release, remember to merge the new version number commits that were performed as part of the release into `next`.

## Publishing _canary_ versions from feature branches

This can be done at any time by anyone and is done by `yarn release-canary`. This will publish with the commit hash from HEAD.

# How to file an issue

If you find a security vulnerability, do **NOT** open an issue. Email [email protected] instead.
Expand Down
4 changes: 2 additions & 2 deletions dev/embedded-studio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"devDependencies": {
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@vitejs/plugin-react": "^4.2.0",
"@vitejs/plugin-react": "^4.2.1",
"typescript": "^5.2.2",
"vite": "^5.0.0"
"vite": "^4.5.1"
}
}
2 changes: 1 addition & 1 deletion dev/test-studio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@
},
"devDependencies": {
"chokidar": "^3.5.3",
"vite": "^4.5.0"
"vite": "^4.5.1"
}
}
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"clean:deps": "rimraf packages/@sanity/*/node_modules packages/*/node_modules node_modules perf/tests/node_modules perf/studio/node_modules",
"check:deps-updates": "npx npm-check-updates --workspaces --root -m",
"check:versions": "node -r esbuild-register scripts/normalizeDependencyVersions.ts",
"depcheck": "lerna exec \"node -r esbuild-register \\$LERNA_ROOT_PATH/scripts/depcheck.ts\" --no-bail --parallel",
"depcheck": "lerna exec depcheck --no-bail --parallel",
"deploy:movies": "yarn build && cd examples/movies-studio && sanity deploy",
"deploy:test": "yarn build && cd dev/test-studio && sanity deploy",
"dev": "yarn start",
Expand Down Expand Up @@ -106,10 +106,12 @@
"@sanity/pkg-utils": "^3.3.2",
"@sanity/test": "0.0.1-alpha.1",
"@sanity/tsdoc": "1.0.0-alpha.38",
"@sanity/types": "3.25.0",
"@sanity/uuid": "^3.0.2",
"@types/jest": "^29.5.6",
"@types/node": "^14.18.9",
"@types/react": "^18.2.37",
"@types/semver": "^7.5.6",
"@types/tmp": "^0.2.3",
"@types/yargs": "^17.0.7",
"@typescript-eslint/eslint-plugin": "^6.18.1",
Expand Down Expand Up @@ -149,6 +151,7 @@
"ora": "^6.3.1",
"prettier": "^3.1.0",
"prettier-plugin-packagejson": "^2.4.6",
"pretty-quick": "^3.1.3",
"rimraf": "^3.0.2",
"rxjs": "^7.8.1",
"semver": "^7.3.5",
Expand Down
3 changes: 0 additions & 3 deletions packages/@sanity/block-tools/.depcheckignore.json

This file was deleted.

3 changes: 3 additions & 0 deletions packages/@sanity/block-tools/.depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignores": ["@sanity/pkg-utils", "react"]
}
33 changes: 0 additions & 33 deletions packages/@sanity/cli/.depcheckignore.json

This file was deleted.

20 changes: 20 additions & 0 deletions packages/@sanity/cli/.depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"ignores": [
"@sanity/pkg-utils",
"sanity",
"@sanity/icons",
"pluralize-esm",
"vite",
"@portabletext/toolkit",
"react",
"@sanity/ui",
"lodash.get",
"@portabletext/types",
"slug",
"@sanity/asset-utils",
"styled-components",
"sanity-plugin-hotspot-array",
"react-icons",
"react-barcode"
]
}
20 changes: 11 additions & 9 deletions packages/@sanity/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,41 +64,44 @@
"dependencies": {
"@babel/traverse": "^7.23.5",
"@sanity/telemetry": "^0.7.6",
"@sanity/util": "3.28.0",
"chalk": "^4.1.2",
"decompress": "^4.2.0",
"esbuild": "^0.19.8",
"esbuild-register": "^3.4.1",
"get-it": "^8.4.4",
"golden-fleece": "^1.0.9",
"node-machine-id": "^1.1.12",
"pkg-dir": "^5.0.0"
"pkg-dir": "^5.0.0",
"semver": "^7.3.5",
"validate-npm-package-name": "^3.0.0"
},
"devDependencies": {
"@rexxars/gitconfiglocal": "^3.0.1",
"@types/decompress": "^4.2.4",
"@types/validate-npm-package-name": "^3.0.3",
"@rollup/plugin-node-resolve": "^15.2.3",
"@sanity/client": "^6.12.4",
"@sanity/eslint-config-studio": "^3.0.1",
"@sanity/generate-help-url": "^3.0.0",
"@sanity/types": "3.29.0",
"@sanity/util": "3.29.0",
"@types/babel__traverse": "^7.18.1",
"@types/configstore": "^5.0.1",
"@types/cpx": "^1.5.2",
"@types/decompress": "^4.2.4",
"@types/debug": "^4.1.7",
"@types/inquirer": "^6.0.0",
"@types/minimist": "^1.2.5",
"@types/node": "^14.18.9",
"@types/semver": "^7.5.6",
"@types/semver-compare": "^1.0.1",
"@types/tar": "^6.1.3",
"@types/validate-npm-package-name": "^3.0.3",
"@types/which": "^2.0.1",
"@vercel/frameworks": "1.6.0",
"@vercel/fs-detectors": "4.1.3",
"babylon": "^6.18.0",
"boxen": "^4.1.0",
"clean-stack": "^3.0.0",
"configstore": "^5.0.1",
"cpx": "^1.5.0",
"debug": "^3.2.7",
"decompress": "^4.2.0",
"debug": "^4.3.4",
"deep-sort-object": "^1.0.1",
"dotenv": "^16.0.3",
"dotenv-expand": "^9.0.0",
Expand All @@ -123,7 +126,6 @@
"semver": "^7.3.5",
"semver-compare": "^1.0.0",
"tar": "^6.1.11",
"validate-npm-package-name": "^3.0.0",
"which": "^2.0.2",
"xdg-basedir": "^4.0.0"
},
Expand Down
3 changes: 0 additions & 3 deletions packages/@sanity/diff/.depcheckignore.json

This file was deleted.

3 changes: 3 additions & 0 deletions packages/@sanity/diff/.depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignores": ["@sanity/pkg-utils"]
}
2 changes: 1 addition & 1 deletion packages/@sanity/export/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dependencies": {
"@sanity/util": "3.29.0",
"archiver": "^5.0.0",
"debug": "^3.2.7",
"debug": "^4.3.4",
"get-it": "^8.4.4",
"lodash": "^4.17.21",
"mississippi": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@sanity/import/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@sanity/generate-help-url": "^3.0.0",
"@sanity/mutator": "3.29.0",
"@sanity/uuid": "^3.0.1",
"debug": "^3.2.7",
"debug": "^4.3.4",
"file-url": "^2.0.2",
"get-it": "^8.4.4",
"get-uri": "^2.0.2",
Expand Down
3 changes: 0 additions & 3 deletions packages/@sanity/migrate/.depcheckignore.json

This file was deleted.

3 changes: 3 additions & 0 deletions packages/@sanity/migrate/.depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignores": ["@sanity/pkg-utils"]
}
3 changes: 0 additions & 3 deletions packages/@sanity/mutator/.depcheckignore.json

This file was deleted.

3 changes: 3 additions & 0 deletions packages/@sanity/mutator/.depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignores": ["@sanity/pkg-utils"]
}
2 changes: 1 addition & 1 deletion packages/@sanity/mutator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"dependencies": {
"@sanity/diff-match-patch": "^3.1.1",
"@sanity/uuid": "^3.0.1",
"debug": "^3.2.7",
"debug": "^4.3.4",
"lodash": "^4.17.21"
},
"devDependencies": {
Expand Down
3 changes: 0 additions & 3 deletions packages/@sanity/portable-text-editor/.depcheckignore.json

This file was deleted.

3 changes: 3 additions & 0 deletions packages/@sanity/portable-text-editor/.depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignores": ["@sanity/pkg-utils", "ws", "@types/jest"]
}
5 changes: 3 additions & 2 deletions packages/@sanity/portable-text-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,15 @@
"@types/debug": "^4.1.5",
"@types/express": "^4.17.21",
"@types/express-ws": "^3.0.1",
"@types/is-hotkey": "^0.1.10",
"@types/jest": "^29.5.6",
"@types/lodash": "^4.14.149",
"@types/node": "^14.18.9",
"@types/node-ipc": "^9.2.0",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@types/ws": "~8.5.3",
"@vitejs/plugin-react": "^4.2.0",
"@vitejs/plugin-react": "^4.2.1",
"express": "^4.18.2",
"express-ws": "^5.0.2",
"jest": "^29.7.0",
Expand All @@ -102,7 +103,7 @@
"rimraf": "^3.0.2",
"rxjs": "^7.8.1",
"styled-components": "^6.1.6",
"vite": "^4.5.0"
"vite": "^4.5.1"
},
"peerDependencies": {
"react": "^16.9 || ^17 || ^18",
Expand Down
3 changes: 0 additions & 3 deletions packages/@sanity/schema/.depcheckignore.json

This file was deleted.

3 changes: 3 additions & 0 deletions packages/@sanity/schema/.depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignores": ["@sanity/pkg-utils"]
}
19 changes: 0 additions & 19 deletions packages/@sanity/types/.depcheckignore.json

This file was deleted.

3 changes: 3 additions & 0 deletions packages/@sanity/types/.depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignores": ["@sanity/pkg-utils", "react", "_self_"]
}
3 changes: 0 additions & 3 deletions packages/@sanity/util/.depcheckignore.json

This file was deleted.

3 changes: 3 additions & 0 deletions packages/@sanity/util/.depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignores": ["@sanity/pkg-utils"]
}
3 changes: 0 additions & 3 deletions packages/@sanity/vision/.depcheckignore.json

This file was deleted.

3 changes: 3 additions & 0 deletions packages/@sanity/vision/.depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignores": ["@sanity/pkg-utils"]
}
3 changes: 0 additions & 3 deletions packages/create-sanity/.depcheckignore.json

This file was deleted.

3 changes: 3 additions & 0 deletions packages/create-sanity/.depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignores": ["@sanity/cli"]
}
4 changes: 0 additions & 4 deletions packages/groq/.depcheckignore.json

This file was deleted.

3 changes: 3 additions & 0 deletions packages/groq/.depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignores": ["@sanity/pkg-utils"]
}
4 changes: 2 additions & 2 deletions packages/groq/test/groq.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

const {strict: assert} = require('node:assert')

const groq = require('groq')
const groq = require('../src')

assert.equal(typeof groq, 'function')

// Ensure it's possible to check what version of groq is being used
const pkg = require('groq/package.json')
const pkg = require('../groq/package.json')

assert.equal(typeof pkg.version, 'string')

Expand Down
2 changes: 1 addition & 1 deletion packages/groq/test/groq.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {strict as assert} from 'node:assert'

import groq from 'groq'
// Ensure it's possible to check what version of groq being used
import pkg from 'groq/package.json' assert {type: 'json'}
import pkg from '../package.json' assert {type: 'json'}

assert.equal(typeof groq, 'function')
assert.equal(typeof pkg.version, 'string')
Expand Down
10 changes: 0 additions & 10 deletions packages/sanity/.depcheckignore.json

This file was deleted.

3 changes: 3 additions & 0 deletions packages/sanity/.depcheckrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignores": ["@sanity/pkg-utils", "globby", "sanity"]
}
Loading
Loading