From 58b8ac395737a68e895da0ec1c870bab287ac8f5 Mon Sep 17 00:00:00 2001 From: Gao Sun Date: Fri, 20 Aug 2021 18:16:00 +0800 Subject: [PATCH] refactor: use composite run steps and remove eslint formatter --- .github/workflows/add-labels.yml | 2 + .github/workflows/commitlint.yml | 19 +--- .github/workflows/core-main.yml | 19 +--- .github/workflows/deploy-dev.yml | 19 +--- .github/workflows/phrases-main.yml | 19 +--- .github/workflows/schemas-main.yml | 19 +--- .github/workflows/ui-main.yml | 19 +--- packages/core/lint-staged.config.js | 2 +- packages/core/package.json | 7 +- packages/phrases/package.json | 7 +- packages/schemas/package.json | 9 +- packages/ui/lint-staged.config.js | 4 +- packages/ui/package.json | 11 +- pnpm-lock.yaml | 163 ++++++---------------------- 14 files changed, 69 insertions(+), 250 deletions(-) diff --git a/.github/workflows/add-labels.yml b/.github/workflows/add-labels.yml index bcfbe723c..0e79dde72 100644 --- a/.github/workflows/add-labels.yml +++ b/.github/workflows/add-labels.yml @@ -7,6 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: Extract Label id: extract-label run: | @@ -26,6 +27,7 @@ jobs: )" env: TITLE: ${{ github.event.pull_request.title || github.event.issue.title }} + - uses: actions-ecosystem/action-add-labels@v1.1.0 with: github_token: ${{ github.token }} diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index 8d011cbef..fb82452cc 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -10,23 +10,10 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-node@v2 + - name: Setup Node and pnpm + uses: logto-io/actions-node-pnpm-run-steps@v1.0.2 with: - node-version: '14' - - # https://github.com/pnpm/action-setup#use-cache-to-reduce-installation-time - - name: Cache pnpm modules - uses: actions/cache@v2 - with: - path: ~/.pnpm-store - key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}- - - - uses: pnpm/action-setup@v2.0.1 - with: - version: 6.0.2 - run_install: false + run-install: false - name: Install commitlint run: pnpm add -g @commitlint/{cli,config-conventional} diff --git a/.github/workflows/core-main.yml b/.github/workflows/core-main.yml index eee668052..5621c4a87 100644 --- a/.github/workflows/core-main.yml +++ b/.github/workflows/core-main.yml @@ -15,23 +15,8 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: '14' - - # https://github.com/pnpm/action-setup#use-cache-to-reduce-installation-time - - name: Cache pnpm modules - uses: actions/cache@v2 - with: - path: ~/.pnpm-store - key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}- - - - uses: pnpm/action-setup@v2.0.1 - with: - version: 6.0.2 - run_install: true + - name: Setup Node and pnpm + uses: logto-io/actions-node-pnpm-run-steps@v1.0.2 - name: Lint working-directory: packages/core diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 517c4be03..016fc8151 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -17,23 +17,8 @@ jobs: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: '14' - - # https://github.com/pnpm/action-setup#use-cache-to-reduce-installation-time - - name: Cache pnpm modules - uses: actions/cache@v2 - with: - path: ~/.pnpm-store - key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}- - - - uses: pnpm/action-setup@v2.0.1 - with: - version: 6.0.2 - run_install: true + - name: Setup Node and pnpm + uses: logto-io/actions-node-pnpm-run-steps@v1.0.2 - name: Build run: pnpm -- lerna run build --stream diff --git a/.github/workflows/phrases-main.yml b/.github/workflows/phrases-main.yml index a00bf6cf0..b21f0fb71 100644 --- a/.github/workflows/phrases-main.yml +++ b/.github/workflows/phrases-main.yml @@ -15,23 +15,8 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: '14' - - # https://github.com/pnpm/action-setup#use-cache-to-reduce-installation-time - - name: Cache pnpm modules - uses: actions/cache@v2 - with: - path: ~/.pnpm-store - key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}- - - - uses: pnpm/action-setup@v2.0.1 - with: - version: 6.0.2 - run_install: true + - name: Setup Node and pnpm + uses: logto-io/actions-node-pnpm-run-steps@v1.0.2 - name: Lint working-directory: packages/phrases diff --git a/.github/workflows/schemas-main.yml b/.github/workflows/schemas-main.yml index 1628d336e..358cd5981 100644 --- a/.github/workflows/schemas-main.yml +++ b/.github/workflows/schemas-main.yml @@ -15,23 +15,8 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: '14' - - # https://github.com/pnpm/action-setup#use-cache-to-reduce-installation-time - - name: Cache pnpm modules - uses: actions/cache@v2 - with: - path: ~/.pnpm-store - key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}- - - - uses: pnpm/action-setup@v2.0.1 - with: - version: 6.0.2 - run_install: true + - name: Setup Node and pnpm + uses: logto-io/actions-node-pnpm-run-steps@v1.0.2 - name: Lint working-directory: packages/schemas diff --git a/.github/workflows/ui-main.yml b/.github/workflows/ui-main.yml index 5a258afae..e1638ac54 100644 --- a/.github/workflows/ui-main.yml +++ b/.github/workflows/ui-main.yml @@ -15,23 +15,8 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: '14' - - # https://github.com/pnpm/action-setup#use-cache-to-reduce-installation-time - - name: Cache pnpm modules - uses: actions/cache@v2 - with: - path: ~/.pnpm-store - key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}- - - - uses: pnpm/action-setup@v2.0.1 - with: - version: 6.0.2 - run_install: true + - name: Setup Node and pnpm + uses: logto-io/actions-node-pnpm-run-steps@v1.0.2 - name: Lint working-directory: packages/ui diff --git a/packages/core/lint-staged.config.js b/packages/core/lint-staged.config.js index a0fee416f..88166ed6d 100644 --- a/packages/core/lint-staged.config.js +++ b/packages/core/lint-staged.config.js @@ -1,3 +1,3 @@ module.exports = { - '*.ts?(x)': ['eslint --format pretty --cache --fix', () => 'tsc -p tsconfig.json --noEmit'], + '*.ts?(x)': ['eslint --cache --fix', () => 'tsc -p tsconfig.json --noEmit'], }; diff --git a/packages/core/package.json b/packages/core/package.json index 58c22ec2f..d6204d687 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -10,7 +10,7 @@ "preinstall": "npx only-allow pnpm", "precommit": "lint-staged", "build": "rm -rf build/ && tsc", - "lint": "eslint --format pretty --ext .ts src", + "lint": "eslint --ext .ts src", "dev": "rm -rf build/ && tsc-watch --preserveWatchOutput --onSuccess \"node ./build/index.js\"", "start": "NODE_ENV=production node build/index.js", "test": "jest" @@ -42,8 +42,8 @@ "zod": "^3.2.0" }, "devDependencies": { - "@logto/eslint-config": "^0.1.0-rc.17", - "@logto/ts-config": "^0.1.0-rc.17", + "@logto/eslint-config": "^0.1.0-rc.18", + "@logto/ts-config": "^0.1.0-rc.18", "@types/jest": "^27.0.1", "@types/koa": "^2.13.3", "@types/koa-logger": "^3.1.1", @@ -54,7 +54,6 @@ "@types/node": "^16.3.1", "@types/oidc-provider": "^7.4.1", "eslint": "^7.30.0", - "eslint-formatter-pretty": "^4.1.0", "jest": "^27.0.6", "lint-staged": "^11.1.1", "openapi-types": "^9.1.0", diff --git a/packages/phrases/package.json b/packages/phrases/package.json index 455a8e5cf..6e1bac45c 100644 --- a/packages/phrases/package.json +++ b/packages/phrases/package.json @@ -17,17 +17,16 @@ "scripts": { "preinstall": "npx only-allow pnpm", "build": "rm -rf lib/ && tsc", - "lint": "eslint --format pretty \"src/**\"", + "lint": "eslint --ext .ts src", "prepack": "pnpm build" }, "bugs": { "url": "https://github.com/logto-io/logto/issues" }, "devDependencies": { - "@logto/eslint-config": "^0.1.0-rc.14", - "@logto/ts-config": "^0.1.0-rc.14", + "@logto/eslint-config": "^0.1.0-rc.18", + "@logto/ts-config": "^0.1.0-rc.18", "eslint": "^7.31.0", - "eslint-formatter-pretty": "^4.1.0", "prettier": "^2.3.2", "typescript": "^4.3.5" }, diff --git a/packages/schemas/package.json b/packages/schemas/package.json index 14382796e..9ddf206ec 100644 --- a/packages/schemas/package.json +++ b/packages/schemas/package.json @@ -11,24 +11,23 @@ "private": true, "scripts": { "preinstall": "npx only-allow pnpm", - "generate": "ts-node src/gen/index.ts && eslint --format pretty \"src/db-entries/**\" --fix", + "generate": "ts-node src/gen/index.ts && eslint \"src/db-entries/**\" --fix", "build": "pnpm generate && rm -rf lib/ && tsc --p tsconfig.build.json", - "lint": "eslint --format pretty \"src/**\"", + "lint": "eslint --ext .ts src", "prepack": "pnpm build" }, "engines": { "node": ">=14.15.0" }, "devDependencies": { - "@logto/eslint-config": "^0.1.0-rc.14", + "@logto/eslint-config": "^0.1.0-rc.18", "@logto/essentials": "^1.1.0-rc.2", - "@logto/ts-config": "^0.1.0-rc.14", + "@logto/ts-config": "^0.1.0-rc.18", "@types/lodash.uniq": "^4.5.6", "@types/node": "14", "@types/pluralize": "^0.0.29", "camelcase": "^6.2.0", "eslint": "^7.30.0", - "eslint-formatter-pretty": "^4.1.0", "lodash.uniq": "^4.5.0", "pluralize": "^8.0.0", "prettier": "^2.3.2", diff --git a/packages/ui/lint-staged.config.js b/packages/ui/lint-staged.config.js index 7974f05d9..54645ebda 100644 --- a/packages/ui/lint-staged.config.js +++ b/packages/ui/lint-staged.config.js @@ -1,4 +1,4 @@ module.exports = { - '*.ts?(x)': ['eslint --format pretty --cache --fix', () => 'tsc -p tsconfig.json --noEmit'], - "*.scss": "stylelint --fix" + '*.ts?(x)': ['eslint --cache --fix', () => 'tsc -p tsconfig.json --noEmit'], + '*.scss': 'stylelint --fix', }; diff --git a/packages/ui/package.json b/packages/ui/package.json index 27e526797..c0f61aff6 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -11,7 +11,7 @@ "dev": "PORT=5000 concurrently -c \"blue,cyan\" \"pnpm:dev:tsc\" -k \"pnpm:dev:razzle\"", "start": "NODE_ENV=production node build/server.js", "build": "tsc -b && razzle build --noninteractive", - "lint": "eslint --format pretty --ext .ts --ext .tsx src", + "lint": "eslint --ext .ts --ext .tsx src", "stylelint": "stylelint \"src/**/*.scss\"", "test": "pnpm -- test:watch --no-watch", "test:watch": "razzle test --env=jsdom" @@ -30,10 +30,10 @@ "devDependencies": { "@babel/core": "^7.14.6", "@jest/types": "^27.0.6", - "@logto/eslint-config": "^0.1.0-rc.14", - "@logto/eslint-config-react": "^0.1.0-rc.14", - "@logto/ts-config": "^0.1.0-rc.14", - "@logto/ts-config-react": "^0.1.0-rc.14", + "@logto/eslint-config": "^0.1.0-rc.18", + "@logto/eslint-config-react": "^0.1.0-rc.18", + "@logto/ts-config": "^0.1.0-rc.18", + "@logto/ts-config-react": "^0.1.0-rc.18", "@testing-library/react": "^12.0.0", "@types/jest": "^26.0.24", "@types/react": "^17.0.14", @@ -44,7 +44,6 @@ "babel-preset-razzle": "4.0.5", "concurrently": "^6.2.0", "eslint": "^7.30.0", - "eslint-formatter-pretty": "^4.1.0", "html-webpack-plugin": "^4.5.2", "lint-staged": "^11.1.1", "mini-css-extract-plugin": "^0.9.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2ff683da2..ff70a0b2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,11 +18,11 @@ importers: packages/core: specifiers: - '@logto/eslint-config': ^0.1.0-rc.17 + '@logto/eslint-config': ^0.1.0-rc.18 '@logto/essentials': ^1.1.0-rc.2 '@logto/phrases': ^0.1.0 '@logto/schemas': ^0.1.0 - '@logto/ts-config': ^0.1.0-rc.17 + '@logto/ts-config': ^0.1.0-rc.18 '@types/jest': ^27.0.1 '@types/koa': ^2.13.3 '@types/koa-logger': ^3.1.1 @@ -36,7 +36,6 @@ importers: decamelize: ^5.0.0 dotenv: ^10.0.0 eslint: ^7.30.0 - eslint-formatter-pretty: ^4.1.0 formidable: ^1.2.2 got: ^11.8.2 i18next: ^20.3.5 @@ -88,8 +87,8 @@ importers: slonik-interceptor-preset: 1.2.10 zod: 3.5.1 devDependencies: - '@logto/eslint-config': 0.1.0-rc.17_aa6010e91de57dec3f7388187c7addf8 - '@logto/ts-config': 0.1.0-rc.17_8c4a247d0b588b2b71b71a86d42a9731 + '@logto/eslint-config': 0.1.0-rc.18_2055f56ab8dafa07df5c7ad406c8a4ab + '@logto/ts-config': 0.1.0-rc.18_54a571252e94826a463f89cda755e2f0 '@types/jest': 27.0.1 '@types/koa': 2.13.4 '@types/koa-logger': 3.1.1 @@ -100,7 +99,6 @@ importers: '@types/node': 16.4.6 '@types/oidc-provider': 7.4.2 eslint: 7.31.0 - eslint-formatter-pretty: 4.1.0 jest: 27.0.6 lint-staged: 11.1.1 openapi-types: 9.1.0 @@ -111,32 +109,29 @@ importers: packages/phrases: specifiers: - '@logto/eslint-config': ^0.1.0-rc.14 - '@logto/ts-config': ^0.1.0-rc.14 + '@logto/eslint-config': ^0.1.0-rc.18 + '@logto/ts-config': ^0.1.0-rc.18 eslint: ^7.31.0 - eslint-formatter-pretty: ^4.1.0 prettier: ^2.3.2 typescript: ^4.3.5 devDependencies: - '@logto/eslint-config': 0.1.0-rc.14_aa6010e91de57dec3f7388187c7addf8 - '@logto/ts-config': 0.1.0-rc.14_f847e35c67ce67b1737c27c823675243 + '@logto/eslint-config': 0.1.0-rc.18_2055f56ab8dafa07df5c7ad406c8a4ab + '@logto/ts-config': 0.1.0-rc.18_54a571252e94826a463f89cda755e2f0 eslint: 7.31.0 - eslint-formatter-pretty: 4.1.0 prettier: 2.3.2 typescript: 4.3.5 packages/schemas: specifiers: - '@logto/eslint-config': ^0.1.0-rc.14 + '@logto/eslint-config': ^0.1.0-rc.18 '@logto/essentials': ^1.1.0-rc.2 '@logto/phrases': ^0.1.0 - '@logto/ts-config': ^0.1.0-rc.14 + '@logto/ts-config': ^0.1.0-rc.18 '@types/lodash.uniq': ^4.5.6 '@types/node': '14' '@types/pluralize': ^0.0.29 camelcase: ^6.2.0 eslint: ^7.30.0 - eslint-formatter-pretty: ^4.1.0 lodash.uniq: ^4.5.0 pluralize: ^8.0.0 prettier: ^2.3.2 @@ -145,15 +140,14 @@ importers: dependencies: '@logto/phrases': link:../phrases devDependencies: - '@logto/eslint-config': 0.1.0-rc.14_aa6010e91de57dec3f7388187c7addf8 + '@logto/eslint-config': 0.1.0-rc.18_2055f56ab8dafa07df5c7ad406c8a4ab '@logto/essentials': 1.1.0-rc.2 - '@logto/ts-config': 0.1.0-rc.14_f847e35c67ce67b1737c27c823675243 + '@logto/ts-config': 0.1.0-rc.18_54a571252e94826a463f89cda755e2f0 '@types/lodash.uniq': 4.5.6 '@types/node': 14.17.6 '@types/pluralize': 0.0.29 camelcase: 6.2.0 eslint: 7.31.0 - eslint-formatter-pretty: 4.1.0 lodash.uniq: 4.5.0 pluralize: 8.0.0 prettier: 2.3.2 @@ -164,11 +158,11 @@ importers: specifiers: '@babel/core': ^7.14.6 '@jest/types': ^27.0.6 - '@logto/eslint-config': ^0.1.0-rc.14 - '@logto/eslint-config-react': ^0.1.0-rc.14 + '@logto/eslint-config': ^0.1.0-rc.18 + '@logto/eslint-config-react': ^0.1.0-rc.18 '@logto/phrases': ^0.1.0 - '@logto/ts-config': ^0.1.0-rc.14 - '@logto/ts-config-react': ^0.1.0-rc.14 + '@logto/ts-config': ^0.1.0-rc.18 + '@logto/ts-config-react': ^0.1.0-rc.18 '@testing-library/react': ^12.0.0 '@types/jest': ^26.0.24 '@types/react': ^17.0.14 @@ -180,7 +174,6 @@ importers: classnames: ^2.3.1 concurrently: ^6.2.0 eslint: ^7.30.0 - eslint-formatter-pretty: ^4.1.0 html-webpack-plugin: ^4.5.2 i18next: ^20.3.3 i18next-browser-languagedetector: ^6.1.2 @@ -213,10 +206,10 @@ importers: devDependencies: '@babel/core': 7.14.8 '@jest/types': 27.0.6 - '@logto/eslint-config': 0.1.0-rc.14_aa6010e91de57dec3f7388187c7addf8 - '@logto/eslint-config-react': 0.1.0-rc.14_0b4fa7c4abbcdb6140ac6718cc7d2571 - '@logto/ts-config': 0.1.0-rc.14_f847e35c67ce67b1737c27c823675243 - '@logto/ts-config-react': 0.1.0-rc.14_885243f2ccfa42cc3bca8b90895b55f6 + '@logto/eslint-config': 0.1.0-rc.18_2055f56ab8dafa07df5c7ad406c8a4ab + '@logto/eslint-config-react': 0.1.0-rc.18_8a23604bf110df38aac3ebd7ead305e2 + '@logto/ts-config': 0.1.0-rc.18_54a571252e94826a463f89cda755e2f0 + '@logto/ts-config-react': 0.1.0-rc.18_1457f2a7d92889c1b1eaca634f64e592 '@testing-library/react': 12.0.0_react-dom@17.0.2+react@17.0.2 '@types/jest': 26.0.24 '@types/react': 17.0.15 @@ -227,7 +220,6 @@ importers: babel-preset-razzle: 4.0.5 concurrently: 6.2.0 eslint: 7.31.0 - eslint-formatter-pretty: 4.1.0 html-webpack-plugin: 4.5.2_webpack@4.46.0 lint-staged: 11.1.1 mini-css-extract-plugin: 0.9.0_webpack@4.46.0 @@ -2788,13 +2780,13 @@ packages: write-file-atomic: 3.0.3 dev: true - /@logto/eslint-config-react/0.1.0-rc.14_0b4fa7c4abbcdb6140ac6718cc7d2571: - resolution: {integrity: sha512-na6XhvhAFR2F2I0o67LsmRh62HuCFYVsdtE270Yk3h2Yp0QWEvmwflRDdFqIu/Sm3kHa1rN2lCRv9WOIv079Yg==} + /@logto/eslint-config-react/0.1.0-rc.18_8a23604bf110df38aac3ebd7ead305e2: + resolution: {integrity: sha512-fUfUCwujf11Xr7i8P380V+7qRPAo+JUEn+GYx80OU9aoFpaUhGhpwNfbHl37MBDCdg6A650Sqnx3X4YfxDdxLQ==} peerDependencies: - '@logto/eslint-config': ^0.1.0-rc.14 + '@logto/eslint-config': ^0.1.0-rc.18 stylelint: ^13.13.1 dependencies: - '@logto/eslint-config': 0.1.0-rc.14_aa6010e91de57dec3f7388187c7addf8 + '@logto/eslint-config': 0.1.0-rc.18_2055f56ab8dafa07df5c7ad406c8a4ab eslint-config-xo-react: 0.25.0_d9ce695d054fb5a322f2803e7ac84389 eslint-plugin-react: 7.24.0_eslint@7.31.0 eslint-plugin-react-hooks: 4.2.0_eslint@7.31.0 @@ -2804,12 +2796,11 @@ packages: - eslint dev: true - /@logto/eslint-config/0.1.0-rc.14_aa6010e91de57dec3f7388187c7addf8: - resolution: {integrity: sha512-M/SebidYvn3IcmpSNmreGS7ST3qc/IZpaSexoJavydb81RD+OkqV5MVtAqI7pOyuy7G2XGdPl2hkQePF0KoKzg==} + /@logto/eslint-config/0.1.0-rc.18_2055f56ab8dafa07df5c7ad406c8a4ab: + resolution: {integrity: sha512-GMf+FP6NYzKUCHDpZ+19LPmmUT+btmBCTv04wokoHjynjbPZfVxn26+WK/0BGar9rrr2Cr+QT65LvjztpHhiQg==} engines: {node: '>=14.15.0'} peerDependencies: eslint: ^7.30.0 - eslint-formatter-pretty: ^4.1.0 prettier: ^2.3.2 typescript: ^4.3.5 dependencies: @@ -2819,36 +2810,6 @@ packages: eslint-config-prettier: 8.3.0_eslint@7.31.0 eslint-config-xo: 0.37.0_eslint@7.31.0 eslint-config-xo-typescript: 0.43.0_6fd5a9364a943d2d4e6f2a7372de0670 - eslint-formatter-pretty: 4.1.0 - eslint-plugin-eslint-comments: 3.2.0_eslint@7.31.0 - eslint-plugin-import: 2.23.4_eslint@7.31.0 - eslint-plugin-no-use-extend-native: 0.5.0 - eslint-plugin-node: 11.1.0_eslint@7.31.0 - eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca - eslint-plugin-promise: 5.1.0_eslint@7.31.0 - eslint-plugin-unicorn: 34.0.1_eslint@7.31.0 - prettier: 2.3.2 - typescript: 4.3.5 - transitivePeerDependencies: - - supports-color - dev: true - - /@logto/eslint-config/0.1.0-rc.17_aa6010e91de57dec3f7388187c7addf8: - resolution: {integrity: sha512-6s5ZnEby/sKlQFgKkyF1yvm2z+RVOGjK/pKNEJUgmDwJqY1HeYC18J3NDKaXWEQMhPdEfRzFZIsQY71tO9WsVQ==} - engines: {node: '>=14.15.0'} - peerDependencies: - eslint: ^7.30.0 - eslint-formatter-pretty: ^4.1.0 - prettier: ^2.3.2 - typescript: ^4.3.5 - dependencies: - '@typescript-eslint/eslint-plugin': 4.28.5_514553717ff968e20f6d1c6e521f8616 - '@typescript-eslint/parser': 4.28.5_eslint@7.31.0+typescript@4.3.5 - eslint: 7.31.0 - eslint-config-prettier: 8.3.0_eslint@7.31.0 - eslint-config-xo: 0.37.0_eslint@7.31.0 - eslint-config-xo-typescript: 0.43.0_6fd5a9364a943d2d4e6f2a7372de0670 - eslint-formatter-pretty: 4.1.0 eslint-plugin-eslint-comments: 3.2.0_eslint@7.31.0 eslint-plugin-import: 2.23.4_eslint@7.31.0 eslint-plugin-no-use-extend-native: 0.5.0 @@ -2869,38 +2830,27 @@ packages: lodash.orderby: 4.6.0 lodash.pick: 4.4.0 - /@logto/ts-config-react/0.1.0-rc.14_885243f2ccfa42cc3bca8b90895b55f6: - resolution: {integrity: sha512-g5vhZfXLVdnJXjGtksz6zoJ/cg0UU8LOBswQum43s8eLbnC/osOupJRoSOyRCqmzlKZUlarxUhMXTg3wF006iw==} + /@logto/ts-config-react/0.1.0-rc.18_1457f2a7d92889c1b1eaca634f64e592: + resolution: {integrity: sha512-CNnwTMzpdt8EdrE0EvlqVrBB9GPdFpq6vD+4c2J6pxNS2UWqarh792TfSEDHxTPsmXWV+rz9CIaWB5/TbswsDA==} engines: {node: '>=14.15.0'} peerDependencies: - '@logto/eslint-config-react': ^0.1.0-rc.14 - '@logto/ts-config': ^0.1.0-rc.14 + '@logto/eslint-config-react': ^0.1.0-rc.18 + '@logto/ts-config': ^0.1.0-rc.18 typescript: ^4.3.5 dependencies: - '@logto/eslint-config-react': 0.1.0-rc.14_0b4fa7c4abbcdb6140ac6718cc7d2571 - '@logto/ts-config': 0.1.0-rc.14_f847e35c67ce67b1737c27c823675243 + '@logto/eslint-config-react': 0.1.0-rc.18_8a23604bf110df38aac3ebd7ead305e2 + '@logto/ts-config': 0.1.0-rc.18_54a571252e94826a463f89cda755e2f0 typescript: 4.3.5 dev: true - /@logto/ts-config/0.1.0-rc.14_f847e35c67ce67b1737c27c823675243: - resolution: {integrity: sha512-6BUkw181YZMFcb+tMfuKYo9afVfEqj6iHJuQUnZYcLxjmR/YbRwdDIx1w5c1RXwLl57V0igStKndZwe2llUdnQ==} + /@logto/ts-config/0.1.0-rc.18_54a571252e94826a463f89cda755e2f0: + resolution: {integrity: sha512-VskpTMXoUGXaJ8rTdKd/KnmvxujcoT2d5qpQ4NGSJY8ytPIlGM0VRexBh0Bsh1rN2+bklav0D2LvIiaRedvF9A==} engines: {node: '>=14.15.0'} peerDependencies: - '@logto/eslint-config': ^0.1.0-rc.14 + '@logto/eslint-config': ^0.1.0-rc.18 typescript: ^4.3.5 dependencies: - '@logto/eslint-config': 0.1.0-rc.14_aa6010e91de57dec3f7388187c7addf8 - typescript: 4.3.5 - dev: true - - /@logto/ts-config/0.1.0-rc.17_8c4a247d0b588b2b71b71a86d42a9731: - resolution: {integrity: sha512-aiefHdl0+sXPmOAJzJEg2UscGbxF/9DBSZ7blJMQkaBPT/UznJzP1Otm4K1OsNHb1ASe8MMiA8MObnoNgN5iZQ==} - engines: {node: '>=14.15.0'} - peerDependencies: - '@logto/eslint-config': ^0.1.0-rc.17 - typescript: ^4.3.5 - dependencies: - '@logto/eslint-config': 0.1.0-rc.17_aa6010e91de57dec3f7388187c7addf8 + '@logto/eslint-config': 0.1.0-rc.18_2055f56ab8dafa07df5c7ad406c8a4ab typescript: 4.3.5 dev: true @@ -3299,17 +3249,6 @@ packages: '@types/node': 16.4.6 dev: true - /@types/eslint/7.28.0: - resolution: {integrity: sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==} - dependencies: - '@types/estree': 0.0.50 - '@types/json-schema': 7.0.8 - dev: true - - /@types/estree/0.0.50: - resolution: {integrity: sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==} - dev: true - /@types/express-serve-static-core/4.17.24: resolution: {integrity: sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA==} dependencies: @@ -6770,20 +6709,6 @@ packages: eslint: 7.31.0 dev: true - /eslint-formatter-pretty/4.1.0: - resolution: {integrity: sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ==} - engines: {node: '>=10'} - dependencies: - '@types/eslint': 7.28.0 - ansi-escapes: 4.3.2 - chalk: 4.1.1 - eslint-rule-docs: 1.1.231 - log-symbols: 4.1.0 - plur: 4.0.0 - string-width: 4.2.2 - supports-hyperlinks: 2.2.0 - dev: true - /eslint-import-resolver-node/0.3.4: resolution: {integrity: sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==} dependencies: @@ -6949,10 +6874,6 @@ packages: - supports-color dev: true - /eslint-rule-docs/1.1.231: - resolution: {integrity: sha512-egHz9A1WG7b8CS0x1P6P/Rj5FqZOjray/VjpJa14tMZalfRKvpE2ONJ3plCM7+PcinmU4tcmbPLv0VtwzSdLVA==} - dev: true - /eslint-scope/4.0.3: resolution: {integrity: sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==} engines: {node: '>=4.0.0'} @@ -8678,11 +8599,6 @@ packages: engines: {node: '>= 0.10'} dev: true - /irregular-plurals/3.3.0: - resolution: {integrity: sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==} - engines: {node: '>=8'} - dev: true - /is-absolute-url/2.1.0: resolution: {integrity: sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=} engines: {node: '>=0.10.0'} @@ -12531,13 +12447,6 @@ packages: semver-compare: 1.0.0 dev: true - /plur/4.0.0: - resolution: {integrity: sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==} - engines: {node: '>=10'} - dependencies: - irregular-plurals: 3.3.0 - dev: true - /pluralize/8.0.0: resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==} engines: {node: '>=4'}