Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add special case for [email protected] optional dependencies #372

Merged
merged 34 commits into from
Jan 2, 2024
Merged

fix: add special case for [email protected] optional dependencies #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
eb01405
test [email protected]
styfle Dec 1, 2023
b3607b6
add a special case for `sharp`
styfle Dec 1, 2023
1e851e5
bye bye yarn.lock
Ethan-Arrowood Dec 13, 2023
d334330
Merge remote-tracking branch 'origin/main' into issue-371
Ethan-Arrowood Dec 13, 2023
614a4b6
add package-lock
Ethan-Arrowood Dec 13, 2023
b3a7df4
bye bye yarn
Ethan-Arrowood Dec 13, 2023
adb1e98
whoops
Ethan-Arrowood Dec 13, 2023
5e3a18c
AHH
Ethan-Arrowood Dec 13, 2023
4d6d3e5
fix shiki output
Ethan-Arrowood Dec 13, 2023
b011392
pnpm time
Ethan-Arrowood Dec 13, 2023
052a95e
Skip microtime-node-gyp on Apple Silicon
Dec 14, 2023
2e4abf5
Fix microtime-node-gyp binary name
Dec 14, 2023
69301fc
Update ffmpeg and oracle deps
Dec 16, 2023
62d1dcf
Update lock file
Dec 16, 2023
8683dc4
Regen lock file
Dec 16, 2023
4e82d56
Update lock file
Dec 18, 2023
188c178
Switch to npm
Dec 18, 2023
278e6bb
Remove lock file
Dec 18, 2023
fe44286
Merge branch 'issue-371' of github.com:vercel/nft into issue-371
Dec 18, 2023
27ab6bd
Disable lock file
Dec 18, 2023
11423b4
Update test output to match npm structure
Dec 18, 2023
b6e182a
Ignore lock files
Dec 18, 2023
d640ef9
Fix test output order
Dec 18, 2023
aaeaa2b
Remove debug
Dec 18, 2023
7089b56
Fixed core-js test
Dec 18, 2023
3754ab3
Disabled ES tests that won't run
Dec 18, 2023
450e75a
Remove debug
Dec 18, 2023
efa55b4
Adding back npm package-lock
Jan 2, 2024
aee79e7
Remove yarn lock
Jan 2, 2024
e160649
Update .github/workflows/ci.yml
cb1kenobi Jan 2, 2024
31d0bf8
Update prepare-install.js
cb1kenobi Jan 2, 2024
8abca5a
change from comments to skip
styfle Jan 2, 2024
572204b
Add packageManager
Jan 2, 2024
0634ff1
Update sharp and regen lock file
Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ jobs:
- name: Prepare Install (if applicable)
run: node prepare-install.js
- name: Install Dependencies
run: yarn install --network-timeout 1000000
run: npm install
- name: Build
run: yarn build
run: npm run build
- name: Run Tests
env:
BULL_REDIS_CONNECTION: ${{ (matrix.os == 'ubuntu-latest') && 'redis://127.0.0.1:6379/0' || '' }}
run: yarn test-verbose
run: npm run test-verbose
- name: Maybe Release
if: matrix.os == 'ubuntu-latest' && matrix.node == 18 && github.event_name == 'push' && github.ref == 'refs/heads/main'
env:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ out
coverage
test/**/dist
test/**/actual.js
yarn.lock
pnpm-lock.yaml
styfle marked this conversation as resolved.
Show resolved Hide resolved
Loading
Loading