Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deps #7

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update deps #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab8541d
Option to remove the javascript-bundle from the page
nknapp Feb 9, 2017
18739e8
Merge branch 'master' of github.com:bootprint/bootprint-base
nknapp Feb 17, 2017
dad4486
Update dependencies, use Standard as dev-dependency, fix code-style
nknapp Mar 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ node_js:
- "6"
- "7"
before_script:
- npm install standard
- standard
script:
- npm install istanbul
Expand Down
22 changes: 12 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,23 @@
},
"homepage": "https://github.com/bootprint/bootprint-base",
"dependencies": {
"bootstrap": "^3.3.2",
"cheerio": "^0.19.0",
"handlebars": "^3.0.0",
"highlight.js": "^8.4.0",
"bootstrap": "^3.3.7",
"cheerio": "^0.22.0",
"handlebars": "^4.0.6",
"highlight.js": "^8",
"jquery": "^2",
"json-stable-stringify": "^1.0.0",
"marked": "^0.3.3"
"json-stable-stringify": "^1.0.1",
"marked": "^0.3.6"
},
"devDependencies": {
"bootprint": "^1.0.0",
"chai": "^3.5.0",
"ghooks": "^1.0.3",
"m-io": "^0.3.1",
"mocha": "^2.4.5",
"thoughtful-release": "^0.3.0",
"dirty-chai": "^1.2.2",
"ghooks": "^2.0.0",
"m-io": "^0.5.0",
"mocha": "^3.2.0",
"standard": "^9.0.1",
"thoughtful-release": "^0.3.1",
"trace-and-clarify-if-possible": "^1.0.0"
},
"peerDependencies": {
Expand Down
11 changes: 6 additions & 5 deletions test/main-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
* Released under the MIT license.
*/

/* global describe */
/* global it */
/* global before */
/* eslint-env mocha */

var chai = require('chai')
chai.use(require('dirty-chai'))
var expect = chai.expect

var expect = require('chai').expect
var path = require('path')
var qfs = require('m-io/fs')
var fs = require('fs')
Expand Down Expand Up @@ -53,7 +54,7 @@ describe('The bootprint-base module', function () {

var jqueryIndex = bundle.indexOf('jQuery requires a window with a document')
var bootstrapIndex = bundle.indexOf("Bootstrap's JavaScript requires jQuery")
expect(jqueryIndex < bootstrapIndex, 'jQuery must be included before Bootstrap').to.be.true
expect(jqueryIndex < bootstrapIndex, 'jQuery must be included before Bootstrap').to.be.true()
})
})
})