Skip to content

Commit

Permalink
Merge branch 'master' into release-1_9_0
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	lerna.json
#	packages/core/abort/package.json
#	packages/core/chunked-sender/package.json
#	packages/core/life-events/package.json
#	packages/core/mock-sender/package.json
#	packages/core/raw-uploader/package.json
#	packages/core/retry/package.json
#	packages/core/safe-storage/package.json
#	packages/core/sender/package.json
#	packages/core/shared/package.json
#	packages/core/simple-state/package.json
#	packages/core/tus-sender/package.json
#	packages/core/uploader/package.json
#	packages/native/native-uploady/package.json
#	packages/ui/chunked-uploady/package.json
#	packages/ui/retry-hooks/package.json
#	packages/ui/shared/package.json
#	packages/ui/tus-uploady/package.json
#	packages/ui/upload-button/package.json
#	packages/ui/upload-drop-zone/package.json
#	packages/ui/upload-paste/package.json
#	packages/ui/upload-preview/package.json
#	packages/ui/upload-url-input/package.json
#	packages/ui/uploady/package.json
#	pnpm-lock.yaml
  • Loading branch information
yoavniran committed Dec 13, 2024
2 parents 7c3537b + 66f6972 commit 61eb285
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bundle-size-report.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"name":"all","size":"23.53KB","max":25000,"success":true},{"name":"core","size":"10.55KB","max":12000,"success":true},{"name":"ui-core","size":"13.52KB","max":15000,"success":true},{"name":"ui-core-chunked","size":"15.93KB","max":17500,"success":true}]
[{"name":"all","size":"23.55KB","max":25000,"success":true},{"name":"core","size":"10.56KB","max":12000,"success":true},{"name":"ui-core","size":"13.53KB","max":15000,"success":true},{"name":"ui-core-chunked","size":"15.95KB","max":17500,"success":true}]
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
},
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"npmClient": "pnpm"
}
}

0 comments on commit 61eb285

Please sign in to comment.