Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
alancutter committed Jun 25, 2019
2 parents a2dddad + 4806309 commit 6584d56
Show file tree
Hide file tree
Showing 19 changed files with 5,378 additions and 2,490 deletions.
5 changes: 2 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[submodule "test/web-platform-tests"]
path = test/web-platform-tests
url = https://github.com/alancutter/web-platform-tests.git
branch = nativeShippingAPI
path = test/web-platform-tests
url = https://github.com/web-platform-tests/wpt.git
9 changes: 6 additions & 3 deletions .travis-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ uname -a
cat /etc/lsb-release

npm install
# npm may update the package-lock.json. Revert this to avoid failing grunt-checkrepo.
git checkout HEAD package-lock.json

npm install -g grunt-cli

sudo apt-get update --fix-missing
Expand Down Expand Up @@ -62,19 +65,19 @@ Chrome)
sudo dpkg --install $CHROME || sudo apt-get -f install
which google-chrome
ls -l `which google-chrome`

if [ -f /opt/google/chrome/chrome-sandbox ]; then
export CHROME_SANDBOX=/opt/google/chrome/chrome-sandbox
else
export CHROME_SANDBOX=$(ls /opt/google/chrome*/chrome-sandbox)
fi

# Download a custom chrome-sandbox which works inside OpenVC containers (used on travis).
sudo rm -f $CHROME_SANDBOX
sudo wget https://googledrive.com/host/0B5VlNZ_Rvdw6NTJoZDBSVy1ZdkE -O $CHROME_SANDBOX
sudo chown root:root $CHROME_SANDBOX; sudo chmod 4755 $CHROME_SANDBOX
sudo md5sum $CHROME_SANDBOX

google-chrome --version
;;

Expand Down
15 changes: 5 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
dist: xenial
services: xvfb
language: node_js

node_js:
- "6.10.2"

install:
- BROWSER="Firefox-stable" ./.travis-setup.sh

before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
node_js: "10.15.3"
install: BROWSER="Firefox-stable" ./.travis-setup.sh
script: xvfb-run -a npm test
31 changes: 24 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ Example: `http://localhost:9876/base/test/web-platform-tests/web-animations/anim

## Publishing a release

1. Clone a fresh copy of [web-animations-js](https://github.com/web-animations/web-animations-js).

1. Make sure you are on the `dev` branch.

```sh
git checkout dev
```

1. Determine the version number for the release

* Increment the first number and reset others to 0 when there are large breaking changes
Expand All @@ -70,8 +78,14 @@ Example: `http://localhost:9876/base/test/web-platform-tests/web-animations/anim

1. Build the polyfill with `npm install && grunt` then update `docs/experimental.md`'s Build Target Comparison with the current gzipped sizes.
1. Commit the above changes to web-animations-js/dev and merge to
web-animations-js/master.
1. Commit and push the above changes to web-animations-js/dev.
```sh
# Create a commit with above changes
git push origin dev
```
1. Merge to local master branch:
```sh
git checkout master
Expand All @@ -85,14 +99,17 @@ Example: `http://localhost:9876/base/test/web-platform-tests/web-animations/anim
grunt
# Optional "grunt test" to make sure everything still passes.
git add -f *.min.js{,.map}
git rm .gitignore
git rm --ignore-unmatch .gitignore
git commit -m 'Add build artifacts from '`cat .git/refs/heads/dev`
git push HEAD:refs/heads/master
git push origin master
```
1. Draft a [new release](https://github.com/web-animations/web-animations-js/releases) at the
commit pushed to web-animations-js in step #4. Copy the release notes from `History.md`
added in step #2.
1. Draft a [new release](https://github.com/web-animations/web-animations-js/releases).
* For the **tag version**, put the new version number of this release.
* For the **target**, select "master".
* For the **title**, look at previous releases for examples.
* For the **description**, copy the release notes from `History.md` added in step #2.
1. Once you've pushed to web-animations-js, run `npm publish` from that checked-out folder

Expand Down
7 changes: 3 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ module.exports = function(grunt) {
var record = config.uglify[target];
record.options.sourceMapIn = source + '.map';
record.options.banner = grunt.file.read('templates/boilerplate');
record.options.wrap = true;
record.options.enclose = true;
record.options.compress.dead_code = true;
record.options.mangle = { eval: true };
return name;
Expand Down Expand Up @@ -191,10 +191,9 @@ module.exports = function(grunt) {
return new Promise(function(resolve) {
var karmaConfig = require('karma/lib/config').parseConfig(require('path').resolve('test/karma-config.js'), {});
configCallback(karmaConfig);
var karmaServer = require('karma').server;
karmaServer.start(karmaConfig, function(exitCode) {
new (require('karma').Server)(karmaConfig, function(exitCode) {
resolve(exitCode == 0);
});
}).start();
});
}

Expand Down
8 changes: 7 additions & 1 deletion History.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### 2.3.2 - *June 25 2019*

* [Fix the wrapping IIFE of the prod bundle.](https://github.com/web-animations/web-animations-js/issues/208)
* [Minor fixes for Closure compilation compatibility.](https://github.com/web-animations/web-animations-js/issues/200)
* [Fixed `Cannot set property _isFinished of #<Object> which has only a getter`](https://github.com/web-animations/web-animations-js/issues/165)

