Skip to content

Commit

Permalink
Merge pull request #306 from RebeccaStevens/next
Browse files Browse the repository at this point in the history
  • Loading branch information
RebeccaStevens authored Mar 18, 2023
2 parents 29ca328 + 3a812ee commit 111d5de
Show file tree
Hide file tree
Showing 79 changed files with 8,161 additions and 11,608 deletions.
13 changes: 3 additions & 10 deletions .c8rc.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
{
"all": true,
"include": [
"src/**/*"
],
"exclude": [
"src/types/**/*"
],
"reporter": [
"lcov",
"text"
],
"include": ["src/**/*"],
"exclude": ["src/types/**/*"],
"reporter": ["lcov", "text"],
"check-coverage": false,
"watermarks": {
"lines": [80, 95],
Expand Down
50 changes: 21 additions & 29 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,40 @@
"version": "0.2",
"language": "en",
"ignorePaths": [
".github/workflows/**",
"**/*.json",
"**/*.jsonc",
"**/CHANGELOG.md",
"**/coverage/**",
"**/node_modules/**",
"**/dist/**",
"**/**/CHANGELOG.md",
"**/*.{json}",
".cspell.json",
"yarn.lock",
".github/workflows/**",
".vscode/*.json"
"**/node_modules/**",
"pnpm-lock.yaml"
],
"dictionaries": [
"typescript",
"softwareTerms",
"node",
"en_US",
"npm",
"filetypes",
"misc",
"filetypes"
],
"import": [
"./node_modules/@cspell/dict-cryptocurrencies/cspell-ext.json"
"node",
"npm",
"softwareTerms",
"typescript"
],
"import": ["@cspell/dict-cryptocurrencies/cspell-ext.json"],
"ignoreRegExpList": [
"/[^\\s@]+@([^\\s@]+\\.)+[^\\s@]{2,4}/",
"/[A-Fa-f0-9]{6}/",
"/[A-Za-z0-9]{32,}/",
"// @ts-.*",
"/\\STS\\S+/",
"/`[^`]*`/",
"/``[\\w\\W]*?``/",
"/```[\\w\\W]*?```/",
"/~~~[\\w\\W]*?~~~/",
"/``[\\w\\W]*?``/",
"/`[^`]*`/",
"/\\.\\/docs\\/rules\\/[^.]*.md/",
"/TS[^\\s]+/",
"\\(#.+?\\)",
"// @ts-.*",
"/[A-Za-z0-9]{32,}/"
"\\(#.+?\\)"
],
"words": [
"bar",
"baz",
"builtins",
"codesandbox",
"corge",
"customizer",
Expand All @@ -60,18 +57,13 @@
"qux",
"sonarjs",
"thud",
"typeguard",
"typeguards",
"waldo",
"xyzzy"
],
"overrides": [
{
"filename": "**/*.{ts,js}",
"ignoreRegExpList": [
"/@[a-z]+/",
"/#(end)?region/"
],
"ignoreRegExpList": ["/@[a-z]+/", "/#(end)?region/"],
"includeRegExpList": [
"/\\/\\*[\\s\\S]*?\\*\\/|([^\\\\:]|^)\\/\\/.*$/",
"/(\\/\\/[^\\n\\r]*[\\n\\r]+)/"
Expand Down
44 changes: 19 additions & 25 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"env": {
"node": true
},
"plugins": [
"prettier"
],
"plugins": ["prettier"],
"extends": [
"@rebeccastevens/eslint-config/modern",
"@rebeccastevens/eslint-config/typescript",
Expand All @@ -26,39 +24,35 @@
"/tests/modules/",
"/tests/types/",
"/types-legacy/",
"/**/*.cjs",
"/**/*.js",
"/**/*.md"
],
"rules": {
"import/no-relative-parent-imports": "off",
"node/no-extraneous-import": ["error", {
"allowModules": ["deepmerge-ts"]
}],
"unicorn/prefer-at": "off",
"unicorn/prefer-top-level-await": "off",
"prefer-object-has-own": "off"
},
"overrides": [
{
"files": "src/**",
"env": {
"node": false
},
"rules": {
}
},
{
"files": "tests/**",
"rules": {
"import/no-useless-path-segments": "off",
"lines-between-class-members":"off"
}
},
{
"files": "tests/**/*.test-d.ts",
"files": ["**/*.test.ts"],
"plugins": ["ava"],
"extends": ["plugin:ava/recommended", "plugin:functional/off"],
"rules": {
"@typescript-eslint/naming-convention":"off"
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-unsafe-argument": "off",
"@typescript-eslint/no-unsafe-assignment": "off",
"@typescript-eslint/no-unsafe-call": "off",
"@typescript-eslint/no-unsafe-member-access": "off",
"@typescript-eslint/no-unsafe-return": "off",
"@typescript-eslint/restrict-template-expressions": "off",
"eslint-comments/disable-enable-pair": "off",
"import/no-relative-parent-imports": "off",
"jsdoc/require-jsdoc": "off",
"lines-between-class-members": "off",
"max-classes-per-file": "off",
"sonarjs/no-duplicate-string": "off",
"sonarjs/no-identical-functions": "off",
"unicorn/consistent-function-scoping": "off"
}
}
]
Expand Down
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
/.lintstagedrc linguist-language=json
/.vscode/*.json linguist-language=jsonc

/.yarn/** linguist-vendored

/dist/** linguist-generated
/CHANGELOG.md linguist-generated

Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ labels: 'Type: Bug, Status: Triage'
assignees: ''
---

# Bug Report
## Bug Report

<!-- Why the issue was filed? -->

## Expected behavior
### Expected behavior

<!-- What you expected to happen? -->

## Actual behavior
### Actual behavior

<!-- What actually happened? -->

## Steps to reproduce
### Steps to reproduce

<!-- How can someone else make/see it happen -->

## Proposed changes
### Proposed changes

<!-- If you have a proposed change, workaround or fix, describe it here -->
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ labels: 'Type: Idea, Status: Triage'
assignees: ''
---

# Suggestion
## Suggestion
24 changes: 24 additions & 0 deletions .github/actions/prepare/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Prepare
description: Prepares the repo for a typical CI job

inputs:
node-version:
required: false
description: "`node-version` passed to `actions/setup-node`."
default: latest

runs:
using: "composite"
steps:
- name: Configure Git
run: |
git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"
git config --global user.name ${GITHUB_ACTOR}
shell: bash
- uses: pnpm/action-setup@v2
- uses: actions/setup-node@v3
with:
node-version: ${{ inputs.node-version }}
cache: "pnpm"
- run: pnpm install --frozen-lockfile --ignore-scripts
shell: bash
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"workarounds:typesNodeVersioning",
"schedule:weekly"
],
"postUpdateOptions": ["yarnDedupeHighest"],
"labels": ["Type: Maintenance", ":blue_heart:"],
"automergeStrategy": "rebase",
"postUpdateOptions": ["pnpmDedupe"],
"packageRules": [
{
"matchPaths": ["+(benchmark/package.json)"],
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/build-node.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Build

on:
pull_request:
workflow_dispatch:
workflow_call:

jobs:
build_node:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/prepare
- run: pnpm run build:node
91 changes: 0 additions & 91 deletions .github/workflows/ci.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/done-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ jobs:
name: "Update Labels"
runs-on: ubuntu-latest
steps:
- uses: RebeccaStevens/issue-closed-labeler-action@latest
- uses: RebeccaStevens/issue-closed-labeler-action@v1
with:
rules: '[{"condition":"Type: Bug","add":"Resolution: Fixed","remove":["Status: Triage","Status: Investigation Needed","Status: On Hold","Status: In Progress","Status: Stale","Status: Awaiting Response","Status: Awaiting Feedback","Status: Blocked"]},{"condition":["some",["Type: Feature","Type: Enhancement"]],"add":"Resolution: Added","remove":["Status: Triage","Status: Investigation Needed","Status: On Hold","Status: In Progress","Status: Stale","Status: Awaiting Response","Status: Awaiting Feedback","Status: Blocked"]}]'
14 changes: 14 additions & 0 deletions .github/workflows/lint-js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Lint Code

on:
pull_request:
workflow_dispatch:
workflow_call:

jobs:
lint_js:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/prepare
- run: pnpm run lint:js
14 changes: 14 additions & 0 deletions .github/workflows/lint-knip-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Lint Knip (Development)

on:
pull_request:
workflow_dispatch:
workflow_call:

jobs:
lint_knip_dev:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/prepare
- run: pnpm run lint:knip:development
Loading

0 comments on commit 111d5de

Please sign in to comment.