Skip to content

Commit

Permalink
Update (#368)
Browse files Browse the repository at this point in the history
* pnpm v8

* update esbuild + ts

* link directory false

* fix lock
  • Loading branch information
PabloSzx authored May 8, 2023
1 parent 5043a09 commit 510d126
Show file tree
Hide file tree
Showing 16 changed files with 1,204 additions and 1,046 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/canary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
fetch-depth: 0

- name: Setup Node.js 14.x
- name: Setup Node.js 16.x
uses: actions/setup-node@master
with:
node-version: 14.x
node-version: 16.x

- name: Setup NPM credentials
run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
fetch-depth: 0

- name: Setup Node.js 14.x
- name: Setup Node.js 16.x
uses: actions/setup-node@master
with:
node-version: 14.x
node-version: 16.x

- name: Cache pnpm modules
uses: actions/cache@v3
Expand All @@ -34,7 +34,7 @@ jobs:
restore-keys: |
${{ runner.os }}-
- name: install pnpm
run: npm i pnpm@^7.1.1 -g
run: npm i pnpm@^8.4.0 -g

- name: Install Dependencies
run: pnpm i
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
node_version: [14, 16, 18]
node_version: [16, 18]
steps:
- name: Checkout Repo
uses: actions/checkout@master
Expand Down
7 changes: 4 additions & 3 deletions examples/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,12 @@
},
"devDependencies": {
"@types/node": "^18.7.9",
"esbuild": "^0.15.5",
"typescript": "^4.7.4"
"esbuild": "^0.17.18",
"typescript": "^5.0.4"
},
"publishConfig": {
"directory": "lib"
"directory": "lib",
"linkDirectory": false
},
"buildConfig": {
"bin": {
Expand Down
6 changes: 3 additions & 3 deletions examples/nextjs-custom-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
},
"dependencies": {
"bob-tsm": "workspace:^1.1.2",
"next": "^12.2.5",
"next": "^12.3.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/node": "^18.7.9",
"@types/react": "^18.0.17",
"cross-env": "^7.0.3",
"esbuild": "^0.15.5",
"typescript": "^4.7.4"
"esbuild": "^0.17.18",
"typescript": "^5.0.4"
},
"dependenciesMeta": {
"bob-tsm": {
Expand Down
4 changes: 2 additions & 2 deletions examples/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"bob-esbuild-cli": "workspace:^4.0.0"
},
"devDependencies": {
"esbuild": "^0.15.5",
"typescript": "^4.7.4"
"esbuild": "^0.17.18",
"typescript": "^5.0.4"
},
"dependenciesMeta": {
"bob-esbuild-cli": {
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
"@manypkg/get-packages": "^1.1.3",
"@types/node": "^18.7.9",
"changesets-github-release": "^0.1.0",
"esbuild": "^0.15.5",
"esbuild": "^0.17.18",
"husky": "^8.0.1",
"prettier": "^2.7.1",
"pretty-quick": "^3.1.3",
"rimraf": "^3.0.2",
"semver": "^7.3.7",
"tsm": "^2.2.2",
"typescript": "^4.7.4"
"typescript": "^5.0.4"
},
"engines": {
"pnpm": ">=7.1.1"
"pnpm": ">=8.4.0"
},
"pnpm": {
"peerDependencyRules": {
Expand Down
2 changes: 1 addition & 1 deletion packages/bob-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"devDependencies": {
"bob-esbuild": "workspace:^4.0.3",
"changesets-github-release": "^0.1.0",
"typescript": "^4.7.4"
"typescript": "^5.0.4"
},
"peerDependencies": {
"bob-esbuild": "workspace:^4.0.0"
Expand Down
7 changes: 4 additions & 3 deletions packages/bob-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@
"bob-esbuild-cli": "workspace:^4.0.0",
"changesets-github-release": "^0.1.0",
"commander": "^9.4.0",
"esbuild": "^0.15.5",
"esbuild": "^0.17.18",
"execa": "^6.1.0",
"globby": "^13.1.2",
"rollup-plugin-delete": "^2.0.0",
"rollup-plugin-node-externals": "^4.1.1",
"rollup-plugin-tsconfig-paths": "^1.3.0",
"tree-kill": "^1.2.2",
"typescript": "^4.7.4"
"typescript": "^5.0.4"
},
"peerDependencies": {
"@types/node": "*",
Expand All @@ -72,7 +72,8 @@
},
"publishConfig": {
"access": "public",
"directory": "lib"
"directory": "lib",
"linkDirectory": false
},
"typesVersions": {
"*": {
Expand Down
7 changes: 4 additions & 3 deletions packages/bob-tsm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
"c8": "^7.12.0",
"chokidar": "^3.5.3",
"commander": "^9.4.0",
"esbuild": "^0.15.5",
"esbuild": "^0.17.18",
"execa": "^6.1.0",
"tree-kill": "^1.2.2",
"typescript": "^4.7.4",
"typescript": "^5.0.4",
"typescript-paths": "^1.4.0"
},
"peerDependencies": {
Expand All @@ -68,6 +68,7 @@
},
"publishConfig": {
"access": "public",
"directory": "lib"
"directory": "lib",
"linkDirectory": false
}
}
3 changes: 2 additions & 1 deletion packages/bob-watch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
},
"publishConfig": {
"access": "public",
"directory": "lib"
"directory": "lib",
"linkDirectory": false
}
}
7 changes: 4 additions & 3 deletions packages/bob/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"changesets-github-release": "^0.1.0",
"cosmiconfig": "^7.0.1",
"date-fns": "^2.29.2",
"esbuild": "^0.15.5",
"esbuild": "^0.17.18",
"execa": "^6.1.0",
"fast-glob": "^3.2.11",
"folder-hash": "^4.0.2",
Expand All @@ -59,7 +59,7 @@
"rollup-plugin-tsconfig-paths": "^1.3.0",
"tree-kill": "^1.2.2",
"tsconfck": "^2.0.1",
"typescript": "^4.7.4"
"typescript": "^5.0.4"
},
"peerDependencies": {
"esbuild": ">=0.14.39",
Expand All @@ -75,6 +75,7 @@
},
"publishConfig": {
"access": "public",
"directory": "lib"
"directory": "lib",
"linkDirectory": false
}
}
2 changes: 1 addition & 1 deletion packages/bob/src/utils/getDefault.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export function getDefault<T>(v: T | { default?: T }) {
return (('default' in v ? v.default : v) || v) as T;
return ((typeof v === 'object' && v != null && 'default' in v ? v.default : v) || v) as T;
}
7 changes: 4 additions & 3 deletions packages/esbuild-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
},
"devDependencies": {
"changesets-github-release": "^0.1.0",
"esbuild": "^0.15.5",
"esbuild": "^0.17.18",
"rollup": "^2.78.1",
"tsconfck": "^2.0.1",
"tsup": "^6.2.2"
"tsup": "^6.7.0"
},
"peerDependencies": {
"esbuild": ">=0.14.39",
Expand All @@ -52,7 +52,8 @@
},
"publishConfig": {
"access": "public",
"directory": "lib"
"directory": "lib",
"linkDirectory": false
},
"tsup": {
"entryPoints": [
Expand Down
Loading

0 comments on commit 510d126

Please sign in to comment.