Skip to content

Commit

Permalink
chore: upgrade all minor/dev deps + remove prettier (#789)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielroe committed Apr 12, 2024
1 parent 5137b3c commit 23ffea3
Show file tree
Hide file tree
Showing 11 changed files with 3,740 additions and 4,875 deletions.
16 changes: 3 additions & 13 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,13 @@ module.exports = {
node: true,
},
rules: {
'prettier/prettier': [
1,
{
semi: false,
singleQuote: true,
trailingComma: 'es5',
arrowParens: 'avoid',
},
],
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-inferrable-types': 1,
'@typescript-eslint/explicit-module-boundary-types': 0,
'@typescript-eslint/explicit-function-return-type': 0,
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
},
extends: [
'plugin:promise/recommended',
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
'prettier',
],
}
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- run: corepack enable
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: "yarn"

- name: Install dependencies
Expand All @@ -43,7 +43,7 @@ jobs:
- run: corepack enable
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: "yarn"

- name: Install dependencies
Expand All @@ -70,7 +70,7 @@ jobs:
- run: corepack enable
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: "yarn"

- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"vue-content-placeholders": "^0.2.1"
},
"devDependencies": {
"@nuxt/types": "^2.17.1",
"@types/node-fetch": "^2.6.4",
"nuxt": "^2.17.1"
"@nuxt/types": "^2.17.3",
"@types/node-fetch": "^2.6.11",
"nuxt": "^2.17.3"
},
"scripts": {
"dev": "nuxt",
Expand Down
7 changes: 1 addition & 6 deletions lint-staged.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
module.exports = {
'*.js': ['yarn lint:eslint', 'yarn lint:prettier'],
'*.ts': ['yarn lint:eslint', 'yarn lint:prettier'],
'{!(package)*.json,*.code-snippets,.*rc}': [
'yarn lint:prettier --parser json',
],
'package.json': ['yarn lint:prettier'],
'*.{js,ts,json}': ['yarn lint:eslint'],
}
63 changes: 27 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@
"fixture:prod": "yarn clean:fixture && cross-env CMD=build yarn nuxt-run && cross-env CMD=start yarn nuxt-run",
"lint": "run-s lint:all:*",
"lint:all:eslint": "yarn lint:eslint --ext .js,.mjs,.ts,.vue .",
"lint:all:prettier": "yarn lint:prettier \"**/*.{js,mjs,json,ts,vue,md}\"",
"lint:eslint": "eslint --fix",
"lint:prettier": "prettier --write --loglevel warn",
"now-build": "NOW_BUILD=true yarn fixture:generate:export",
"nuxt-run": "cross-env-shell \"yarn nuxt $CMD test/fixture\"",
"prepare": "yarn build",
Expand All @@ -59,51 +57,47 @@
"watch": "yarn build -w"
},
"dependencies": {
"defu": "^6.1.2",
"defu": "^6.1.4",
"estree-walker": "^2.0.2",
"fs-extra": "^9.1.0",
"magic-string": "^0.30.1",
"pathe": "^1.1.1",
"ufo": "^1.1.2"
"magic-string": "^0.30.9",
"pathe": "^1.1.2",
"ufo": "^1.5.3"
},
"devDependencies": {
"@babel/traverse": "^7.22.8",
"@babel/types": "^7.22.5",
"@babel/traverse": "^7.24.1",
"@babel/types": "^7.24.0",
"@nuxt/test-utils": "^0.2.2",
"@nuxt/types": "^2.17.1",
"@nuxt/typescript-build": "^3.0.1",
"@nuxt/types": "^2.17.3",
"@nuxt/typescript-build": "^3.0.2",
"@nuxtjs/module-test-utils": "^1.6.3",
"@nuxtjs/pwa": "^3.3.5",
"@release-it/conventional-changelog": "^5.1.1",
"@types/fs-extra": "^9.0.13",
"@types/node": "^16.18.38",
"@types/normalize-path": "^3.0.0",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"c8": "^7.14.0",
"@release-it/conventional-changelog": "^8.0.1",
"@types/fs-extra": "^11.0.4",
"@types/node": "^20.12.7",
"@types/normalize-path": "^3.0.2",
"@typescript-eslint/eslint-plugin": "^7.6.0",
"@typescript-eslint/parser": "^7.6.0",
"codecov": "^3.8.3",
"core-js": "3.31.1",
"core-js": "3.36.1",
"cross-env": "^7.0.3",
"eslint": "^8.45.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint": "^8.57.0",
"eslint-plugin-promise": "^6.1.1",
"happy-dom": "^10.3.2",
"happy-dom": "^14.7.1",
"http-server": "^14.1.1",
"lint-staged": "^13.2.3",
"lint-staged": "^15.2.2",
"npm-run-all": "^4.1.5",
"nuxt": "^2.17.1",
"prettier": "^2.8.8",
"release-it": "16.1.0",
"rimraf": "^5.0.1",
"nuxt": "^2.17.3",
"release-it": "17.2.0",
"rimraf": "^5.0.5",
"siroc": "0.16.0",
"start-server-and-test": "^2.0.0",
"testcafe": "2.4.0",
"start-server-and-test": "^2.0.3",
"testcafe": "3.5.0",
"ts-loader": "^8.4.0",
"tsd": "^0.28.1",
"typescript": "5.1.6",
"vite": "^4.4.4",
"vitest": "^0.33.0",
"tsd": "^0.31.0",
"typescript": "5.4.5",
"vite": "^5.2.8",
"vitest": "^1.5.0",
"yorkie": "^2.0.0"
},
"peerDependencies": {
Expand All @@ -113,9 +107,6 @@
"engines": {
"node": ">=v14.13.0"
},
"volta": {
"node": "16.16.0"
},
"gitHooks": {
"pre-commit": "lint-staged"
},
Expand Down
1 change: 1 addition & 0 deletions src/runtime/composables/fetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ async function serverPrefetch(vm: AugmentedComponentInstance) {
const data = Object.fromEntries(
Object.entries((vm as any)?._setupProxy || (vm as any)?._setupState)
.filter(
// eslint-disable-next-line
([_key, val]) =>
!(
(val && typeof val === 'object' && '_compiled' in val) ||
Expand Down
1 change: 1 addition & 0 deletions src/runtime/composables/wrappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export const useRoute = wrapProperty('$route')
})
```
*/
// eslint-disable-next-line
export const useStore = <S>(key?: InjectionKey<S>): Store<S> => {
const vm = getCurrentInstance()
if (!vm) throw new Error('This must be called within a setup function.')
Expand Down
12 changes: 6 additions & 6 deletions test/unit/__snapshots__/babel-ssr-ref.spec.ts.snap
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`ssrRef babel plugin > works 1`] = `
"const ref = ref(1);
const ref2 = ssrRef(2, \\"ref2-BAW7YFDj4E+Qxr+ujqEADg==\\");
const ref2 = ssrRef(2, "ref2-BAW7YFDj4E+Qxr+ujqEADg==");
const ref3 = ssrRef(3, 'custom-key');
const ref4 = ssrRef(() => 4, \\"ref4-h6IKM1doqCRBR49lWv2V/g==\\");
const async1 = useAsync(() => null, \\"async1-nk1uJ/q39HMoKEMFH33Ryg==\\");
const ref4 = ssrRef(() => 4, "ref4-h6IKM1doqCRBR49lWv2V/g==");
const async1 = useAsync(() => null, "async1-nk1uJ/q39HMoKEMFH33Ryg==");
const async2 = useAsync(() => null, 'key');
const stat = useStatic(() => 4, '2', 'post');
const stat2 = useStatic(() => 4, '2', \\"stat2-55c3e298c9cd3d8ea2665241b6061629\\");
const stat3 = useStatic(() => 4, \\"stat3-dc9ff012f4c054c3f893c0ea8f3cddc5\\");"
const stat2 = useStatic(() => 4, '2', "stat2-55c3e298c9cd3d8ea2665241b6061629");
const stat3 = useStatic(() => 4, "stat3-dc9ff012f4c054c3f893c0ea8f3cddc5");"
`;
2 changes: 1 addition & 1 deletion test/unit/__snapshots__/ssr-ref.spec.ts.snap
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Vitest Snapshot v1
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`ssrRef reactivity > ssrRefs react to change in state 1`] = `
{
Expand Down
2 changes: 1 addition & 1 deletion vite.config.ts → vitest.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { fileURLToPath } from 'url'
import { defineConfig } from 'vite'
import { defineConfig } from 'vitest/config'

export default defineConfig({
resolve: {
Expand Down
Loading

0 comments on commit 23ffea3

Please sign in to comment.