From 4e4eddf4a5dda1695763b64a7c8b4f07061bd1ff Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Mon, 15 Nov 2021 23:45:45 +0700 Subject: [PATCH] finish master->main job (#3315) closes #3286 --- examples/aws-presigned-url/composer.lock | 12 ++++++------ examples/transloadit-textarea/index.html | 2 +- examples/transloadit/index.html | 2 +- packages/@uppy/angular/README.md | 2 +- packages/@uppy/companion/README.md | 2 +- packages/@uppy/companion/test/__tests__/companion.js | 8 ++++---- .../companion/test/__tests__/provider-manager.js | 2 +- packages/@uppy/locales/README.md | 2 +- test/endtoend/url-plugin/test.js | 2 +- website/inject.js | 2 +- website/src/docs/companion.md | 8 ++++---- website/src/docs/locales.md | 2 +- website/src/docs/providers.md | 2 +- website/src/docs/react-native.md | 2 +- website/src/docs/stores.md | 2 +- website/src/docs/svelte.md | 2 +- website/src/examples/markdown-snippets/index.ejs | 2 +- website/themes/uppy/layout/example.ejs | 10 +++++----- website/themes/uppy/layout/page.ejs | 2 +- 19 files changed, 34 insertions(+), 34 deletions(-) diff --git a/examples/aws-presigned-url/composer.lock b/examples/aws-presigned-url/composer.lock index 94832f39b6..b038891731 100644 --- a/examples/aws-presigned-url/composer.lock +++ b/examples/aws-presigned-url/composer.lock @@ -51,7 +51,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -116,7 +116,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.2-dev" + "dev-main": "6.2-dev" } }, "autoload": { @@ -174,7 +174,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-main": "1.4-dev" } }, "autoload": { @@ -229,7 +229,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-main": "1.4-dev" } }, "autoload": { @@ -293,7 +293,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-main": "2.0-dev" } }, "autoload": { @@ -342,7 +342,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-main": "1.0.x-dev" } }, "autoload": { diff --git a/examples/transloadit-textarea/index.html b/examples/transloadit-textarea/index.html index 552a245e8d..4567bcff98 100644 --- a/examples/transloadit-textarea/index.html +++ b/examples/transloadit-textarea/index.html @@ -105,7 +105,7 @@

Markdown Bin

- Markdown Bin is a demo app that works a bit like Github Gists or pastebin. You can add markdown snippets, and add file attachments to each snippet by clicking "Upload an attachment" or by dragging files onto the text area. Transloadit generates an inline preview image for images, videos, and audio files. » View the Assembly Template here. + Markdown Bin is a demo app that works a bit like Github Gists or pastebin. You can add markdown snippets, and add file attachments to each snippet by clicking "Upload an attachment" or by dragging files onto the text area. Transloadit generates an inline preview image for images, videos, and audio files. » View the Assembly Template here.

diff --git a/examples/transloadit/index.html b/examples/transloadit/index.html index 39187aaba2..6626d53000 100644 --- a/examples/transloadit/index.html +++ b/examples/transloadit/index.html @@ -29,7 +29,7 @@

Robodog playground

- This page contains small examples for every API offered by the Robodog library. Please see the Github repository for the source code. + This page contains small examples for every API offered by the Robodog library. Please see the Github repository for the source code.

robodog.form()

diff --git a/packages/@uppy/angular/README.md b/packages/@uppy/angular/README.md index 5d656ef047..978016603f 100644 --- a/packages/@uppy/angular/README.md +++ b/packages/@uppy/angular/README.md @@ -2,7 +2,7 @@ Uppy logo: a superman puppy in a pink suit - Build Status + Build Status Angular component wrappers around Uppy’s officially maintained UI plugins. diff --git a/packages/@uppy/companion/README.md b/packages/@uppy/companion/README.md index 991500f053..e22ac4723f 100644 --- a/packages/@uppy/companion/README.md +++ b/packages/@uppy/companion/README.md @@ -2,7 +2,7 @@ Uppy logo — a superman puppy in a pink suit -[![Build Status](https://travis-ci.org/transloadit/uppy.svg?branch=master)](https://travis-ci.org/transloadit/uppy) +[![Build Status](https://travis-ci.org/transloadit/uppy.svg?branch=main)](https://travis-ci.org/transloadit/uppy) Companion is a server integration for [Uppy](https://github.com/transloadit/uppy) file uploader. diff --git a/packages/@uppy/companion/test/__tests__/companion.js b/packages/@uppy/companion/test/__tests__/companion.js index 4c79b82cdb..51b99fe6ee 100644 --- a/packages/@uppy/companion/test/__tests__/companion.js +++ b/packages/@uppy/companion/test/__tests__/companion.js @@ -133,12 +133,12 @@ describe('validate upload data', () => { }) }) -describe('handle master oauth redirect', () => { - const serverWithMasterOauth = getServer({ +describe('handle main oauth redirect', () => { + const serverWithMainOauth = getServer({ COMPANION_OAUTH_DOMAIN: 'localhost:3040', }) test('redirect to a valid uppy instance', () => { - return request(serverWithMasterOauth) + return request(serverWithMainOauth) .get(`/dropbox/redirect?state=${OAUTH_STATE}`) .set('uppy-auth-token', token) .expect(302) @@ -147,7 +147,7 @@ describe('handle master oauth redirect', () => { test('do not redirect to invalid uppy instances', () => { const state = 'state-with-invalid-instance-url' // see mock ../../src/server/helpers/oauth-state above - return request(serverWithMasterOauth) + return request(serverWithMainOauth) .get(`/dropbox/redirect?state=${state}`) .set('uppy-auth-token', token) .expect(400) diff --git a/packages/@uppy/companion/test/__tests__/provider-manager.js b/packages/@uppy/companion/test/__tests__/provider-manager.js index ee6a5d9ed1..fcae8d2c3e 100644 --- a/packages/@uppy/companion/test/__tests__/provider-manager.js +++ b/packages/@uppy/companion/test/__tests__/provider-manager.js @@ -125,7 +125,7 @@ describe('Test Provider options', () => { expect(grantConfig.zoom.secret).toBeUndefined() }) - test('sets a master redirect uri, if oauthDomain is set', () => { + test('sets a main redirect uri, if oauthDomain is set', () => { companionOptions.server.oauthDomain = 'domain.com' providerManager.addProviderOptions(companionOptions, grantConfig) diff --git a/packages/@uppy/locales/README.md b/packages/@uppy/locales/README.md index 17be2b8faf..4275c35e2d 100644 --- a/packages/@uppy/locales/README.md +++ b/packages/@uppy/locales/README.md @@ -7,7 +7,7 @@ ![CI status for Companion tests](https://github.com/transloadit/uppy/workflows/Companion/badge.svg) ![CI status for browser tests](https://github.com/transloadit/uppy/workflows/End-to-end%20tests/badge.svg) -This package includes all the locale packs that you can use to make Uppy speak your language! If your language is missing, please consider [contributing](https://github.com/transloadit/uppy/tree/master/packages/%40uppy/locales/src), starting with `en_US`, which is always up-to-date automatically. +This package includes all the locale packs that you can use to make Uppy speak your language! If your language is missing, please consider [contributing](https://github.com/transloadit/uppy/tree/main/packages/%40uppy/locales/src), starting with `en_US`, which is always up-to-date automatically. ## Installation diff --git a/test/endtoend/url-plugin/test.js b/test/endtoend/url-plugin/test.js index b286802455..40d6d54fda 100644 --- a/test/endtoend/url-plugin/test.js +++ b/test/endtoend/url-plugin/test.js @@ -12,7 +12,7 @@ describe('File upload with URL plugin', () => { // import set url value const urlInput = await browser.$('input.uppy-Url-input') await urlInput.waitForDisplayed(3000) - await urlInput.setValue('https://github.com/transloadit/uppy/raw/master/assets/palette.png') + await urlInput.setValue('https://github.com/transloadit/uppy/raw/main/assets/palette.png') const importButton = await browser.$('button.uppy-Url-importButton') await importButton.click() diff --git a/website/inject.js b/website/inject.js index 469208dddd..3eff259ef2 100644 --- a/website/inject.js +++ b/website/inject.js @@ -225,7 +225,7 @@ function injectLocaleList () { const regionName = regionalDisplayNames.of(regionCode) const npmPath = `@uppy/locales/lib/${localeName}` const cdnPath = `[\`${localeName}.min.js\`](https://releases.transloadit.com/uppy/locales/v${localePackageVersion}/${localeName}.min.js)` - const githubSource = `[\`${localeName}.js\`](https://github.com/transloadit/uppy/blob/master/packages/%40uppy/locales/src/${localeName}.js)` + const githubSource = `[\`${localeName}.js\`](https://github.com/transloadit/uppy/blob/main/packages/%40uppy/locales/src/${localeName}.js)` const mdTableRow = `| ${languageName}
${regionName}${variant ? `
(${variant})` : ''} | ${npmPath} | ${cdnPath} | ✏️ ${githubSource} |` mdRows.push(mdTableRow) diff --git a/website/src/docs/companion.md b/website/src/docs/companion.md index 3fd3f50a97..f2dbce800d 100644 --- a/website/src/docs/companion.md +++ b/website/src/docs/companion.md @@ -13,7 +13,7 @@ Drag and drop, webcam, basic file manipulation (adding metadata, for example) an -However, if you add [Companion](https://github.com/transloadit/uppy/tree/master/packages/@uppy/companion) to the mix, your users will be able to select files from remote sources, such as Instagram, Google Drive and Dropbox, bypassing the client (so a 5 GB video isn’t eating into your users’ data plans), and then uploaded to the final destination. Files are removed from Companion after an upload is complete, or after a reasonable timeout. Access tokens also don’t stick around for long, for security reasons. +However, if you add [Companion](https://github.com/transloadit/uppy/tree/main/packages/@uppy/companion) to the mix, your users will be able to select files from remote sources, such as Instagram, Google Drive and Dropbox, bypassing the client (so a 5 GB video isn’t eating into your users’ data plans), and then uploaded to the final destination. Files are removed from Companion after an upload is complete, or after a reasonable timeout. Access tokens also don’t stick around for long, for security reasons. Companion handles the server-to-server communication between your server and file storage providers such as Google Drive, Dropbox, Instagram, etc. Note that you can **not** upload files **to** Companion, it only handles the third party integrations. @@ -250,7 +250,7 @@ export COMPANION_STREAMING_UPLOAD=true export COMPANION_MAX_FILE_SIZE="100000000" ``` -See [env.example.sh](https://github.com/transloadit/uppy/blob/master/env.example.sh) for an example configuration script. +See [env.example.sh](https://github.com/transloadit/uppy/blob/main/env.example.sh) for an example configuration script. ### Options @@ -419,7 +419,7 @@ app.use(uppy.app({ ### Running in Kubernetes -We have [a detailed guide on running Companion in Kubernetes](https://github.com/transloadit/uppy/blob/master/packages/%40uppy/companion/KUBERNETES.md) for you, that’s how we run our example server at . +We have [a detailed guide on running Companion in Kubernetes](https://github.com/transloadit/uppy/blob/main/packages/%40uppy/companion/KUBERNETES.md) for you, that’s how we run our example server at . ### Adding custom providers @@ -575,7 +575,7 @@ This would get the Companion instance running on `http://localhost:3020`. It use ## Live example -An example server is running at , which is deployed with [Kubernetes](https://github.com/transloadit/uppy/blob/master/packages/%40uppy/companion/KUBERNETES.md) +An example server is running at , which is deployed with [Kubernetes](https://github.com/transloadit/uppy/blob/main/packages/%40uppy/companion/KUBERNETES.md) ## How the Authentication and Token mechanism works diff --git a/website/src/docs/locales.md b/website/src/docs/locales.md index 4e7a6b3d38..3edef4159a 100644 --- a/website/src/docs/locales.md +++ b/website/src/docs/locales.md @@ -79,7 +79,7 @@ uppy.use(DragDrop, { If you speak a language we don’t yet support, you can contribute! Here’s how you do it: -1. Go to the [uppy/locales](https://github.com/transloadit/uppy/tree/master/packages/%40uppy/locales/src) directory in the Uppy GitHub repo. +1. Go to the [uppy/locales](https://github.com/transloadit/uppy/tree/main/packages/%40uppy/locales/src) directory in the Uppy GitHub repo. 2. Go to `en_US.js` and copy its contents, as English is the most up-to-date locale. 3. Press “Create new file”, name it according to the [`language_COUNTRY` format](http://www.i18nguy.com/unicode/language-identifiers.html), make sure to use underscore `_` as a divider. Examples: `en_US`, `en_GB`, `ru_RU`, `ar_AE`. Variants should be trailing, for example `sr_RS_Latin` for Serbian Latin vs Cyrillic. 4. If your language has different pluralization rules than English, update the `pluralize` implementation. If you are unsure how to do this, please ask us for help in a [GitHub issue](https://github.com/transloadit/uppy/issues/new). diff --git a/website/src/docs/providers.md b/website/src/docs/providers.md index 47bcf492f3..dad6e5b07d 100644 --- a/website/src/docs/providers.md +++ b/website/src/docs/providers.md @@ -6,7 +6,7 @@ order: 10 category: "Sources" --- -The Provider plugins help you connect to your accounts with remote file providers such as [Dropbox](https://dropbox.com), [Google Drive](https://drive.google.com), [Instagram](https://instagram.com) and remote URLs (importing a file by pasting a direct link to it). Because this requires server-to-server communication, they work tightly with [Companion](https://github.com/transloadit/uppy/tree/master/packages/%40uppy/companion) to manage the server-to-server authorization for your account. Almost all the communication (file download/upload) is done on the server-to-server end, so this saves you the stress and bills of data consumption on the client. +The Provider plugins help you connect to your accounts with remote file providers such as [Dropbox](https://dropbox.com), [Google Drive](https://drive.google.com), [Instagram](https://instagram.com) and remote URLs (importing a file by pasting a direct link to it). Because this requires server-to-server communication, they work tightly with [Companion](https://github.com/transloadit/uppy/tree/main/packages/%40uppy/companion) to manage the server-to-server authorization for your account. Almost all the communication (file download/upload) is done on the server-to-server end, so this saves you the stress and bills of data consumption on the client. As of now, the supported providers are [**Dropbox**](/docs/dropbox), [**Google Drive**](/docs/google-drive), [**OneDrive**](/docs/onedrive/), [**Box**](/docs/box/), [**Instagram**](/docs/instagram), [**Facebook**](/docs/facebook/), [**Zoom**](/docs/zoom/) and [**URL**](/docs/url). diff --git a/website/src/docs/react-native.md b/website/src/docs/react-native.md index 1e0845f62d..e277b04d22 100644 --- a/website/src/docs/react-native.md +++ b/website/src/docs/react-native.md @@ -11,7 +11,7 @@ category: "React" `@uppy/react-native` is a basic Uppy component for React Native with Expo. This plugin is still in development, and is not fully featured. You can select local images or videos, take pictures with a camera or add any files from [remote urls](/docs/url) with the help of a server-side component, [Uppy Companion](/docs/companion). -Make sure to check out the example in [examples/react-native-expo](https://github.com/transloadit/uppy/tree/master/examples/react-native-expo). +Make sure to check out the example in [examples/react-native-expo](https://github.com/transloadit/uppy/tree/main/examples/react-native-expo). diff --git a/website/src/docs/stores.md b/website/src/docs/stores.md index af366fe68c..28c30590d5 100644 --- a/website/src/docs/stores.md +++ b/website/src/docs/stores.md @@ -137,4 +137,4 @@ function defaultStore () { A pattern like this, where users can pass options via a function call if necessary, is recommended. -See the [@uppy/store-default](https://github.com/transloadit/uppy/tree/master/packages/%40uppy/store-default) package for more inspiration. +See the [@uppy/store-default](https://github.com/transloadit/uppy/tree/main/packages/%40uppy/store-default) package for more inspiration. diff --git a/website/src/docs/svelte.md b/website/src/docs/svelte.md index 95755a8dc6..8adbad9e2a 100644 --- a/website/src/docs/svelte.md +++ b/website/src/docs/svelte.md @@ -25,7 +25,7 @@ yarn add @uppy/svelte Make sure to also include the necessary CSS files for each Uppy Svelte component you are using. -For [the example](https://github.com/transloadit/uppy/tree/master/examples/svelte-example), we used `svelte-preprocess` and `postcss` to allow imports in CSS. Here is a basic guide for getting that configured with Rollup. +For [the example](https://github.com/transloadit/uppy/tree/main/examples/svelte-example), we used `svelte-preprocess` and `postcss` to allow imports in CSS. Here is a basic guide for getting that configured with Rollup. ```shell npm install -D postcss postcss-import postcss-load-config diff --git a/website/src/examples/markdown-snippets/index.ejs b/website/src/examples/markdown-snippets/index.ejs index e181efaf1e..179cda8e52 100644 --- a/website/src/examples/markdown-snippets/index.ejs +++ b/website/src/examples/markdown-snippets/index.ejs @@ -11,7 +11,7 @@ This is a demo app that works a bit like Github Gists or Pastebin. You can add m Uppy Robodog (using Transloadit internally) generates an inline preview image for images, videos, and audio files. -You can view the Transloadit Assembly Template and the code for this demo. +You can view the Transloadit Assembly Template and the code for this demo. {% endblockquote %}

diff --git a/website/themes/uppy/layout/example.ejs b/website/themes/uppy/layout/example.ejs index 9ebd007812..47b9544ee3 100644 --- a/website/themes/uppy/layout/example.ejs +++ b/website/themes/uppy/layout/example.ejs @@ -12,12 +12,12 @@ is actively developed and the example section is our playground. Things might not work, but we're working hard to improve.

We're on a monthly release cycle and our latest version is - v<%- theme.uppy_version %>, - but the example pages reflect the latest work in our master branch. Here's - what changed in master since v<%- theme.uppy_version %> + v<%- theme.uppy_version %>, + but the example pages reflect the latest work in our main branch. Here's + what changed in main since v<%- theme.uppy_version %> in terms of commits, while the CHANGELOG provides a higher level view of the things planned for our - next release.

+ next release.