Skip to content

Commit

Permalink
Merge pull request #4 from fuzmish/fix/upgrade
Browse files Browse the repository at this point in the history
Fix/upgrade
  • Loading branch information
fuzmish authored Oct 5, 2024
2 parents 4d3a5a0 + 1b4d8c1 commit 0ef0ac5
Show file tree
Hide file tree
Showing 7 changed files with 3,160 additions and 2,604 deletions.
11 changes: 11 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM node:22-bookworm

# setup pnpm
ARG PNPM_VERSION=9.12.0
ARG PNPM_ENV_FILE=/etc/profile.d/pnpm.sh
ARG PNPM_STORE_DIR=/opt/pnpm/store

RUN curl -fsSL https://get.pnpm.io/install.sh \
| ENV="$PNPM_ENV_FILE" SHELL="$(which sh)" PNPM_VERSION="$PNPM_VERSION" sh - \
&& . "$PNPM_ENV_FILE" \
&& pnpm config set store-dir "$PNPM_STORE_DIR"
12 changes: 9 additions & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "node:20-bookworm",
"dockerFile": "./Dockerfile",
"containerEnv": {
"GIT_EDITOR": "code --wait"
},
Expand All @@ -12,11 +12,17 @@
]
}
},
"features": {
"ghcr.io/devcontainers/features/common-utils:2": {
"configureZshAsDefaultShell": true,
"upgradePackages": false
}
},
"mounts": [
{
"type": "volume",
"source": "cw-iam-cache-node_modules",
"target": "${containerWorkspaceFolder}/node_modules"
"source": "cw-iam-pnpm-store",
"target": "/opt/pnpm/store"
}
]
}
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: 22
cache: yarn
- run: yarn install --immutable
- run: yarn build
Expand Down
10 changes: 8 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,11 @@
}
},
"eslint.experimental.useFlatConfig": true,
"typescript.updateImportsOnFileMove.enabled": "always"
}
"typescript.updateImportsOnFileMove.enabled": "always",
"terminal.integrated.defaultProfile.linux": "zsh",
"terminal.integrated.profiles.linux": {
"zsh": {
"path": "zsh"
}
}
}
49 changes: 25 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,37 @@
"name": "cw-iam",
"version": "0.0.1",
"private": true,
"homepage": "https://fuzmish.github.io/cw-iam",
"homepage": "https://github.com/fuzmish/cw-iam",
"type": "module",
"dependencies": {
"fuse.js": "^7.0.0",
"highlight.js": "^11.9.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^5.0.1",
"react-resizable-panels": "^1.0.9",
"react-router-dom": "^6.21.3",
"react-virtuoso": "^4.6.2",
"swr": "^2.2.4"
},
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"preview": "vite preview"
},
"packageManager": "[email protected]+sha512.4abf725084d7bcbafbd728bfc7bee61f2f791f977fd87542b3579dcb23504d170d46337945e4c66485cd12d588a0c0e570ed9c477e7ccdd8507cf05f3f92eaca",
"dependencies": {
"fuse.js": "^7.0.0",
"highlight.js": "^11.10.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-icons": "^5.3.0",
"react-resizable-panels": "^2.1.4",
"react-router-dom": "^6.26.2",
"react-virtuoso": "^4.10.4",
"swr": "^2.2.5"
},
"devDependencies": {
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"@vitejs/plugin-react": "^4.3.2",
"eslint": "^9.12.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react": "^7.37.1",
"prettier": "^3.3.3",
"typescript": "^5.6.2",
"vite": "^5.4.8"
},
"browserslist": {
"production": [
">0.2%",
Expand All @@ -31,17 +44,5 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@types/react-dom": "^18.2.18",
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react": "^7.33.2",
"prettier": "^3.2.4",
"typescript": "^5.3.3",
"vite": "^5.0.13"
}
}
Loading

0 comments on commit 0ef0ac5

Please sign in to comment.