Skip to content

Commit

Permalink
Merge pull request #45 from lineupjs/sgratzl/upgrade
Browse files Browse the repository at this point in the history
upgrade dependencies
  • Loading branch information
sgratzl authored Dec 12, 2021
2 parents 038fb8c + d933de3 commit 93e93fe
Show file tree
Hide file tree
Showing 10 changed files with 2,442 additions and 3,528 deletions.
23 changes: 5 additions & 18 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,16 @@
/* eslint-env node */

// eslint-disable-next-line @typescript-eslint/no-var-requires
const pkg = require('./package.json');

module.exports = {
plugins: ['@typescript-eslint', 'prettier'],
extends: [
'airbnb-typescript',
'react-app',
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
'prettier',
],
parserOptions: {
project: './tsconfig.eslint.json',
},
extends: ['react-app', 'plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended', 'prettier'],
settings: {
react: {
version: pkg.devDependencies.react ? 'detect' : '99.99.99',
version: '99.99.99',
},
},
rules: {
'no-continue': 'off',
// '@typescript-eslint/explicit-module-boundary-types': 'off',
// '@typescript-eslint/no-explicit-any': 'off',
// '@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
},
};
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: actions/[email protected]
with:
node-version: 16
- run: npm i -g yarn
- run: yarn config set checksumBehavior ignore
- name: Cache Node.js modules
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
name: Create Release

on:
workflow_dispatch:
inputs:
versionName:
description: 'Semantic Version Number (i.e., 5.5.0 or patch, minor, major, prepatch, preminor, premajor, prerelease)'
required: true
default: patch
preid:
description: 'Pre Release Identifier (i.e., alpha, beta)'
required: true
default: alpha

jobs:
create_release:
runs-on: ubuntu-latest
Expand All @@ -23,7 +29,7 @@ jobs:
id: version
run: |
echo -n "::set-output name=next_tag::"
npm version --no-git-tag-version ${{ github.event.inputs.versionName }}
npm version --no-git-tag-version ${{ github.event.inputs.versionName }} --preid ${{ github.event.inputs.preid }}
- name: Create pull request into main
uses: peter-evans/create-pull-request@v3
with:
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/release_main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: Release Main

on:
push:
branches:
Expand All @@ -20,12 +21,15 @@ jobs:
uses: actions/checkout@v2
- uses: actions/[email protected]
with:
node-version: '14'
node-version: 16
- name: Extract version
id: extract_version
run: |
node -pe "'::set-output name=version::' + require('./package.json').version"
node -pe "'::set-output name=npm_tag::' + (require('./package.json').version.includes('-') ? 'next' : 'latest')"
- name: Print version
run: |
echo "releasing ${{ steps.extract_version.outputs.version }} with tag ${{ steps.extract_version.outputs.npm_tag }}"
- name: Create Release
id: create_release
uses: release-drafter/release-drafter@v5
Expand All @@ -50,7 +54,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/[email protected]
with:
node-version: '14.x'
node-version: 16
- run: npm i -g yarn
- run: yarn config set checksumBehavior ignore
- name: Cache Node.js modules
Expand Down Expand Up @@ -90,9 +94,8 @@ jobs:
enable_jekyll: true
remove_path_spec: 'README.md,main'
- name: Pack Publish
env:
NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
run: |
yarn config set npmAuthToken "${{ secrets.NPM_TOKEN }}"
yarn pack
yarn npm publish --tag "${{ needs.create_release.outputs.npm_tag }}"
- name: Upload Release Asset
Expand Down
19 changes: 17 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,19 @@
/docs
/coverage
/.gitattributes
/.gitignore
/.prettierignore
.gitignore
.prettierignore
/LICENSE
/.vscode
*.svg
*.map
*.tsbuildinfo
/src/**/*.d.ts
/src/**/*.js
/tests/**/*.d.ts
/tests/**/*.js
/demo/**/*.d.ts
/demo/**/*.js
/.stylelintrc
/.editorconfig
/.yarn
Expand All @@ -17,3 +24,11 @@
/.vscode
*.lock
*.tgz
*.png
*.txt
*.eot
*.ttf
*.woff
*.woff2
*.mp4
*.csv
631 changes: 0 additions & 631 deletions .yarn/releases/yarn-3.0.1.cjs

