Skip to content

Commit

Permalink
chore: update dependencies and build - turbo, pnpm, node (#79)
Browse files Browse the repository at this point in the history
* chore: update turbo

* feat: update pull request pipeline

* pnpm version test

* update pr node version matrix

* fix: bump eslint

* refactor: remove common tsconfig

* chore: bump dependencies

* chore: update release script
  • Loading branch information
Tymek authored Jun 24, 2024
1 parent f35a283 commit ba6988b
Show file tree
Hide file tree
Showing 17 changed files with 4,247 additions and 3,083 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:

env:
PNPM_VERSION: 8
PNPM_VERSION: 9

jobs:
build:
Expand All @@ -20,7 +20,7 @@ jobs:
node-version: 'lts/*'

- uses: pnpm/action-setup@v2
id: pnpm-install
id: pnpm-setup
with:
version: ${{ env.PNPM_VERSION }}
run_install: false
Expand Down Expand Up @@ -64,15 +64,15 @@ jobs:
shell: bash
strategy:
matrix:
node-version: [18.x, 20.x, 21.x]
node-version: [18.x, 20.x, 22.x]

steps:
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- uses: pnpm/action-setup@v2
id: pnpm-install
id: pnpm-setup
with:
version: ${{ env.PNPM_VERSION }}
run_install: false
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
node-version: 'lts/*'

- uses: pnpm/action-setup@v2
id: pnpm-install
id: pnpm-setup
with:
version: ${{ env.PNPM_VERSION }}
run_install: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:

jobs:
from-template:
uses: Unleash/.github/.github/workflows/npm-release.yml@v1.1.2
uses: Unleash/.github/.github/workflows/npm-release.yml@v1.2.0
with:
version: ${{ github.event.inputs.version }}
tag: ${{ github.event.inputs.tag }}
Expand Down
2 changes: 1 addition & 1 deletion common/eslint-config-custom/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
extends: ["next", "turbo", "prettier"],
extends: ["next", "prettier"],
rules: {
"@next/next/no-html-link-for-pages": "off",
"react/jsx-key": "off",
Expand Down
14 changes: 7 additions & 7 deletions common/eslint-config-custom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
"license": "MIT",
"private": true,
"dependencies": {
"@typescript-eslint/eslint-plugin": "^6.9.0",
"@typescript-eslint/parser": "^6.9.0",
"eslint": "^8.52.0",
"eslint-config-next": "^14.0.0",
"eslint-config-prettier": "^9.0.0",
"eslint-config-turbo": "1.10.16",
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"eslint": "^8.57.0",
"eslint-config-next": "^14.2.4",
"eslint-config-prettier": "^9.1.0",
"eslint-config-turbo": "2.0.4",
"eslint-plugin-react": "^7.33.2"
},
"devDependencies": {
"typescript": "^5.2.2"
"typescript": "^5.4.5"
},
"publishConfig": {
"access": "public"
Expand Down
3 changes: 0 additions & 3 deletions common/tsconfig/README.md

This file was deleted.

20 changes: 0 additions & 20 deletions common/tsconfig/base.json

This file was deleted.

24 changes: 0 additions & 24 deletions common/tsconfig/nextjs.json

This file was deleted.

10 changes: 0 additions & 10 deletions common/tsconfig/package.json

This file was deleted.

11 changes: 0 additions & 11 deletions common/tsconfig/react-library.json

This file was deleted.

23 changes: 11 additions & 12 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,20 @@
"dependencies": {
"@unleash/nextjs": "workspace:*",
"@vercel/examples-ui": "2.0.3",
"next": "14.1.2",
"react": "18.2.0",
"react-dom": "18.2.0"
"next": "14.2.4",
"react": "18.3.1",
"react-dom": "18.3.1"
},
"devDependencies": {
"@babel/core": "^7.24.0",
"@types/node": "^20.11.24",
"@types/react": "^18.2.63",
"@types/react-dom": "^18.2.19",
"autoprefixer": "^10.4.18",
"@babel/core": "^7.24.7",
"@types/node": "^20.14.8",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"autoprefixer": "^10.4.19",
"eslint": "^8.57.0",
"eslint-config-custom": "workspace:*",
"postcss": "^8.4.35",
"tailwindcss": "^3.4.1",
"tsconfig": "workspace:*",
"typescript": "^5.3.3"
"postcss": "^8.4.38",
"tailwindcss": "^3.4.4",
"typescript": "^5.5.2"
}
}
33 changes: 20 additions & 13 deletions example/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
{
"extends": "tsconfig/nextjs.json",
"include": [
"next-env.d.ts",
"src/**/*.ts",
"src/**/*.tsx",
".next/types/**/*.ts"
],
"exclude": [
"node_modules"
],
"compilerOptions": {
"moduleResolution": "node",
"strictNullChecks": true
}
"lib": ["dom", "dom.iterable", "esnext"],
"allowJs": true,
"skipLibCheck": true,
"strict": true,
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve",
"incremental": true,
"plugins": [
{
"name": "next"
}
]
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
"exclude": ["node_modules"]
}
33 changes: 16 additions & 17 deletions lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,28 @@
},
"devDependencies": {
"@types/murmurhash3js": "3.0.7",
"@types/node": "20.11.24",
"@types/react": "18.2.63",
"@types/react-dom": "18.2.19",
"@types/node": "20.14.8",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"@types/semver": "7.5.8",
"@unleash/client-specification": "5.1.6",
"@vitest/coverage-v8": "^1.3.1",
"eslint-config-custom": "workspace:*",
"next": "14.1.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"tsconfig": "workspace:*",
"typescript": "5.3.3",
"vite": "5.1.5",
"vitest": "1.3.1"
"@vitest/coverage-v8": "^1.6.0",
"eslint-config-custom": "*",
"next": "14.2.4",
"react": "18.3.1",
"react-dom": "18.3.1",
"typescript": "5.5.2",
"vite": "5.3.1",
"vitest": "1.6.0"
},
"dependencies": {
"@commander-js/extra-typings": "12.0.1",
"@next/env": "14.1.2",
"@commander-js/extra-typings": "12.1.0",
"@next/env": "14.2.4",
"@unleash/proxy-client-react": "4.2.4",
"commander": "12.0.0",
"commander": "12.1.0",
"murmurhash3js": "3.0.1",
"semver": "7.6.0",
"unleash-client": "5.5.3",
"semver": "7.6.2",
"unleash-client": "5.5.5",
"unleash-proxy-client": "3.4.1"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion lib/tsconfig.client.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "tsconfig/react-library.json",
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": ".",
"rootDir": ".",
Expand Down
28 changes: 22 additions & 6 deletions lib/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
{
"extends": "tsconfig/react-library.json",
"compilerOptions": {
"outDir": "./dist",
"rootDir": "./src",
"types": ["vitest/globals"],
"resolveJsonModule": true,
"alwaysStrict": false,
"composite": false,
"declaration": true,
"declarationMap": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"ignoreDeprecations": "5.0",
"inlineSources": false,
"isolatedModules": true,
"jsx": "react-jsx",
"lib": ["es2015", "dom"],
"module": "commonjs",
"moduleResolution": "node",
"noImplicitUseStrict": true,
"ignoreDeprecations": "5.0"
"noUnusedLocals": false,
"noUnusedParameters": false,
"outDir": "./dist",
"preserveWatchOutput": true,
"resolveJsonModule": true,
"rootDir": "./src",
"skipLibCheck": true,
"strict": true,
"target": "ESNext",
"types": ["vitest/globals"]
},
"include": ["src"],
"exclude": ["dist", "build", "node_modules"]
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
},
"devDependencies": {
"eslint-config-custom": "workspace:*",
"prettier": "^3.2.5",
"turbo": "^1.12.4"
"prettier": "^3.3.2",
"turbo": "^2.0.4"
},
"packageManager": "pnpm@9.4.0",
"engines": {
"node": ">=16.0.0"
"node": ">=18.0.0"
}
}
Loading

0 comments on commit ba6988b

Please sign in to comment.