From 2b9a93deb0191a15953110fcbbbb3327ed7c791f Mon Sep 17 00:00:00 2001 From: "Michael M. Chang" Date: Sun, 6 Feb 2022 13:33:02 -0500 Subject: [PATCH 1/4] npm ci to check node_modules --- .github/workflows/update-oss-attribution.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-oss-attribution.yml b/.github/workflows/update-oss-attribution.yml index 4117aa4a..596502ef 100644 --- a/.github/workflows/update-oss-attribution.yml +++ b/.github/workflows/update-oss-attribution.yml @@ -18,6 +18,7 @@ jobs: node-version: '16' - name: Install and generate attribution run: | + npm ci npm i -g oss-attribution-generator generate-attribution mv ./oss-attribution/attribution.txt ./public/oss-attribution/attribution.txt @@ -29,4 +30,4 @@ jobs: author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> branch: ci/oss_attribution title: Update OSS Attribution - body: Automated OSS Attribution update \ No newline at end of file + body: Automated OSS Attribution update From ca49b48814b1e25a72c74d048924ba6074ca85a9 Mon Sep 17 00:00:00 2001 From: "Michael M. Chang" Date: Sun, 6 Feb 2022 13:35:48 -0500 Subject: [PATCH 2/4] workflow_dispatch --- .github/workflows/update-oss-attribution.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update-oss-attribution.yml b/.github/workflows/update-oss-attribution.yml index 596502ef..7a10ece8 100644 --- a/.github/workflows/update-oss-attribution.yml +++ b/.github/workflows/update-oss-attribution.yml @@ -6,6 +6,7 @@ on: paths: - 'package.json' - 'package-lock.json' + workflow_dispatch: jobs: update-oss: From 6867fa88d334f224d9d9e7fc4893a8e54f5041d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 6 Feb 2022 19:17:39 +0000 Subject: [PATCH 3/4] Update OSS Attribution --- public/oss-attribution/attribution.txt | 64 +++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/public/oss-attribution/attribution.txt b/public/oss-attribution/attribution.txt index 2bd47253..2c928295 100644 --- a/public/oss-attribution/attribution.txt +++ b/public/oss-attribution/attribution.txt @@ -1,5 +1,5 @@ -js-tokens -4.0.0 +js-tokens +4.0.0 The MIT License (MIT) Copyright (c) 2014, 2015, 2016, 2017, 2018 Simon Lydell @@ -21,12 +21,12 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -****************************** - -loose-envify -1.4.0 + + +****************************** + +loose-envify +1.4.0 The MIT License (MIT) Copyright (c) 2015 Andres Suarez @@ -48,12 +48,12 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -****************************** - -object-assign -4.1.1 + + +****************************** + +object-assign +4.1.1 The MIT License (MIT) Copyright (c) Sindre Sorhus (sindresorhus.com) @@ -75,12 +75,12 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -****************************** - -react -17.0.2 + + +****************************** + +react +17.0.2 MIT License Copyright (c) Facebook, Inc. and its affiliates. @@ -102,12 +102,12 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -****************************** - -react-dom -17.0.2 + + +****************************** + +react-dom +17.0.2 MIT License Copyright (c) Facebook, Inc. and its affiliates. @@ -129,12 +129,12 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -****************************** - -scheduler -0.20.2 + + +****************************** + +scheduler +0.20.2 MIT License Copyright (c) Facebook, Inc. and its affiliates. From 552b33104b94b0a918032c649f98ac3c9ac75071 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Sun, 6 Feb 2022 14:37:08 -0500 Subject: [PATCH 4/4] Remove instructions for attribute generation, now handled by github action --- README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.md b/README.md index 34d34660..9591f5eb 100644 --- a/README.md +++ b/README.md @@ -82,17 +82,6 @@ Known chromium bug: Extension is not loaded properly on first start. Visit `chro For Firefox for Android, use `npm run dev:firefox-android -- --adb-device `. See the [Firefox documentation](https://extensionworkshop.com/documentation/develop/developing-extensions-for-firefox-for-android/#debug-your-extension) for more information. -### Attribution Generation - -If you contribute and add a dependency, update the attribution file using the following steps: - -Make sure the attribution generator is installed: `npm i -g oss-attribution-generator` - -```bash -generate-attribution -mv ./oss-attribution/attribution.txt ./public/oss-attribution/attribution.txt -``` - # Credit The awesome [Invidious API](https://docs.invidious.io/API.md) was previously used, and the server is now using [NewLeaf](https://git.sr.ht/~cadence/NewLeaf) as a to get video info from YouTube.