Skip to content

Commit 6390b58

Browse files
authored
Move to pnpm (#101)
1 parent 684692a commit 6390b58

File tree

8 files changed

+11383
-28
lines changed

8 files changed

+11383
-28
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
version: 2
22
updates:
33
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
- package-ecosystem: "npm"
48
directory: "/"
59
schedule:
610
interval: "weekly"

.github/workflows/test.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,24 @@ jobs:
2222
uses: actions/setup-node@v4
2323
with:
2424
node-version: ${{ matrix.node-version }}
25+
- name: Setup pnpm
26+
uses: pnpm/action-setup@v4
27+
- name: Get pnpm store directory
28+
shell: bash
29+
run: |
30+
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
31+
- name: Setup pnpm cache
32+
uses: actions/cache@v4
33+
with:
34+
path: ${{ env.STORE_PATH }}
35+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
36+
restore-keys: |
37+
${{ runner.os }}-pnpm-store-
2538
- name: Install
26-
run: npm install
27-
- name: Install playwright
28-
run: npx playwright install --with-deps
39+
run: pnpm install
40+
- name: Install playwright browsers
41+
run: pnpm --filter packages/reference-app exec playwright install --with-deps
2942
- name: Build
30-
run: npm run build
43+
run: pnpm run build
3144
- name: Run tests
32-
run: npm test
45+
run: pnpm test

package.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,15 @@
55
"packages/*"
66
],
77
"scripts": {
8-
"dev": "npm --workspace packages/reference-app run dev",
9-
"build": "npm --workspace packages/adapter run build && npm --workspace packages/reference-app run build",
10-
"test": "npm --workspace packages/adapter run test && npm --workspace packages/reference-app run test",
11-
"release": "npm --workspace packages/adapter run release"
8+
"dev": "pnpm run --parallel '/dev/'",
9+
"dev:adapter": "pnpm --filter packages/adapter run dev",
10+
"dev:app": "pnpm --filter packages/reference-app run dev",
11+
"build": "pnpm run -r build",
12+
"test": "pnpm run -r test",
13+
"release": "pnpm --filter packages/adapter run release"
14+
},
15+
"packageManager": "[email protected]+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
16+
"devDependencies": {
17+
"vite-plugin-devtools-json": "^1.0.0"
1218
}
1319
}

packages/adapter/package.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,22 @@
3030
"./types": "./build/src/types/main.js"
3131
},
3232
"scripts": {
33-
"build": "npm run compile",
33+
"build": "pnpm run compile",
3434
"clean": "del-cli build",
35-
"compile": "npm run clean && tsc",
35+
"compile": "pnpm run clean && tsc",
36+
"dev": "tsc --watch --preserveWatchOutput",
3637
"copy:templates": "copyfiles \"stubs/**/**/*.stub\" build",
3738
"copy:readme": "copyfiles -u 2 \"../../*.md\" build",
3839
"format": "prettier --write .",
3940
"lint": "eslint . --ext=.ts",
40-
"postcompile": "npm run copy:templates && npm run copy:readme && npm run index:commands",
41-
"precompile": "npm run lint",
42-
"prepublishOnly": "npm run build",
41+
"postcompile": "pnpm run copy:templates && pnpm run copy:readme && pnpm run index:commands",
42+
"precompile": "pnpm run lint",
43+
"prepublishOnly": "pnpm run build",
4344
"quick:test": "node --enable-source-maps --loader=ts-node/esm bin/test.ts",
44-
"release": "npm version patch --force && npm publish",
45+
"release": "pnpm version patch --force && pnpm publish",
4546
"test": "cross-env NODE_DEBUG=adonisjs:*,matstack:* NODE_ENV=test node --loader ts-node/esm --enable-source-maps bin/test.ts",
4647
"typecheck": "tsc --noEmit",
47-
"version": "npm run build",
48+
"version": "pnpm run build",
4849
"index:commands": "adonis-kit index build/commands"
4950
},
5051
"dependencies": {
@@ -60,6 +61,7 @@
6061
"@adonisjs/vite": "^4.0.0",
6162
"@japa/assert": "^3.0.0",
6263
"@japa/expect": "^3.0.2",
64+
"@japa/file-system": "^2.3.2",
6365
"@japa/runner": "^3.1.4",
6466
"@swc/core": "^1.9.2",
6567
"@types/node": "^22.9.0",
@@ -70,6 +72,7 @@
7072
"cross-env": "^7.0.3",
7173
"del-cli": "^6.0.0",
7274
"eslint": "^8.57.0",
75+
"get-port": "^7.1.0",
7376
"node-mocks-http": "^1.16.1",
7477
"np": "^10.0.7",
7578
"prettier": "^3.3.3",

packages/reference-app/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@adonisjs/assembler": "^7.8.2",
3737
"@adonisjs/eslint-config": "^1.3.0",
3838
"@adonisjs/prettier-config": "^1.4.0",
39-
"@adonisjs/tsconfig": "^1.4.0",
39+
"@adonisjs/tsconfig": "^1.4.1",
4040
"@japa/assert": "^3.0.0",
4141
"@japa/file-system": "^2.3.2",
4242
"@japa/plugin-adonisjs": "^3.0.1",
@@ -50,6 +50,7 @@
5050
"@types/react-dom": "^19.0.3",
5151
"eslint": "^8.57.0",
5252
"hot-hook": "^0.4.0",
53+
"playwright": "^1.55.0",
5354
"prettier": "^3.4.2",
5455
"ts-node": "^10.9.2",
5556
"typescript": "~5.7",
@@ -65,7 +66,7 @@
6566
"@adonisjs/vite": "^4.0.0",
6667
"@japa/api-client": "^2.0.4",
6768
"@japa/browser-client": "^2.1.1",
68-
"@matstack/remix-adonisjs": "*",
69+
"@matstack/remix-adonisjs": "workspace:*",
6970
"@react-router/node": "^7.6.0",
7071
"@react-router/serve": "^7.6.0",
7172
"@vinejs/vine": "^3.0.0",
Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
import { reactRouter } from '@react-router/dev/vite'
2-
import { defineConfig } from 'vite'
1+
import { reactRouter } from '@react-router/dev/vite';
2+
import { defineConfig } from 'vite';
3+
import devtoolsJson from 'vite-plugin-devtools-json';
34

45
export default defineConfig({
5-
plugins: [reactRouter()],
6-
server: {
7-
warmup: {
8-
clientFiles: [
9-
'./resources/remix_app/**/*.tsx',
10-
],
11-
},
12-
},
6+
plugins: [reactRouter(), devtoolsJson()],
137
})

0 commit comments

Comments
 (0)