### 2.3.1 - *July 20 2017*

* Fix [https://github.com/web-animations/web-animations-js/issues/157](missing web-animations.min.js issue)
Expand Down Expand Up @@ -91,7 +97,7 @@

* Added arbitrary easing capitalisation.

* Added "id" effect option. (http://w3c.github.io/web-animations/#dom-keyframeanimationoptions-id)
* Added "id" effect option. (https://drafts.csswg.org/web-animations/#dom-keyframeanimationoptions-id)

* Added "oncancel" event handler.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Documentation
* [Examples of usage](/docs/examples.md)
* [Live demos](https://web-animations.github.io/web-animations-demos)
* [MDN reference](https://developer.mozilla.org/en-US/docs/Web/API/Element/animate)
* [W3C specification](http://w3c.github.io/web-animations/)
* [W3C specification](https://drafts.csswg.org/web-animations/)

We love feedback!
-----------------
Expand Down
4 changes: 2 additions & 2 deletions docs/examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ element.animate([
Timing parameters
-----------------
- Web Animations inherits many of its timing parameters from CSS Animations.
- See the [specification](http://w3c.github.io/web-animations/#animationeffecttimingreadonly) for details on each parameter.
- See the [specification](https://drafts.csswg.org/web-animations/#animationeffecttimingreadonly) for details on each parameter.

[**Live demo**](http://jsbin.com/dabehipiyo/edit?js,output)
```javascript
Expand Down Expand Up @@ -106,7 +106,7 @@ element.animate({
Playback controls
-----------------
- element.animate() returns an Animation object with basic playback controls.
- See the [specification](http://w3c.github.io/web-animations/#the-animation-interface) for details on each method.
- See the [specification](https://drafts.csswg.org/web-animations/#the-animation-interface) for details on each method.

[**Live demo**](http://jsbin.com/kutaqoxejo/edit?js,output)
```javascript
Expand Down
6 changes: 5 additions & 1 deletion docs/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ Browser support

The polyfill is supported on modern versions of all major browsers, including:

* Chrome 55+
* Chrome 56+
* Firefox 27+
* IE10+ (including Edge)
* Safari (iOS) 7.1+
* Safari (Mac) 9+

In particular, the polyfill requires requestAnimationFrame. If your browser does not
have requestAnimationFrame, consider loading a requestAnimationFrame polyfill first
([example](https://gist.githubusercontent.com/paulirish/1579671/raw/682e5c880c92b445650c4880a6bf9f3897ec1c5b/rAF.js)).

Native fallback
---------------

Expand Down
2 changes: 1 addition & 1 deletion externs/web-animations.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/**
* @fileoverview Basic externs for the Web Animations API. This is not
* nessecarily exhaustive. For more information, see the spec-
* https://w3c.github.io/web-animations
* https://drafts.csswg.org/web-animations/
* @externs
*/

Expand Down
Loading

0 comments on commit 6584d56

Please sign in to comment.