diff --git a/.travis.yml b/.travis.yml index 5c51c69..9c9521d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,3 +2,6 @@ language: "node_js" node_js: - "6" - "8" +# Force Travis to use npm v5 +# https://github.com/travis-ci/travis-ci/issues/4653#issuecomment-194051953 +before_install: if [[ `npm -v` != 5* ]]; then npm i -g npm@5; fi diff --git a/README.md b/README.md index 7e6a1ce..18a2c93 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Pjax -[![Build Status](http://img.shields.io/travis/MoOx/pjax.svg)](https://travis-ci.org/MoOx/pjax) [@todo fix CI](https://github.com/MoOx/pjax/issues/63). +[![Build Status](http://img.shields.io/travis/MoOx/pjax.svg)](https://travis-ci.org/MoOx/pjax). > Easily enable fast Ajax navigation on any website (using pushState + xhr) @@ -522,7 +522,7 @@ wrapper on each page (to avoid differences of DOM between pages) ## Examples -Clone this repository and run `npm run example`, then open `http://localhost:3000/example` in your browser. +Clone this repository and run `npm run example`, which will open the example app in your browser. --- diff --git a/bower.json b/bower.json deleted file mode 100644 index 6cc7c13..0000000 --- a/bower.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "pjax", - "version": "0.2.4", - "description": "Easily enable fast Ajax navigation on any website (using pushState + xhr)", - "keywords": [ - "pjax", - "push", - "state", - "ajax", - "navigation", - "transition", - "animation" - ], - "main": "pjax.js", - "homepage": "https://github.com/MoOx/pjax", - "authors": [ - "Maxime Thirouin" - ], - "license": "MIT", - "moduleType": [ - "node" - ], - "ignore": [ - "**/.*", - "node_modules", - "test", - "tests" - ] -} diff --git a/example/index.html b/example/index.html index cc95a19..4d375e0 100644 --- a/example/index.html +++ b/example/index.html @@ -11,7 +11,7 @@

Index

Hello. Go to Page 2 and view your console to see Pjax events. - Clicking on this page will just reload the page entierly. + Clicking on this page will just reload the page entirely. diff --git a/package.json b/package.json index 550629a..d6855b9 100644 --- a/package.json +++ b/package.json @@ -21,18 +21,17 @@ "pjax.js" ], "devDependencies": { - "browserify": "^3.46.0", + "browserify": "^15.0.0", "jscs": "^3.0.7", "jsdom": "^11.5.1", "jsdom-global": "^3.0.2", "jshint": "^2.5.6", "npmpub": "^3.1.0", "nyc": "^11.4.1", - "opn-cli": "^3.1.0", - "serve": "1.4.0", + "serve": "^6.4.4", "tap-nyc": "^1.0.3", "tap-spec": "^4.1.1", - "tape": "^3.0.0" + "tape": "^4.8.0" }, "scripts": { "lint": "jscs . && jshint . --exclude-path .gitignore", @@ -42,7 +41,7 @@ "test": "npm run lint && npm run tests | tap-spec", "coverage-tests": "npm run tests | tap-nyc", "coverage": "nyc -x \"tests/**\" npm run coverage-tests", - "example": "opn http://localhost:3000/example/; serve .", + "example": "serve -o -p 3000 ./example", "prepublish": "npm run standalone", "#release": "testling does not work in a process launch by npm... :facepalm:", "release": "echo \"npmpub --skip-test --dry && npm test && npmpub --skip-test --skip-cleanup\""