Merge branch 'master' into master

Author: arturparkhisenko

.eslintrc.js

@@ -5,10 +5,11 @@ const WARNING = 1;
 const ERROR = 2;
 
 module.exports = {
-    extends: '@vimeo/eslint-config-player/es6',
+    root: true,
+    extends: [],
     plugins: ['compat'],
     parserOptions: {
-        ecmaVersion: 12
+        ecmaVersion: 2021
     },
     parser: '@babel/eslint-parser',
     rules: {

.github/workflows/build.yml

@@ -4,17 +4,17 @@ jobs:
     run:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - name: Set Node.js 16.x
-              uses: actions/setup-node@v3
+            - name: Set Node.js 18.x
+              uses: actions/setup-node@v4
               with:
-                  node-version: 16.x
+                  node-version: 18.x
 
             - name: Install packages
               uses: borales/actions-yarn@v4
               with:
-                  cmd: install
+                  cmd: install --frozen-lockfile
 
             - name: Build production bundle
               uses: borales/actions-yarn@v4
@@ -37,4 +37,6 @@ jobs:
                   cmd: report-coverage
 
             - name: Upload coverage reports to Codecov
-              uses: codecov/codecov-action@v3
+              uses: codecov/codecov-action@v5
+              with:
+                  token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/pr-merge.yml

@@ -7,17 +7,17 @@ jobs:
     upload:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - name: Set Node.js 16.x
-              uses: actions/setup-node@v3
+            - name: Set Node.js 18.x
+              uses: actions/setup-node@v4
               with:
-                  node-version: 16.x
+                  node-version: 18.x
 
             - name: Install packages
               uses: borales/actions-yarn@v4
               with:
-                  cmd: install
+                  cmd: install --frozen-lockfile
 
             - name: Test
               uses: borales/actions-yarn@v4
@@ -30,4 +30,6 @@ jobs:
                   cmd: report-coverage
 
             - name: Upload coverage reports to Codecov
-              uses: codecov/codecov-action@v3
+              uses: codecov/codecov-action@v5
+              with:
+                  token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/publish-package.yml

@@ -8,11 +8,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
+          node-version: '18.x'
           registry-url: 'https://registry.npmjs.org'
           scope: '@vimeo'
       - run: yarn --frozen-lockfile

README.md

@@ -1,4 +1,4 @@
-# Vimeo Player API [![npm](https://img.shields.io/npm/v/@vimeo/player.svg?cacheSeconds=120)](https://www.npmjs.com/package/@vimeo/player) [![Coverage](https://img.shields.io/codecov/c/github/vimeo/player.js.svg?cacheSeconds=120)](https://codecov.io/gh/vimeo/player.js) ![Badge size](https://img.badgesize.io/https://raw.githubusercontent.com/vimeo/player.js/master/dist/player.min.js?compression=gzip&label=gzip)
+# Vimeo Player API [![npm](https://img.shields.io/npm/v/@vimeo/player.svg?cacheSeconds=120)](https://www.npmjs.com/package/@vimeo/player) [![Coverage](https://img.shields.io/codecov/c/github/vimeo/player.js.svg?cacheSeconds=120)](https://codecov.io/gh/vimeo/player.js) ![Badge size](https://img.badgesize.io/https://player.vimeo.com/api/player.js?compression=gzip&label=gzip)
 
 The Vimeo Player API allows you to interact with and control an embedded Vimeo
 Player.
@@ -57,7 +57,7 @@ You can use the library to make the embed for you. All you need is an empty
 element and the video id or vimeo.com url (and optional
 [embed options](#embed-options)).
 
-**NOTE:** If the video [privacy settings](https://vimeo.zendesk.com/hc/en-us/articles/224817847-Privacy-settings-overview) are "Unlisted", instead of providing an `id` property, you will need to provide the full video URL as a `url` property and include the `h` parameter.
+**NOTE:** If the video [privacy settings](https://help.vimeo.com/hc/en-us/articles/12426199699985-Overview-of-video-privacy-settings) are "Unlisted", instead of providing an `id` property, you will need to provide the full video URL as a `url` property and include the `h` parameter.
 
 ```html
 <div id="made-in-ny"></div>
@@ -88,7 +88,7 @@ attributes. Each element must have at least a `data-vimeo-id` or
 You can also add attributes for any of the [embed options](#embed-options),
 prefixed with `data-vimeo` (`data-vimeo-portrait="false"`, for example).
 
-**NOTE:** If the video [privacy settings](https://vimeo.zendesk.com/hc/en-us/articles/224817847-Privacy-settings-overview) are "Unlisted", instead of providing a `data-vimeo-id` attribute, you will need to provide the full video URL in a `data-vimeo-url` attribute and include the `h` parameter.
+**NOTE:** If the video [privacy settings](https://help.vimeo.com/hc/en-us/articles/12426199699985-Overview-of-video-privacy-settings) are "Unlisted", instead of providing a `data-vimeo-id` attribute, you will need to provide the full video URL in a `data-vimeo-url` attribute and include the `h` parameter.
 
 ```html
 <div data-vimeo-id="19231868" data-vimeo-width="640" id="handstick"></div>
@@ -122,7 +122,7 @@ for details on how to update your code to use this library.
 
 ## Using with a module bundler
 
-If you’re using a module bundler like [webpack](https://webpack.js.org) or
+If you’re using a module bundler like [webpack](https://webpack.js.org/) or
 [rollup](https://rollupjs.org/), the exported object will be the Player
 constructor (unlike the browser where it is attached to `window.Vimeo`):
 
@@ -288,7 +288,7 @@ Pass any element and an options object to the `Vimeo.Player` constructor to make
 an embed inside that element. The options object should consist of either an
 `id` or `url` and any other [embed options](#embed-options) for the embed.
 
-**NOTE:** If the video [privacy settings](https://vimeo.zendesk.com/hc/en-us/articles/224817847-Privacy-settings-overview) are "Unlisted", instead of providing an `id` property, you will need to provide the full video URL as a `url` property and include the `h` parameter.
+**NOTE:** If the video [privacy settings](https://help.vimeo.com/hc/en-us/articles/12426199699985-Overview-of-video-privacy-settings) are "Unlisted", instead of providing an `id` property, you will need to provide the full video URL as a `url` property and include the `h` parameter.
 
 ```html
 <div id="made-in-ny"></div>
@@ -424,7 +424,7 @@ player.off('play');
 Load a new video into this embed. The promise will be resolved if the video is
 successfully loaded, or it will be rejected if it could not be loaded.
 
-**NOTE:** If the video [privacy settings](https://vimeo.zendesk.com/hc/en-us/articles/224817847-Privacy-settings-overview) are "Unlisted", instead of providing an `id` argument, you will need to provide the full video URL as a `url` argument and include the `h` parameter.
+**NOTE:** If the video [privacy settings](https://help.vimeo.com/hc/en-us/articles/12426199699985-Overview-of-video-privacy-settings) are "Unlisted", instead of providing an `id` argument, you will need to provide the full video URL as a `url` argument and include the `h` parameter.
 
 ```js
 player.loadVideo(76979871).then(function(id) {
@@ -1255,7 +1255,7 @@ Promise.all([player.getVideoWidth(), player.getVideoHeight()]).then(function(dim
 
 ### getVideoUrl(): Promise&lt;string, (PrivacyError|Error)&gt;
 
-Get the [vimeo.com](https://vimeo.com) url for the video.
+Get the [vimeo.com](https://vimeo.com/) url for the video.
 
 ```js
 player.getVideoUrl().then(function(url) {
@@ -1769,7 +1769,7 @@ Triggered when the player leaves picture-in-picture.
 
 Triggered when the availability of remote playback changes.
 
-Listening for this event is equivalent to the [RemotePlayback.watchAvailability() API](http://developer.mozilla.org/en-US/docs/Web/API/RemotePlayback/watchAvailability), except that there is no `cancelWatchAvailability()`. You can remove the listener for this event instead.
+Listening for this event is equivalent to the [RemotePlayback.watchAvailability() API](https://developer.mozilla.org/en-US/docs/Web/API/RemotePlayback/watchAvailability), except that there is no `cancelWatchAvailability()`. You can remove the listener for this event instead.
 
 ### remoteplaybackconnecting
 

package.json

@@ -61,29 +61,27 @@
     "@babel/plugin-transform-runtime": "^7.21.4",
     "@babel/preset-env": "^7.21.5",
     "@babel/register": "^7.21.0",
-    "@vimeo/eslint-config-player": "^5.0.1",
-    "ava": "^3.15.0",
-    "chalk": "^4.1.0",
-    "chokidar": "^3.5.2",
+    "ava": "5.3.1",
+    "chalk": "4.1.2",
+    "chokidar": "^4.0.3",
     "chokidar-cli": "^3.0.0",
-    "codecov": "^3.7.2",
-    "cross-env": "^7.0.0",
-    "eslint": "^7.7.0",
-    "eslint-plugin-ava": "^11.0.0",
-    "eslint-plugin-compat": "^3.5.1",
-    "jquery": "^3.4.1",
-    "jsdom": "^22.0.0",
-    "maxmin": "^3.0.0",
+    "cross-env": "^7.0.3",
+    "eslint": "7.32.0",
+    "eslint-plugin-ava": "13.2.0",
+    "eslint-plugin-compat": "^6.0.2",
+    "jquery": "^3.7.1",
+    "jsdom": "^26.1.0",
+    "maxmin": "3.0.0",
     "npm-run-all": "^4.1.5",
-    "nyc": "^15.1.0",
-    "rimraf": "^3.0.2",
-    "rollup": "^2.26.6",
+    "nyc": "^17.1.0",
+    "rimraf": "5.0.10",
+    "rollup": "2.39.1",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-commonjs": "^10.1.0",
-    "rollup-plugin-node-resolve": "^5.0.0",
-    "sinon": "^9.0.3",
-    "uglify-js": "^3.7.7",
-    "xhr2": "0.2.0"
+    "rollup-plugin-node-resolve": "^5.2.0",
+    "sinon": "^21.0.0",
+    "uglify-js": "^3.19.3",
+    "xhr2": "0.2.1"
   },
   "babel": {
     "presets": [
@@ -133,7 +131,7 @@
     "not ie < 11"
   ],
   "volta": {
-    "node": "16.16.0",
-    "yarn": "1.22.19"
+    "node": "18.20.8",
+    "yarn": "1.22.22"
   }
 }

rollup.js

@@ -1,5 +1,5 @@
 /* eslint-env node */
-const fs = require('fs');
+const fs = require('node:fs');
 const uglifyJs = require('uglify-js');
 const chalk = require('chalk');
 const maxmin = require('maxmin');
@@ -31,6 +31,10 @@ async function generateBundle() {
     building = true;
     needsRebuild = false;
 
+    if (fs.existsSync('dist') === false) {
+        fs.mkdirSync('dist');
+    }
+
     if (watch) {
         console.log(new Date().toString());
     }
@@ -104,6 +108,6 @@ generateBundle();
 
 if (watch) {
     const chokidar = require('chokidar');
-    const watcher = chokidar.watch('src/**/*');
+    const watcher = chokidar.watch('./src');
     watcher.on('change', generateBundle);
 }

src/player.js

@@ -174,14 +174,12 @@ class Player {
         return new Promise((resolve, reject) => {
             // We are storing the resolve/reject handlers to call later, so we
             // can’t return here.
-            // eslint-disable-next-line promise/always-return
             return this.ready().then(() => {
                 storeCallback(this, name, {
                     resolve,
                     reject
                 });
 
-                // eslint-disable-next-line promise/always-return
                 if (args.length === 0) {
                     args = {};
                 }
@@ -205,7 +203,6 @@ class Player {
 
             // We are storing the resolve/reject handlers to call later, so we
             // can’t return here.
-            // eslint-disable-next-line promise/always-return
             return this.ready().then(() => {
                 storeCallback(this, name, {
                     resolve,
@@ -234,7 +231,6 @@ class Player {
 
             // We are storing the resolve/reject handlers to call later, so we
             // can’t return here.
-            // eslint-disable-next-line promise/always-return
             return this.ready().then(() => {
                 storeCallback(this, name, {
                     resolve,

test/.eslintrc.js

@@ -9,11 +9,10 @@ module.exports = {
     plugins: ['ava'],
     extends: 'plugin:ava/recommended',
     parserOptions: {
-        'ecmaVersion': 12,
+        'ecmaVersion': 2021,
     },
     parser: '@babel/eslint-parser',
     rules: {
-        'ava/no-cb-test': ERROR,
         'no-restricted-syntax': OFF,
         'max-nested-callbacks': [WARNING, 3],
     }

test/player-test.js

@@ -6,19 +6,19 @@ import Player from '../src/player';
 test('constructor accepts only Vimeo embeds', (t) => {
     t.throws(() => {
         void new Player(html`<div data-vimeo-initialized><iframe></iframe></div>`);
-    }, null);
+    });
 
     t.throws(() => {
         void new Player('string');
-    }, null);
+    });
 
     t.throws(() => {
         void new Player(html`<iframe></iframe>`);
-    }, null);
+    });
 
     t.throws(() => {
         void new Player(html`<iframe src="https://www.youtube.com/embed/Uj3_KqkI9Zo"></iframe>`);
-    }, null);
+    });
 });
 
 test('contructor does not throw if jquery is not present', (t) => {