Skip to content

Commit 6f8882f

Browse files
Merge pull request #454 from nodeschool/update_dependencies
Update dependencies & Fixed Windows build
2 parents 89b5967 + af76e40 commit 6f8882f

File tree

5 files changed

+29
-22
lines changed

5 files changed

+29
-22
lines changed

package.json

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
"description": "nodeschool.io webpage",
55
"main": "index.js",
66
"scripts": {
7-
"build": "npm run build-chapters -- $P; npm run build-dependencies; npm run build-copy -- $P; npm run build-html -- $P",
8-
"build-copy": "./scripts/build-copy.js $$",
9-
"build-html": "./scripts/build-html.js $$",
10-
"build-chapters": "./scripts/build-chapters.js $$",
11-
"build-dependencies": "mkdir -p .build/js; browserify -r xhr -r mustache > .build/js/dependencies.js",
12-
"generate-language": "./scripts/generate-lang.js",
13-
"generate-untranslated-lang": "./scripts/generate-untranslated-lang.js",
14-
"validate-html": "./scripts/validate-html.js",
15-
"start": "mkdir -p .build; env WATCH=true P=$$ npm run build && live-server .build",
16-
"deploy": "sh ./scripts/deploy.sh"
7+
"build": "bash ./scripts/build.sh $$",
8+
"build-copy": "node ./scripts/build-copy.js $$",
9+
"build-html": "node ./scripts/build-html.js $$",
10+
"build-chapters": "node ./scripts/build-chapters.js $$",
11+
"build-dependencies": "bash ./scripts/build-dependencies.sh $$",
12+
"generate-language": "node ./scripts/generate-lang.js",
13+
"generate-untranslated-lang": "node ./scripts/generate-untranslated-lang.js",
14+
"validate-html": "node ./scripts/validate-html.js",
15+
"start": "bash ./scripts/start.sh",
16+
"deploy": "bash ./scripts/deploy.sh"
1717
},
1818
"repository": {
1919
"type": "git",
@@ -26,22 +26,19 @@
2626
},
2727
"homepage": "https://github.com/nodeschool/nodeschool.github.io",
2828
"dependencies": {
29-
"is-running": "^1.0.5",
30-
"mustache": "^0.8.2",
31-
"xhr": "^1.16.1"
29+
"is-running": "^2.0.0",
30+
"mustache": "^2.2.1",
31+
"xhr": "^2.2.0"
3232
},
3333
"devDependencies": {
3434
"after-all": "^2.0.1",
35-
"async": "^0.9.0",
36-
"browserify": "^6.2.0",
37-
"cheerio": "^0.17.0",
38-
"cheerio-eq": "^1.0.0",
35+
"browserify": "^12.0.1",
36+
"cheerio": "^0.19.0",
3937
"gaze": "^0.5.1",
40-
"glob": "^5.0.6",
41-
"jsdom": "^3.1.2",
42-
"live-server": "^0.7.1",
38+
"glob": "^6.0.3",
39+
"jsdom": "^7.1.0",
40+
"live-server": "^0.9.0",
4341
"mkdirp": "^0.5.1",
44-
"posix": "^2.0.1",
4542
"read": "^1.0.5"
4643
}
4744
}

scripts/build-dependencies.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
mkdir -p .build/js
3+
browserify -r xhr -r mustache > .build/js/dependencies.js

scripts/build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
npm run build-chapters -- $@
3+
npm run build-dependencies
4+
npm run build-copy -- $@
5+
npm run build-html -- $@

scripts/start.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
mkdir -p .build
3+
env WATCH=true P=$$ npm run build && live-server .build

scripts/util/cmdwatcher.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/usr/bin/env node
22

33
const glob = require('glob')
4-
const posix = require('posix')
54
const isRunning = require('is-running')
65
const spawn = require('child_process').spawn
76
const fs = require('fs')

0 commit comments

Comments
 (0)