diff --git a/Makefile b/Makefile index dad244df6..45357473b 100644 --- a/Makefile +++ b/Makefile @@ -343,12 +343,14 @@ web : index.html distready cd dist && git commit -am "Update web page." update : + $(RM) npm-shrinkwrap.json npm install --save-dev $(shell node tools/unpinned.js) npm install npm shrinkwrap --dev $(call CAT,npm-shrinkwrap.json,src/meta/npm-shrinkwrap.json) updatehard : + $(RM) npm-shrinkwrap.json npm install --save-dev $(shell node tools/unpinned.js latest) npm install npm shrinkwrap --dev diff --git a/package.json b/package.json index 8ce05f2b7..e7694d09a 100644 --- a/package.json +++ b/package.json @@ -49,17 +49,17 @@ } }, "devDependencies": { - "coffee-script": "1.9.3", + "coffee-script": "=1.9.3", "crx": "^3.0.3", "esprima": "^2.7.2", - "font-awesome": "4.6.1", + "font-awesome": "=4.6.1", "jshint": "^2.9.2", "jszip": "^3.0.0", - "lodash.template": "^4.2.4", - "markdown-it": "^6.0.1", + "lodash.template": "^4.2.5", + "markdown-it": "^6.0.2", "markdown-it-anchor": "^2.5.0", "request": "^2.72.0", - "webstore-upload": "^0.0.7" + "webstore-upload": "0.0.7" }, "repository": { "type": "git", diff --git a/src/meta/npm-shrinkwrap.json b/src/meta/npm-shrinkwrap.json index a7787334e..d8713540e 100644 --- a/src/meta/npm-shrinkwrap.json +++ b/src/meta/npm-shrinkwrap.json @@ -22,9 +22,9 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.7.tgz" }, "asap": { - "version": "2.0.3", + "version": "2.0.4", "from": "asap@>=2.0.3 <2.1.0", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz" + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.4.tgz" }, "asn1": { "version": "0.2.3", @@ -47,21 +47,14 @@ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" }, "aws4": { - "version": "1.3.2", + "version": "1.4.1", "from": "aws4@>=1.2.1 <2.0.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz", - "dependencies": { - "lru-cache": { - "version": "4.0.1", - "from": "lru-cache@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz" - } - } + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz" }, "balanced-match": { - "version": "0.3.0", - "from": "balanced-match@>=0.3.0 <0.4.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz" + "version": "0.4.1", + "from": "balanced-match@>=0.4.1 <0.5.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz" }, "bl": { "version": "1.1.2", @@ -91,9 +84,9 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" }, "brace-expansion": { - "version": "1.1.3", + "version": "1.1.4", "from": "brace-expansion@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz" + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz" }, "buffer-crc32": { "version": "0.2.5", @@ -161,9 +154,9 @@ "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz" }, "dashdash": { - "version": "1.13.0", - "from": "dashdash@>=1.10.1 <2.0.0", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz", + "version": "1.13.1", + "from": "dashdash@>=1.12.0 <2.0.0", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.1.tgz", "dependencies": { "assert-plus": { "version": "1.0.0", @@ -306,6 +299,18 @@ "from": "generate-object-property@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz" }, + "getpass": { + "version": "0.1.6", + "from": "getpass@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + }, "glob": { "version": "3.2.11", "from": "glob@>=3.2.1 <3.3.0", @@ -366,9 +371,9 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz" }, "inflight": { - "version": "1.0.4", + "version": "1.0.5", "from": "inflight@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz" + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz" }, "inherits": { "version": "2.0.1", @@ -495,9 +500,9 @@ "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz" }, "lodash.assigninwith": { - "version": "4.0.6", + "version": "4.0.7", "from": "lodash.assigninwith@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.assigninwith/-/lodash.assigninwith-4.0.6.tgz" + "resolved": "https://registry.npmjs.org/lodash.assigninwith/-/lodash.assigninwith-4.0.7.tgz" }, "lodash.escape": { "version": "4.0.0", @@ -505,24 +510,24 @@ "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.0.tgz" }, "lodash.keys": { - "version": "4.0.6", + "version": "4.0.7", "from": "lodash.keys@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.0.6.tgz" + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.0.7.tgz" }, "lodash.keysin": { - "version": "4.1.3", + "version": "4.1.4", "from": "lodash.keysin@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-4.1.3.tgz" + "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-4.1.4.tgz" }, "lodash.rest": { - "version": "4.0.2", + "version": "4.0.3", "from": "lodash.rest@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.2.tgz" + "resolved": "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.3.tgz" }, "lodash.template": { - "version": "4.2.4", - "from": "lodash.template@>=4.2.4 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.2.4.tgz" + "version": "4.2.5", + "from": "lodash.template@latest", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.2.5.tgz" }, "lodash.templatesettings": { "version": "4.0.1", @@ -530,9 +535,9 @@ "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.0.1.tgz" }, "lodash.tostring": { - "version": "4.1.2", + "version": "4.1.3", "from": "lodash.tostring@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.2.tgz" + "resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.3.tgz" }, "lru-cache": { "version": "2.7.3", @@ -540,9 +545,9 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz" }, "markdown-it": { - "version": "6.0.1", + "version": "6.0.2", "from": "markdown-it@latest", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-6.0.1.tgz", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-6.0.2.tgz", "dependencies": { "entities": { "version": "1.1.1", @@ -562,14 +567,14 @@ "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz" }, "mime-db": { - "version": "1.22.0", - "from": "mime-db@>=1.22.0 <1.23.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz" + "version": "1.23.0", + "from": "mime-db@>=1.23.0 <1.24.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" }, "mime-types": { - "version": "2.1.10", + "version": "2.1.11", "from": "mime-types@>=2.1.7 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz" + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz" }, "minimatch": { "version": "0.2.14", @@ -599,9 +604,9 @@ "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" }, "oauth-sign": { - "version": "0.8.1", + "version": "0.8.2", "from": "oauth-sign@>=0.8.1 <0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz" + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz" }, "once": { "version": "1.3.3", @@ -639,14 +644,9 @@ "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" }, "process-nextick-args": { - "version": "1.0.6", + "version": "1.0.7", "from": "process-nextick-args@>=1.0.6 <1.1.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz" - }, - "pseudomap": { - "version": "1.0.2", - "from": "pseudomap@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz" + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" }, "q": { "version": "1.4.1", @@ -674,9 +674,9 @@ "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-2.0.1.tgz", "dependencies": { "lodash": { - "version": "4.11.1", + "version": "4.13.1", "from": "lodash@>=4.5.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.11.1.tgz" + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz" } } }, @@ -706,9 +706,16 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" }, "sshpk": { - "version": "1.7.4", + "version": "1.8.3", "from": "sshpk@>=1.7.0 <2.0.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz" + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } }, "string": { "version": "3.3.1", @@ -751,14 +758,14 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz" }, "tunnel-agent": { - "version": "0.4.2", + "version": "0.4.3", "from": "tunnel-agent@>=0.4.1 <0.5.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz" + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz" }, "tweetnacl": { - "version": "0.14.3", - "from": "tweetnacl@>=0.13.0 <1.0.0", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz" + "version": "0.13.3", + "from": "tweetnacl@>=0.13.0 <0.14.0", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz" }, "uc.micro": { "version": "1.0.0", @@ -793,9 +800,9 @@ } }, "wrappy": { - "version": "1.0.1", + "version": "1.0.2", "from": "wrappy@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz" + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" }, "wrench": { "version": "1.5.9", @@ -807,11 +814,6 @@ "from": "xtend@>=4.0.0 <5.0.0", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" }, - "yallist": { - "version": "2.0.0", - "from": "yallist@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz" - }, "zip-stream": { "version": "0.3.7", "from": "zip-stream@>=0.3.0 <0.4.0", diff --git a/tools/unpinned.js b/tools/unpinned.js index 3c089be3d..b89b9e713 100644 --- a/tools/unpinned.js +++ b/tools/unpinned.js @@ -4,7 +4,7 @@ var pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); console.log( Object.keys(pkg.devDependencies).filter( - name => /^\^/.test(pkg.devDependencies[name]) + name => !/^=/.test(pkg.devDependencies[name]) ).map( name => `${name}@${process.argv[2] || pkg.devDependencies[name]}` ).join(' ')