Skip to content

Commit

Permalink
Merge branch 'master' of github.com:supabase/storage-api into feat/tu…
Browse files Browse the repository at this point in the history
…s-stable-v1
  • Loading branch information
fenos committed Dec 27, 2023
2 parents 8a4fda7 + 2591add commit b5be4ec
Show file tree
Hide file tree
Showing 13 changed files with 160 additions and 188 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: CI

on:
pull_request_target:
pull_request:
push:
branches:
- master
Expand All @@ -20,12 +20,7 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: actions/cache@v1
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-

- name: Set up Node
uses: actions/setup-node@v1
with:
Expand Down
165 changes: 50 additions & 115 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"test:dummy-data": "tsx -r dotenv/config ./src/test/db/import-dummy-data.ts",
"test": "npm run infra:restart && npm run test:dummy-data && jest --runInBand --forceExit",
"test:coverage": "npm run infra:restart && npm run test:dummy-data && jest --runInBand --coverage --forceExit",
"prettier:check": "prettier -c src/**",
"prettier:check": "prettier -v && prettier -c src/**",
"format": "prettier -c --write src/**",
"eslint:check": "eslint 'src/**'",
"infra:stop": "docker-compose --project-directory . -f src/test/db/docker-compose.yml down --remove-orphans",
Expand All @@ -34,9 +34,9 @@
"@fastify/swagger": "^8.3.1",
"@fastify/swagger-ui": "^1.7.0",
"@isaacs/ttlcache": "^1.4.1",
"@tus/file-store": "https://gitpkg.now.sh/supabase/tus-node-server/packages/file-store/dist?supabase/build-v2",
"@tus/s3-store": "https://gitpkg.now.sh/supabase/tus-node-server/packages/s3-store/dist?supabase/build-v2",
"@tus/server": "https://gitpkg.now.sh/supabase/tus-node-server/packages/server/dist?supabase/build-v2",
"@tus/file-store": "1.1.0",
"@tus/s3-store": "1.2.0",
"@tus/server": "1.2.0",
"agentkeepalive": "^4.2.1",
"async-retry": "^1.3.3",
"axios": "^0.27.2",
Expand Down Expand Up @@ -77,15 +77,15 @@
"@typescript-eslint/parser": "^5.12.1",
"babel-jest": "^29.2.2",
"eslint": "^8.9.0",
"eslint-config-prettier": "^8.4.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-prettier": "^4.2.1",
"form-data": "^4.0.0",
"jest": "^29.2.2",
"js-yaml": "^4.1.0",
"json-schema-to-ts": "^2.5.4",
"mustache": "^4.2.0",
"pino-pretty": "^8.1.0",
"prettier": "^2.5.1",
"prettier": "^2.8.8",
"ts-jest": "^29.0.3",
"ts-node-dev": "^1.1.8",
"tsx": "^3.13.0",
Expand Down
Loading

0 comments on commit b5be4ec

Please sign in to comment.