From c4d97cd972971c7303539cb3732b3aad866ea181 Mon Sep 17 00:00:00 2001 From: Merlijn Vos Date: Tue, 5 Aug 2025 11:28:14 +0200 Subject: [PATCH] Fix publishing to CDN in release CI (#5877) - Output should be `uppy.css` not `styles.css`, as it was before - Actually run the bundle script in `build` - Bundled packages are in theory always fixed, they will never be resolved differently once published, so reflecting that with `workspace:*`. Hopefully this also triggers changesets to always release `uppy` if any of its dependencies change (doesn't happen currently) - Don't force override existing releases in CI --- .github/workflows/release.yml | 4 +- packages/uppy/package.json | 81 +++++++++++----------- yarn.lock | 127 +++++++++++++++++----------------- 3 files changed, 107 insertions(+), 105 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5413ff603..04ab22307 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,14 +66,14 @@ jobs: - name: Upload `uppy` to CDN if: steps.changesets.outputs.published == 'true' - run: node packages/uppy/upload-to-cdn.js uppy --force + run: node packages/uppy/upload-to-cdn.js uppy env: EDGLY_KEY: ${{secrets.EDGLY_KEY}} EDGLY_SECRET: ${{secrets.EDGLY_SECRET}} - name: Upload `@uppy/locales` to CDN if it was released if: steps.changesets.outputs.published == 'true' - run: node packages/uppy/upload-to-cdn.js @uppy/locales --force + run: node packages/uppy/upload-to-cdn.js @uppy/locales env: EDGLY_KEY: ${{secrets.EDGLY_KEY}} EDGLY_SECRET: ${{secrets.EDGLY_SECRET}} diff --git a/packages/uppy/package.json b/packages/uppy/package.json index d9eb3d9aa..56b2593e9 100644 --- a/packages/uppy/package.json +++ b/packages/uppy/package.json @@ -31,49 +31,50 @@ "url": "git+https://github.com/transloadit/uppy.git" }, "dependencies": { - "@uppy/audio": "workspace:^", - "@uppy/aws-s3": "workspace:^", - "@uppy/box": "workspace:^", - "@uppy/companion-client": "workspace:^", - "@uppy/compressor": "workspace:^", - "@uppy/core": "workspace:^", - "@uppy/dashboard": "workspace:^", - "@uppy/drag-drop": "workspace:^", - "@uppy/drop-target": "workspace:^", - "@uppy/dropbox": "workspace:^", - "@uppy/facebook": "workspace:^", - "@uppy/file-input": "workspace:^", - "@uppy/form": "workspace:^", - "@uppy/golden-retriever": "workspace:^", - "@uppy/google-drive": "workspace:^", - "@uppy/google-drive-picker": "workspace:^", - "@uppy/google-photos-picker": "workspace:^", - "@uppy/image-editor": "workspace:^", - "@uppy/informer": "workspace:^", - "@uppy/instagram": "workspace:^", - "@uppy/onedrive": "workspace:^", - "@uppy/progress-bar": "workspace:^", - "@uppy/provider-views": "workspace:^", - "@uppy/redux-dev-tools": "workspace:^", - "@uppy/remote-sources": "workspace:^", - "@uppy/screen-capture": "workspace:^", - "@uppy/status-bar": "workspace:^", - "@uppy/store-default": "workspace:^", - "@uppy/store-redux": "workspace:^", - "@uppy/thumbnail-generator": "workspace:^", - "@uppy/transloadit": "workspace:^", - "@uppy/tus": "workspace:^", - "@uppy/unsplash": "workspace:^", - "@uppy/url": "workspace:^", - "@uppy/webcam": "workspace:^", - "@uppy/webdav": "workspace:^", - "@uppy/xhr-upload": "workspace:^", - "@uppy/zoom": "workspace:^" + "@uppy/audio": "workspace:*", + "@uppy/aws-s3": "workspace:*", + "@uppy/box": "workspace:*", + "@uppy/companion-client": "workspace:*", + "@uppy/compressor": "workspace:*", + "@uppy/core": "workspace:*", + "@uppy/dashboard": "workspace:*", + "@uppy/drag-drop": "workspace:*", + "@uppy/drop-target": "workspace:*", + "@uppy/dropbox": "workspace:*", + "@uppy/facebook": "workspace:*", + "@uppy/file-input": "workspace:*", + "@uppy/form": "workspace:*", + "@uppy/golden-retriever": "workspace:*", + "@uppy/google-drive": "workspace:*", + "@uppy/google-drive-picker": "workspace:*", + "@uppy/google-photos-picker": "workspace:*", + "@uppy/image-editor": "workspace:*", + "@uppy/informer": "workspace:*", + "@uppy/instagram": "workspace:*", + "@uppy/locales": "workspace:*", + "@uppy/onedrive": "workspace:*", + "@uppy/progress-bar": "workspace:*", + "@uppy/provider-views": "workspace:*", + "@uppy/redux-dev-tools": "workspace:*", + "@uppy/remote-sources": "workspace:*", + "@uppy/screen-capture": "workspace:*", + "@uppy/status-bar": "workspace:*", + "@uppy/store-default": "workspace:*", + "@uppy/store-redux": "workspace:*", + "@uppy/thumbnail-generator": "workspace:*", + "@uppy/transloadit": "workspace:*", + "@uppy/tus": "workspace:*", + "@uppy/unsplash": "workspace:*", + "@uppy/url": "workspace:*", + "@uppy/webcam": "workspace:*", + "@uppy/webdav": "workspace:*", + "@uppy/xhr-upload": "workspace:*", + "@uppy/zoom": "workspace:*" }, "scripts": { - "build": "tsc --build tsconfig.build.json", + "build": "tsc --build tsconfig.build.json && yarn build:bundle", "build:bundle": "node build-bundle.mjs", - "build:css": "sass --load-path=../../packages src/style.scss dist/style.css && postcss dist/style.css -u cssnano -o dist/style.min.css", + "build:css": "sass --load-path=../../packages src/style.scss dist/uppy.css && postcss dist/uppy.css -u cssnano -o dist/uppy.min.css", "typecheck": "tsc --build" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 470b971f2..49c700b0b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11238,7 +11238,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/audio@workspace:^, @uppy/audio@workspace:packages/@uppy/audio": +"@uppy/audio@workspace:*, @uppy/audio@workspace:^, @uppy/audio@workspace:packages/@uppy/audio": version: 0.0.0-use.local resolution: "@uppy/audio@workspace:packages/@uppy/audio" dependencies: @@ -11285,7 +11285,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/box@workspace:^, @uppy/box@workspace:packages/@uppy/box": +"@uppy/box@workspace:*, @uppy/box@workspace:^, @uppy/box@workspace:packages/@uppy/box": version: 0.0.0-use.local resolution: "@uppy/box@workspace:packages/@uppy/box" dependencies: @@ -11407,7 +11407,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/compressor@workspace:^, @uppy/compressor@workspace:packages/@uppy/compressor": +"@uppy/compressor@workspace:*, @uppy/compressor@workspace:packages/@uppy/compressor": version: 0.0.0-use.local resolution: "@uppy/compressor@workspace:packages/@uppy/compressor" dependencies: @@ -11481,7 +11481,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/drag-drop@workspace:*, @uppy/drag-drop@workspace:^, @uppy/drag-drop@workspace:packages/@uppy/drag-drop": +"@uppy/drag-drop@workspace:*, @uppy/drag-drop@workspace:packages/@uppy/drag-drop": version: 0.0.0-use.local resolution: "@uppy/drag-drop@workspace:packages/@uppy/drag-drop" dependencies: @@ -11497,7 +11497,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/drop-target@workspace:*, @uppy/drop-target@workspace:^, @uppy/drop-target@workspace:packages/@uppy/drop-target": +"@uppy/drop-target@workspace:*, @uppy/drop-target@workspace:packages/@uppy/drop-target": version: 0.0.0-use.local resolution: "@uppy/drop-target@workspace:packages/@uppy/drop-target" dependencies: @@ -11512,7 +11512,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/dropbox@workspace:^, @uppy/dropbox@workspace:packages/@uppy/dropbox": +"@uppy/dropbox@workspace:*, @uppy/dropbox@workspace:^, @uppy/dropbox@workspace:packages/@uppy/dropbox": version: 0.0.0-use.local resolution: "@uppy/dropbox@workspace:packages/@uppy/dropbox" dependencies: @@ -11527,7 +11527,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/facebook@workspace:^, @uppy/facebook@workspace:packages/@uppy/facebook": +"@uppy/facebook@workspace:*, @uppy/facebook@workspace:^, @uppy/facebook@workspace:packages/@uppy/facebook": version: 0.0.0-use.local resolution: "@uppy/facebook@workspace:packages/@uppy/facebook" dependencies: @@ -11542,7 +11542,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/file-input@workspace:^, @uppy/file-input@workspace:packages/@uppy/file-input": +"@uppy/file-input@workspace:*, @uppy/file-input@workspace:packages/@uppy/file-input": version: 0.0.0-use.local resolution: "@uppy/file-input@workspace:packages/@uppy/file-input" dependencies: @@ -11558,7 +11558,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/form@workspace:*, @uppy/form@workspace:^, @uppy/form@workspace:packages/@uppy/form": +"@uppy/form@workspace:*, @uppy/form@workspace:packages/@uppy/form": version: 0.0.0-use.local resolution: "@uppy/form@workspace:packages/@uppy/form" dependencies: @@ -11570,7 +11570,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/golden-retriever@workspace:^, @uppy/golden-retriever@workspace:packages/@uppy/golden-retriever": +"@uppy/golden-retriever@workspace:*, @uppy/golden-retriever@workspace:packages/@uppy/golden-retriever": version: 0.0.0-use.local resolution: "@uppy/golden-retriever@workspace:packages/@uppy/golden-retriever" dependencies: @@ -11582,7 +11582,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/google-drive-picker@workspace:^, @uppy/google-drive-picker@workspace:packages/@uppy/google-drive-picker": +"@uppy/google-drive-picker@workspace:*, @uppy/google-drive-picker@workspace:packages/@uppy/google-drive-picker": version: 0.0.0-use.local resolution: "@uppy/google-drive-picker@workspace:packages/@uppy/google-drive-picker" dependencies: @@ -11612,7 +11612,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/google-photos-picker@workspace:^, @uppy/google-photos-picker@workspace:packages/@uppy/google-photos-picker": +"@uppy/google-photos-picker@workspace:*, @uppy/google-photos-picker@workspace:packages/@uppy/google-photos-picker": version: 0.0.0-use.local resolution: "@uppy/google-photos-picker@workspace:packages/@uppy/google-photos-picker" dependencies: @@ -11644,7 +11644,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/informer@workspace:^, @uppy/informer@workspace:packages/@uppy/informer": +"@uppy/informer@workspace:*, @uppy/informer@workspace:^, @uppy/informer@workspace:packages/@uppy/informer": version: 0.0.0-use.local resolution: "@uppy/informer@workspace:packages/@uppy/informer" dependencies: @@ -11675,7 +11675,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/locales@workspace:packages/@uppy/locales": +"@uppy/locales@workspace:*, @uppy/locales@workspace:packages/@uppy/locales": version: 0.0.0-use.local resolution: "@uppy/locales@workspace:packages/@uppy/locales" dependencies: @@ -11687,7 +11687,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/onedrive@workspace:^, @uppy/onedrive@workspace:packages/@uppy/onedrive": +"@uppy/onedrive@workspace:*, @uppy/onedrive@workspace:^, @uppy/onedrive@workspace:packages/@uppy/onedrive": version: 0.0.0-use.local resolution: "@uppy/onedrive@workspace:packages/@uppy/onedrive" dependencies: @@ -11702,7 +11702,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/progress-bar@workspace:*, @uppy/progress-bar@workspace:^, @uppy/progress-bar@workspace:packages/@uppy/progress-bar": +"@uppy/progress-bar@workspace:*, @uppy/progress-bar@workspace:packages/@uppy/progress-bar": version: 0.0.0-use.local resolution: "@uppy/progress-bar@workspace:packages/@uppy/progress-bar" dependencies: @@ -11810,7 +11810,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/redux-dev-tools@workspace:^, @uppy/redux-dev-tools@workspace:packages/@uppy/redux-dev-tools": +"@uppy/redux-dev-tools@workspace:*, @uppy/redux-dev-tools@workspace:packages/@uppy/redux-dev-tools": version: 0.0.0-use.local resolution: "@uppy/redux-dev-tools@workspace:packages/@uppy/redux-dev-tools" peerDependencies: @@ -11876,7 +11876,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/store-default@workspace:^, @uppy/store-default@workspace:packages/@uppy/store-default": +"@uppy/store-default@workspace:*, @uppy/store-default@workspace:^, @uppy/store-default@workspace:packages/@uppy/store-default": version: 0.0.0-use.local resolution: "@uppy/store-default@workspace:packages/@uppy/store-default" dependencies: @@ -11886,7 +11886,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/store-redux@workspace:*, @uppy/store-redux@workspace:^, @uppy/store-redux@workspace:packages/@uppy/store-redux": +"@uppy/store-redux@workspace:*, @uppy/store-redux@workspace:packages/@uppy/store-redux": version: 0.0.0-use.local resolution: "@uppy/store-redux@workspace:packages/@uppy/store-redux" dependencies: @@ -11932,7 +11932,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/thumbnail-generator@workspace:^, @uppy/thumbnail-generator@workspace:packages/@uppy/thumbnail-generator": +"@uppy/thumbnail-generator@workspace:*, @uppy/thumbnail-generator@workspace:^, @uppy/thumbnail-generator@workspace:packages/@uppy/thumbnail-generator": version: 0.0.0-use.local resolution: "@uppy/thumbnail-generator@workspace:packages/@uppy/thumbnail-generator" dependencies: @@ -11947,7 +11947,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/transloadit@workspace:*, @uppy/transloadit@workspace:^, @uppy/transloadit@workspace:packages/@uppy/transloadit": +"@uppy/transloadit@workspace:*, @uppy/transloadit@workspace:packages/@uppy/transloadit": version: 0.0.0-use.local resolution: "@uppy/transloadit@workspace:packages/@uppy/transloadit" dependencies: @@ -11983,7 +11983,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/unsplash@workspace:^, @uppy/unsplash@workspace:packages/@uppy/unsplash": +"@uppy/unsplash@workspace:*, @uppy/unsplash@workspace:^, @uppy/unsplash@workspace:packages/@uppy/unsplash": version: 0.0.0-use.local resolution: "@uppy/unsplash@workspace:packages/@uppy/unsplash" dependencies: @@ -12083,7 +12083,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/webdav@workspace:^, @uppy/webdav@workspace:packages/@uppy/webdav": +"@uppy/webdav@workspace:*, @uppy/webdav@workspace:packages/@uppy/webdav": version: 0.0.0-use.local resolution: "@uppy/webdav@workspace:packages/@uppy/webdav" dependencies: @@ -12098,7 +12098,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/xhr-upload@workspace:*, @uppy/xhr-upload@workspace:^, @uppy/xhr-upload@workspace:packages/@uppy/xhr-upload": +"@uppy/xhr-upload@workspace:*, @uppy/xhr-upload@workspace:packages/@uppy/xhr-upload": version: 0.0.0-use.local resolution: "@uppy/xhr-upload@workspace:packages/@uppy/xhr-upload" dependencies: @@ -12114,7 +12114,7 @@ __metadata: languageName: unknown linkType: soft -"@uppy/zoom@workspace:^, @uppy/zoom@workspace:packages/@uppy/zoom": +"@uppy/zoom@workspace:*, @uppy/zoom@workspace:^, @uppy/zoom@workspace:packages/@uppy/zoom": version: 0.0.0-use.local resolution: "@uppy/zoom@workspace:packages/@uppy/zoom" dependencies: @@ -30172,44 +30172,45 @@ __metadata: resolution: "uppy@workspace:packages/uppy" dependencies: "@aws-sdk/client-s3": "npm:^3.338.0" - "@uppy/audio": "workspace:^" - "@uppy/aws-s3": "workspace:^" - "@uppy/box": "workspace:^" - "@uppy/companion-client": "workspace:^" - "@uppy/compressor": "workspace:^" - "@uppy/core": "workspace:^" - "@uppy/dashboard": "workspace:^" - "@uppy/drag-drop": "workspace:^" - "@uppy/drop-target": "workspace:^" - "@uppy/dropbox": "workspace:^" - "@uppy/facebook": "workspace:^" - "@uppy/file-input": "workspace:^" - "@uppy/form": "workspace:^" - "@uppy/golden-retriever": "workspace:^" - "@uppy/google-drive": "workspace:^" - "@uppy/google-drive-picker": "workspace:^" - "@uppy/google-photos-picker": "workspace:^" - "@uppy/image-editor": "workspace:^" - "@uppy/informer": "workspace:^" - "@uppy/instagram": "workspace:^" - "@uppy/onedrive": "workspace:^" - "@uppy/progress-bar": "workspace:^" - "@uppy/provider-views": "workspace:^" - "@uppy/redux-dev-tools": "workspace:^" - "@uppy/remote-sources": "workspace:^" - "@uppy/screen-capture": "workspace:^" - "@uppy/status-bar": "workspace:^" - "@uppy/store-default": "workspace:^" - "@uppy/store-redux": "workspace:^" - "@uppy/thumbnail-generator": "workspace:^" - "@uppy/transloadit": "workspace:^" - "@uppy/tus": "workspace:^" - "@uppy/unsplash": "workspace:^" - "@uppy/url": "workspace:^" - "@uppy/webcam": "workspace:^" - "@uppy/webdav": "workspace:^" - "@uppy/xhr-upload": "workspace:^" - "@uppy/zoom": "workspace:^" + "@uppy/audio": "workspace:*" + "@uppy/aws-s3": "workspace:*" + "@uppy/box": "workspace:*" + "@uppy/companion-client": "workspace:*" + "@uppy/compressor": "workspace:*" + "@uppy/core": "workspace:*" + "@uppy/dashboard": "workspace:*" + "@uppy/drag-drop": "workspace:*" + "@uppy/drop-target": "workspace:*" + "@uppy/dropbox": "workspace:*" + "@uppy/facebook": "workspace:*" + "@uppy/file-input": "workspace:*" + "@uppy/form": "workspace:*" + "@uppy/golden-retriever": "workspace:*" + "@uppy/google-drive": "workspace:*" + "@uppy/google-drive-picker": "workspace:*" + "@uppy/google-photos-picker": "workspace:*" + "@uppy/image-editor": "workspace:*" + "@uppy/informer": "workspace:*" + "@uppy/instagram": "workspace:*" + "@uppy/locales": "workspace:*" + "@uppy/onedrive": "workspace:*" + "@uppy/progress-bar": "workspace:*" + "@uppy/provider-views": "workspace:*" + "@uppy/redux-dev-tools": "workspace:*" + "@uppy/remote-sources": "workspace:*" + "@uppy/screen-capture": "workspace:*" + "@uppy/status-bar": "workspace:*" + "@uppy/store-default": "workspace:*" + "@uppy/store-redux": "workspace:*" + "@uppy/thumbnail-generator": "workspace:*" + "@uppy/transloadit": "workspace:*" + "@uppy/tus": "workspace:*" + "@uppy/unsplash": "workspace:*" + "@uppy/url": "workspace:*" + "@uppy/webcam": "workspace:*" + "@uppy/webdav": "workspace:*" + "@uppy/xhr-upload": "workspace:*" + "@uppy/zoom": "workspace:*" adm-zip: "npm:^0.5.5" chalk: "npm:^5.0.0" concat-stream: "npm:^2.0.0"