This file was deleted.

768 changes: 768 additions & 0 deletions .yarn/releases/yarn-3.1.0.cjs

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
packageExtensions:
eslint-config-airbnb-typescript@*:
dependencies:
eslint-config-airbnb-base: "*"
eslint-module-utils@*:
dependencies:
eslint-import-resolver-node: "*"
eslint-config-airbnb-typescript@*:
dependencies:
eslint-config-airbnb-base: '*'

yarnPath: .yarn/releases/yarn-3.0.1.cjs
yarnPath: .yarn/releases/yarn-3.1.0.cjs
69 changes: 34 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"scripts": {
"clean": "rimraf build dist docs \"*.tgz\" && yarn run clean:compile",
"clean:compile": "rimraf build/src \"build/*.tsbuildinfo\" \"*.tsbuildinfo\" ",
"compile": "tsc",
"compile:dev": "tsc -p ./tsconfig.dev.json",
"compile": "tsc -b ./tsconfig.json",
"compile:dev": "tsc -b ./tsconfig.dev.json",
"fix": "yarn run eslint:fix && yarn run prettier:write",
"prettier:write": "prettier \"*\" \"*/**\" --write",
"prettier": "prettier \"*\" \"*/**\" --check",
Expand All @@ -61,46 +61,45 @@
"prepack": "yarn run clean && yarn run compile && yarn run build"
},
"devDependencies": {
"@types/jest": "^27.0.1",
"@typescript-eslint/eslint-plugin": "^4.29.3",
"@typescript-eslint/parser": "^4.29.3",
"@yarnpkg/sdks": "^2.4.2-rc.1",
"css-loader": "^6.2.0",
"eslint": "^7.32.0",
"eslint-config-airbnb-typescript": "^13.0.1",
"@types/jest": "^27.0.3",
"@typescript-eslint/eslint-plugin": "^5.4.0",
"@typescript-eslint/parser": "^5.4.0",
"@yarnpkg/sdks": "^2.5.1-rc.3",
"css-loader": "^6.5.1",
"eslint": "^8.3.0",
"eslint-config-airbnb-typescript": "^16.0.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-react-app": "^6.0.0",
"eslint-plugin-flowtype": "^5.9.0",
"eslint-plugin-import": "^2.24.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.1",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react-hooks": "^4.2.0",
"fork-ts-checker-webpack-plugin": "^6.3.2",
"jest": "^27.0.6",
"mini-css-extract-plugin": "^2.2.0",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.27.1",
"eslint-plugin-react-hooks": "^4.3.0",
"fork-ts-checker-webpack-plugin": "^6.4.2",
"jest": "^27.3.1",
"mini-css-extract-plugin": "^2.4.5",
"mkdirp": "^1.0.4",
"prettier": "^2.3.2",
"release-it": "^14.11.5",
"prettier": "^2.4.1",
"rimraf": "^3.0.2",
"sass": "^1.38.1",
"sass-loader": "^12.1.0",
"style-loader": "^3.2.1",
"stylelint": "^13.13.1",
"stylelint-config-standard": "^22.0.0",
"stylelint-prettier": "^1.2.0",
"stylelint-scss": "^3.20.1",
"sass": "^1.43.4",
"sass-loader": "^12.3.0",
"style-loader": "^3.3.1",
"stylelint": "^13",
"stylelint-config-standard": "^22",
"stylelint-prettier": "^1",
"stylelint-scss": "^3",
"thread-loader": "^3.0.4",
"ts-jest": "^27.0.5",
"ts-loader": "^9.2.5",
"typedoc": "^0.21.6",
"typescript": "^4.3.5",
"webpack": "^5.51.1",
"webpack-cli": "^4.8.0",
"webpack-dev-server": "^4.0.0"
"ts-jest": "^27.0.7",
"ts-loader": "^9.2.6",
"typedoc": "^0.22.9",
"typescript": "~4.4",
"webpack": "^5.64.3",
"webpack-cli": "^4.9.1",
"webpack-dev-server": "^4.5.0"
},
"dependencies": {
"tslib": "^2.3.1"
},
"packageManager": "yarn@3.0.1"
"packageManager": "yarn@3.1.0"
}
Loading

0 comments on commit 93e93fe

Please sign in to comment.