Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
feat: build against yarn 3.2.1 (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
Noah authored Jun 17, 2022
1 parent d48d414 commit e560bac
Show file tree
Hide file tree
Showing 13 changed files with 3,483 additions and 5,367 deletions.
35 changes: 15 additions & 20 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
module.exports = {
root: true,
parser: '@typescript-eslint/parser',
plugins: ['@typescript-eslint', 'prettier'],
extends: [
'plugin:@typescript-eslint/recommended',
'@tophat/eslint-config/base',
'@tophat/eslint-config/jest',
'prettier',
],
extends: ['@tophat/eslint-config/base', '@tophat/eslint-config/jest'],
rules: {
'no-empty': 'off',
'no-unused-vars': 'off', // covered by typescript eslint
'import/named': 'off',
'prettier/prettier': [
'error',
{
printWidth: 100,
tabWidth: 4,
semi: false,
trailingComma: 'all' /* Reduces git diff. */,
singleQuote: true,
arrowParens: 'always', // Reduces character diff when adding Typescript types.
},
],
'@typescript-eslint/no-non-null-assertion': 'off',
'no-empty': ['error', { allowEmptyCatch: true }],
'import/order': [
'error',
{
Expand All @@ -29,13 +32,5 @@ module.exports = {
},
],
},
ignorePatterns: ['.*', '**/*.js', 'lib'],
settings: {
'import/parsers': {
'@typescript-eslint/parser': ['.ts', '.js'],
},
'import/resolver': {
typescript: './tsconfig.json',
},
},
ignorePatterns: ['**/.*'],
}
16 changes: 8 additions & 8 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
runs-on: ubuntu-20.04
if: "github.event_name == 'pull_request' && !contains(github.event.head_commit.message, '[skip ci]')"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3.0.2
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
- uses: ./.github/actions/detect-env
- name: Setup Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3.3.0
with:
node-version: ${{ env.NODE_VERSION }}
- name: Create artifacts directory
Expand All @@ -46,12 +46,12 @@ jobs:
runs-on: ubuntu-20.04
if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3.0.2
with:
fetch-depth: 0
- uses: ./.github/actions/detect-env
- name: Setup Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3.3.0
with:
node-version: ${{ env.NODE_VERSION }}
- name: Create artifacts directory
Expand All @@ -63,7 +63,7 @@ jobs:
path: |
./.yarn
./.pnp.*
key: ${{ env.NODE_VERSION }}-${{ env.YARN_VERSION }}-${{ hashFiles('yarn.lock') }}
key: ${{ env.NODE_VERSION }}-${{ hashFiles('yarn.lock') }}
- name: Install dependencies
run: yarn install --immutable
- name: Linting
Expand All @@ -89,10 +89,10 @@ jobs:
needs: [tests]
if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3.0.2
- uses: ./.github/actions/detect-env
- name: Setup Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3.3.0
with:
node-version: ${{ env.NODE_VERSION }}
- name: Create artifacts directory
Expand All @@ -104,7 +104,7 @@ jobs:
path: |
./.yarn
./.pnp.*
key: ${{ env.NODE_VERSION }}-${{ env.YARN_VERSION }}-${{ hashFiles('yarn.lock') }}
key: ${{ env.NODE_VERSION }}-${{ hashFiles('yarn.lock') }}
- name: Install dependencies
run: yarn install --immutable
- name: Build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
name: Publish Yarn Semver Up Plugin
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3.0.2
- uses: ./.github/actions/detect-env
- name: Setup Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3.3.0
with:
node-version: ${{ env.NODE_VERSION }}
- name: Create artifacts directory
Expand All @@ -29,7 +29,7 @@ jobs:
path: |
./.yarn
./.pnp.*
key: ${{ env.NODE_VERSION }}-${{ env.YARN_VERSION }}-${{ hashFiles('yarn.lock') }}
key: ${{ env.NODE_VERSION }}-${{ hashFiles('yarn.lock') }}
- name: Install dependencies
run: yarn install --immutable
- name: Build Package
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.16.0
lts/gallium
631 changes: 0 additions & 631 deletions .yarn/releases/yarn-3.0.1.cjs

This file was deleted.

786 changes: 786 additions & 0 deletions .yarn/releases/yarn-3.2.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ npmRegistries:
plugins:
- ./bundles/@yarnpkg/plugin-semver-up.js

yarnPath: .yarn/releases/yarn-3.0.1.cjs
yarnPath: .yarn/releases/yarn-3.2.1.cjs
6 changes: 3 additions & 3 deletions bundles/@yarnpkg/plugin-semver-up.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion commitlint.config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
module.exports = { extends: ['@tophat/commitlint-config'] }

9 changes: 7 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ module.exports = {
coverageReporters: ['lcov'],
collectCoverage: true,
coverageDirectory: `${ARTIFACT_DIR}/test_results/jest/`,
collectCoverageFrom: ['src/**/*.ts', '!src/**/*.test.ts', '!src/**/*.mock.ts', '!src/**/__mocks__/**'],
collectCoverageFrom: [
'src/**/*.ts',
'!src/**/*.test.ts',
'!src/**/*.mock.ts',
'!src/**/__mocks__/**',
],
}),
watchPathIgnorePatterns: ['<rootDir>/lib', '<rootDir>/artifacts', '<rootDir>/__mocks__']
watchPathIgnorePatterns: ['<rootDir>/lib', '<rootDir>/artifacts', '<rootDir>/__mocks__'],
}
81 changes: 40 additions & 41 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,49 +25,51 @@
"contrib:check": "all-contributors check"
},
"devDependencies": {
"@babel/cli": "^7.13.16",
"@babel/core": "^7.14.2",
"@babel/plugin-transform-runtime": "^7.14.2",
"@babel/preset-env": "^7.14.2",
"@babel/preset-typescript": "^7.13.0",
"@babel/cli": "^7.17.10",
"@babel/core": "^7.18.5",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-typescript": "^7.17.12",
"@commitlint/cli": "^11.0.0",
"@tophat/commitlint-config": "^0.1.2",
"@tophat/conventional-changelog-config": "^0.0.9",
"@tophat/eslint-config": "^0.7.0",
"@types/jest": "^26.0.20",
"@types/micromatch": "^4.0.1",
"@types/node": "^14.0.0",
"@tophat/commitlint-config": "^0.3.7",
"@tophat/conventional-changelog-config": "^0.6.2",
"@tophat/eslint-config": "^3.1.0",
"@tophat/eslint-import-resolver-require": "^0.1.3",
"@types/jest": "^28.1.2",
"@types/micromatch": "^4.0.2",
"@types/node": "^16.0.0",
"@types/semver": "^7.3.6",
"@typescript-eslint/eslint-plugin": "^4.29.2",
"@typescript-eslint/parser": "^4.29.2",
"@yarnpkg/builder": "^3.0.2-rc.1",
"@yarnpkg/cli": "^3.0.1",
"@yarnpkg/core": "^3.1.0-rc.1",
"@yarnpkg/fslib": "^2.5.1",
"@yarnpkg/libzip": "^2.2.2",
"@yarnpkg/plugin-essentials": "^3.0.1-rc.1",
"@yarnpkg/plugin-npm": "^2.5.0",
"@yarnpkg/plugin-pack": "^3.0.0",
"@yarnpkg/sdks": "^2.4.1-rc.4",
"@typescript-eslint/eslint-plugin": "^5.28.0",
"@typescript-eslint/parser": "^5.28.0",
"@yarnpkg/builder": "^3.2.2",
"@yarnpkg/cli": "^3.2.1",
"@yarnpkg/core": "^3.2.2",
"@yarnpkg/fslib": "^2.6.2",
"@yarnpkg/libzip": "^2.2.4",
"@yarnpkg/plugin-essentials": "^3.2.1",
"@yarnpkg/plugin-git": "^2.6.1",
"@yarnpkg/plugin-npm": "^2.7.1",
"@yarnpkg/plugin-pack": "^3.1.2",
"@yarnpkg/sdks": "^3.0.0-rc.9",
"all-contributors-cli": "^6.20.0",
"babel-jest": "^26.6.3",
"babel-jest": "^28.1.1",
"clipanion": "^3.0.1",
"commitizen": "^4.2.4",
"eslint": "^7.26.0",
"eslint-config-prettier": "^7.2.0",
"eslint-import-resolver-typescript": "^2.4.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "^24.3.6",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.23.2",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint": "^8.17.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-typescript": "^2.7.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.5.3",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.30.0",
"eslint-plugin-react-hooks": "^4.6.0",
"husky": "^6.0.0",
"jest": "^26.6.3",
"jest-junit": "^12.0.0",
"jest": "^28.1.1",
"jest-junit": "^13.2.0",
"lint-staged": "^11.0.0",
"prettier": "^2.2.1",
"typescript": "~4.3.5",
"typescript": "4.7.3",
"yaml-validator": "^3.0.1"
},
"peerDependencies": {
Expand All @@ -91,12 +93,9 @@
"yarn yaml-validator"
]
},
"engines": {
"node": ">=14.0.0"
},
"dependencies": {
"micromatch": "^4.0.4",
"semver": "^7.3.5"
"micromatch": "^4.0.5",
"semver": "^7.3.7"
},
"packageManager": "yarn@3.0.1"
"packageManager": "yarn@3.2.1"
}
Loading

0 comments on commit e560bac

Please sign in to comment.