Skip to content

Commit

Permalink
Merge branch 'next' into infra/unicorn/prefer-array-some
Browse files Browse the repository at this point in the history
  • Loading branch information
ST-DDT authored Oct 25, 2023
2 parents eb5c5c9 + 74f6bbd commit e169fbc
Show file tree
Hide file tree
Showing 11 changed files with 358 additions and 287 deletions.
2 changes: 0 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,13 @@ module.exports = defineConfig({
'unicorn/no-array-callback-reference': 'off',
'unicorn/no-array-reduce': 'off',
'unicorn/no-await-expression-member': 'off',
'unicorn/no-for-loop': 'off',
'unicorn/no-negated-condition': 'off',
'unicorn/no-object-as-default-parameter': 'off',
'unicorn/no-useless-switch-case': 'off',
'unicorn/numeric-separators-style': 'off',
'unicorn/prefer-code-point': 'off',
'unicorn/prefer-export-from': 'off',
'unicorn/prefer-module': 'off',
'unicorn/prefer-native-coercion-functions': 'off',
'unicorn/prefer-negative-index': 'off',
'unicorn/prefer-string-slice': 'off',
'unicorn/prefer-ternary': 'off',
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
name: 'Build & Unit Test: node-${{ matrix.node_version }}, ${{ matrix.os }}'
steps:
- name: Checkout
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 # v4.0.0
with:
# Required for docs/versions tests
fetch-depth: 0
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
run: date

- name: Checkout
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 # v4.0.0
with:
# Required for docs/versions tests
fetch-depth: 0
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
name: 'E2E Doc Test: node-20, ubuntu-latest'
steps:
- name: Checkout
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 # v4.0.0

- name: Install pnpm
uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0
Expand All @@ -145,7 +145,7 @@ jobs:
name: 'Lint: node-20, ubuntu-latest'
steps:
- name: Checkout
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 # v4.0.0
with:
fetch-depth: 0

Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
name: 'TS-Check: node-20, ubuntu-latest'
steps:
- name: Checkout
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 # v4.0.0
with:
fetch-depth: 0

Expand All @@ -202,7 +202,7 @@ jobs:
name: 'Codecov: node-20, ubuntu-latest'
steps:
- name: Checkout
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 # v4.0.0
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
pull-requests: write
steps:
- name: Checkout
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 # v4.0.0
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion docs/guide/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ interface User {
}
```

As you can see, your `User` model probably looks completely different from the one you have in your codebase.
As you can see, our `User` model probably looks completely different from the one you have in your codebase.
One thing to keep an eye on is the `subscriptionTier` property, as it is not simply a string, but only one of the strings defined in the `SubscriptionTier` type (`'free'` or `'basic'` or `'business'`).
Also, in a real scenario, your model should not depend on a type of a third party library (`SexType` in this case).

Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,28 +89,28 @@
"devDependencies": {
"@actions/github": "~6.0.0",
"@algolia/client-search": "~4.19.1",
"@types/markdown-it": "~13.0.2",
"@types/node": "~20.8.6",
"@types/sanitize-html": "~2.9.2",
"@types/semver": "~7.5.3",
"@types/validator": "~13.11.3",
"@typescript-eslint/eslint-plugin": "~6.7.5",
"@typescript-eslint/parser": "~6.7.5",
"@types/markdown-it": "~13.0.4",
"@types/node": "~20.8.7",
"@types/sanitize-html": "~2.9.3",
"@types/semver": "~7.5.4",
"@types/validator": "~13.11.5",
"@typescript-eslint/eslint-plugin": "~6.8.0",
"@typescript-eslint/parser": "~6.8.0",
"@vitest/coverage-v8": "~0.34.6",
"@vitest/ui": "~0.34.7",
"@vueuse/core": "~10.5.0",
"conventional-changelog-cli": "~4.1.0",
"cypress": "~13.3.1",
"esbuild": "~0.19.4",
"eslint": "~8.51.0",
"cypress": "~13.3.2",
"esbuild": "~0.19.5",
"eslint": "~8.52.0",
"eslint-config-prettier": "~9.0.0",
"eslint-define-config": "~1.24.1",
"eslint-gitignore": "~0.1.0",
"eslint-plugin-deprecation": "~2.0.0",
"eslint-plugin-jsdoc": "~46.8.2",
"eslint-plugin-prettier": "~5.0.1",
"eslint-plugin-unicorn": "~48.0.1",
"eslint-plugin-vitest": "~0.3.2",
"eslint-plugin-vitest": "~0.3.8",
"glob": "~10.3.10",
"npm-run-all": "~4.1.5",
"prettier": "3.0.3",
Expand All @@ -123,10 +123,10 @@
"typedoc": "~0.24.8",
"typescript": "~4.9.5",
"validator": "~13.11.0",
"vite": "~4.4.11",
"vite": "~4.5.0",
"vitepress": "1.0.0-beta.7",
"vitest": "~0.34.6",
"vue": "~3.3.4"
"vue": "~3.3.6"
},
"packageManager": "[email protected]",
"engines": {
Expand Down
Loading

0 comments on commit e169fbc

Please sign in to comment.