Merge branch 'master' of https://github.com/ajayyy/SponsorBlock

.github/workflows/update-oss-attribution.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - 'package.json'
       - 'package-lock.json'
+  workflow_dispatch:
 
 jobs:
   update-oss:
@@ -18,6 +19,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 +31,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
+          body: Automated OSS Attribution update

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 <ip-address of the 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.

public/oss-attribution/attribution.txt

@@ -1,5 +1,5 @@
-js-tokens
-4.0.0 <https://github.com/lydell/js-tokens>
+js-tokens
+4.0.0 <https://github.com/lydell/js-tokens>
 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 <https://github.com/zertosh/loose-envify>
+
+
+******************************
+
+loose-envify
+1.4.0 <https://github.com/zertosh/loose-envify>
 The MIT License (MIT)
 
 Copyright (c) 2015 Andres Suarez <zertosh@gmail.com>
@@ -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 <https://github.com/sindresorhus/object-assign>
+
+
+******************************
+
+object-assign
+4.1.1 <https://github.com/sindresorhus/object-assign>
 The MIT License (MIT)
 
 Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (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 <https://github.com/facebook/react>
+
+
+******************************
+
+react
+17.0.2 <https://github.com/facebook/react>
 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 <https://github.com/facebook/react>
+
+
+******************************
+
+react-dom
+17.0.2 <https://github.com/facebook/react>
 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 <https://github.com/facebook/react>
+
+
+******************************
+
+scheduler
+0.20.2 <https://github.com/facebook/react>
 MIT License
 
 Copyright (c) Facebook, Inc. and its affiliates.