Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisbbreuer committed Jul 6, 2023
2 parents e68e30a + 2ed8536 commit e5213b7
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 59 deletions.
50 changes: 25 additions & 25 deletions fixtures/vitesse/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "module",
"private": true,
"packageManager": "pnpm@8.5.1",
"packageManager": "pnpm@8.6.6",
"scripts": {
"build": "vite-ssg build",
"dev": "vite --port 3333 --open",
Expand All @@ -15,48 +15,48 @@
"up": "taze major -I"
},
"dependencies": {
"@unocss/reset": "^0.52.1",
"@vueuse/core": "^10.1.2",
"@unocss/reset": "^0.53.4",
"@vueuse/core": "^10.2.1",
"@vueuse/head": "^1.1.26",
"nprogress": "^0.2.0",
"pinia": "^2.1.3",
"pinia": "^2.1.4",
"vue": "^3.3.4",
"vue-demi": "^0.14.5",
"vue-i18n": "^9.2.2",
"vue-router": "^4.2.1"
"vue-router": "^4.2.2"
},
"devDependencies": {
"@iconify-json/carbon": "^1.1.16",
"@iconify-json/carbon": "^1.1.18",
"@intlify/vite-plugin-vue-i18n": "^7.0.0",
"@ow3/eslint-config": "^0.36.2",
"@types/markdown-it-link-attributes": "^3.0.1",
"@types/nprogress": "^0.2.0",
"@vitejs/plugin-vue": "^4.2.3",
"@vue/test-utils": "^2.3.2",
"critters": "^0.0.16",
"@vue/test-utils": "^2.4.0",
"critters": "^0.0.19",
"cross-env": "^7.0.3",
"cypress": "^12.12.0",
"eslint": "^8.41.0",
"cypress": "^12.16.0",
"eslint": "^8.44.0",
"eslint-plugin-cypress": "^2.13.3",
"https-localhost": "^4.7.1",
"markdown-it-link-attributes": "^4.0.1",
"markdown-it-shiki": "^0.9.0",
"pnpm": "^8.5.1",
"shiki": "^0.14.2",
"taze": "^0.10.1",
"typescript": "^5.0.4",
"unocss": "^0.52.1",
"unplugin-auto-import": "^0.16.2",
"unplugin-vue-components": "^0.24.1",
"vite": "^4.3.8",
"vite-plugin-inspect": "^0.7.26",
"vite-plugin-pages": "^0.30.1",
"vite-plugin-pwa": "^0.15.0",
"pnpm": "^8.6.6",
"shiki": "^0.14.3",
"taze": "^0.11.2",
"typescript": "^5.1.6",
"unocss": "^0.53.4",
"unplugin-auto-import": "^0.16.5",
"unplugin-vue-components": "^0.25.1",
"vite": "^4.3.9",
"vite-plugin-inspect": "^0.7.32",
"vite-plugin-pages": "^0.31.0",
"vite-plugin-pwa": "^0.16.4",
"vite-plugin-vue-layouts": "^0.8.0",
"vite-plugin-vue-markdown": "^0.23.5",
"vite-ssg": "^0.22.2",
"vite-ssg": "^0.23.0",
"vite-ssg-sitemap": "^0.5.1",
"vitest": "^0.31.1",
"vue-tsc": "^1.6.5"
"vitest": "^0.32.4",
"vue-tsc": "^1.8.3"
}
}
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@ow3/eslint-config-monorepo",
"version": "0.44.2",
"private": true,
"packageManager": "pnpm@8.5.1",
"packageManager": "pnpm@8.6.6",
"author": "Chris Breuer <chris@ow3.org> (https://github.com/chrisbbreuer/)",
"license": "MIT",
"engines": {
Expand All @@ -21,9 +21,9 @@
"devDependencies": {
"@ow3/eslint-config": "workspace:*",
"bumpp": "^9.1.1",
"eslint": "^8.43.0",
"eslint": "^8.44.0",
"eslint-plugin-ow3": "link:packages/eslint-plugin-ow3",
"rimraf": "^5.0.1",
"typescript": "^5.1.6"
}
}
}
3 changes: 3 additions & 0 deletions packages/eslint-config-basic/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ module.exports = {
'import/no-unresolved': 'off',
'import/no-absolute-path': 'off',
'import/newline-after-import': ['error', { count: 1, considerComments: true }],
'import/no-self-import': 'error',

// Common
'semi': ['error', 'never'],
Expand Down Expand Up @@ -398,6 +399,8 @@ module.exports = {
'unicorn/prefer-node-protocol': 'error',
// Prefer using number properties like `Number.isNaN` rather than `isNaN`
'unicorn/prefer-number-properties': 'error',
// Ban `new Array` as `Array` constructor's params are ambiguous
'unicorn/no-new-array': 'error',

'no-use-before-define': ['error', { functions: false, classes: false, variables: true }],
'eslint-comments/disable-enable-pair': 'off',
Expand Down
12 changes: 6 additions & 6 deletions packages/eslint-config-basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@
"dependencies": {
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-html": "^7.1.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsonc": "^2.8.0",
"eslint-plugin-import": "npm:eslint-plugin-i@2.27.5-3",
"eslint-plugin-jsonc": "^2.9.0",
"eslint-plugin-markdown": "^3.0.0",
"eslint-plugin-n": "^16.0.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-no-only-tests": "^3.1.0",
"eslint-plugin-ow3": "workspace:*",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-unicorn": "^47.0.0",
"eslint-plugin-unused-imports": "^2.0.0",
"eslint-plugin-yml": "^1.7.0",
"eslint-plugin-yml": "^1.8.0",
"jsonc-eslint-parser": "^2.3.0",
"yaml-eslint-parser": "^1.2.2"
},
"devDependencies": {
"eslint": "^8.41.0"
"eslint": "^8.44.0"
}
}
}
6 changes: 3 additions & 3 deletions packages/eslint-config-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"eslint-plugin-react-hooks": "^4.6.0"
},
"devDependencies": {
"eslint": "^8.41.0",
"eslint": "^8.44.0",
"react": "^18.2.0",
"typescript": "^5.0.4"
"typescript": "^5.1.6"
}
}
}
1 change: 0 additions & 1 deletion packages/eslint-config-ts/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ module.exports = {
'@typescript-eslint/no-empty-function': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/ban-types': 'off',
'@typescript-eslint/triple-slash-reference': 'off',
// handled by unused-imports/no-unused-imports
'@typescript-eslint/no-unused-vars': 'off',
Expand Down
10 changes: 5 additions & 5 deletions packages/eslint-config-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
},
"dependencies": {
"@ow3/eslint-config-basic": "workspace:*",
"@typescript-eslint/eslint-plugin": "^5.59.7",
"@typescript-eslint/parser": "^5.59.7",
"eslint-plugin-jest": "^27.2.1",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"eslint-plugin-jest": "^27.2.2",
"eslint-plugin-neverthrow": "^1.1.4"
},
"devDependencies": {
"eslint": "^8.41.0"
"eslint": "^8.44.0"
}
}
}
6 changes: 3 additions & 3 deletions packages/eslint-config-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"dependencies": {
"@ow3/eslint-config-basic": "workspace:*",
"@ow3/eslint-config-ts": "workspace:*",
"eslint-plugin-vue": "^9.14.0",
"eslint-plugin-vue": "^9.15.1",
"local-pkg": "^0.4.3"
},
"devDependencies": {
"eslint": "^8.41.0"
"eslint": "^8.44.0"
}
}
}
18 changes: 9 additions & 9 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
},
"dependencies": {
"@ow3/eslint-config-vue": "workspace:*",
"@typescript-eslint/eslint-plugin": "^5.59.7",
"@typescript-eslint/parser": "^5.59.7",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-html": "^7.1.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsonc": "^2.8.0",
"eslint-plugin-n": "^16.0.0",
"eslint-plugin-import": "npm:eslint-plugin-i@2.27.5-3",
"eslint-plugin-jsonc": "^2.9.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-unicorn": "^47.0.0",
"eslint-plugin-vue": "^9.14.0",
"eslint-plugin-yml": "^1.7.0",
"eslint-plugin-vue": "^9.15.1",
"eslint-plugin-yml": "^1.8.0",
"jsonc-eslint-parser": "^2.3.0",
"yaml-eslint-parser": "^1.2.2"
},
"devDependencies": {
"eslint": "^8.41.0"
"eslint": "^8.44.0"
}
}
}
8 changes: 4 additions & 4 deletions packages/eslint-plugin-ow3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
},
"dependencies": {
"@stacksjs/path": "^0.52.0",
"@typescript-eslint/utils": "^5.59.7",
"@typescript-eslint/utils": "^5.61.0",
"@unocss/config": "0.51.6",
"@unocss/core": "0.51.6",
"synckit": "^0.8.5"
},
"devDependencies": {
"@types/node": "^20.2.3",
"@types/node": "^20.3.3",
"unbuild": "^1.2.1",
"vitest": "^0.31.1"
"vitest": "^0.32.4"
}
}
}

0 comments on commit e5213b7

Please sign in to comment.