Skip to content

Commit b5a7098

Browse files
committed
Merge branch 'master' into resource-metadata
2 parents b4513ef + ef8ba85 commit b5a7098

File tree

4 files changed

+22
-13
lines changed

4 files changed

+22
-13
lines changed

.npmignore

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
.travis.yml
2-
.gitignore
3-
Makefile
4-
test
5-
src
1+
!lib

.travis.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,14 @@ node_js:
66

77
install: make clean build
88
script: make test
9-
after_success: make coverage
9+
after_success: make coverage
10+
11+
deploy:
12+
provider: npm
13+
14+
api_key:
15+
secure: dQ72Ws2o9aVMrauYogZ3dIHVzZh78bvwbLEx1teAddfyR3pESoomZZimYu1rTXxGhbOpAG1l7QRlQVN3w8gSZ/pkzT0GJABNy3w90QKEjvPirG8EnVm6Wf9xxhqAUPPhk6L3uWIPk0X0DjotxGvIcI6klKaM3ybbfOxQz9p2GyLcrW15KbyKtHRLf+2LXpWvHGCyJmo9HzaPhy+Jh40uc+GXnuFOza29R1HnezZXCQdSlE/kGUokHwTKP6oaiqYCLXSGsy4TghUaGJcZ6J0spEm8cQF6AXYlYXLKQf2/H9glIu4a3UssxkTCIP/1ivw83xiyj1gPlNdrQpWnNrHfHJqXokqdx7iFbD5he4D5ONtpxaotpfz0DFJIw9VGP96OB6gP3raQVtt6p0YKJFMJybH1p+QlpjVpTsIBB/0Vct84IpxbASs4hkX8JZNjiVX4uQUIQnkbr19U0P32a8ofVxh50SAz1fgWQvDCxpQkzU5smswxP25M5SuaZ+HX/N16oKW1lbcw4vrSLMUndz7neLeoRk1LxBQkbeV9F+oWCRDGl4EaLQs2qc9CsEaXc0XazkJDvOIv0Zib8AS9d62CvZATdWEDfbdszi5XNndWAPv/U546CKPzxBjSc/wjoX9zg2byasazxQBoNTGhJp5Vt7FNXs/pXu8c06WTDckV+cE=
16+
skip_cleanup: true
17+
on:
18+
tags: true
19+
repo: websdk/nap

Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
PATH := node_modules/.bin:$(PATH)
21
SHELL := /bin/bash
2+
PATH := $(shell echo $${PATH//\.\/node_modules\/\.bin:/}):node_modules/.bin
33

44
SRC = $(wildcard src/*.js)
55
LIB = $(SRC:src/%.js=lib/%.js)
66
TST = $(wildcard test/*.js) $(wildcard test/**/*.js)
7-
NPM = @npm install --local > /dev/null && touch node_modules
7+
NPM = @npm install --local && touch node_modules
8+
OPT = --plugins transform-es2015-modules-umd --copy-files --source-maps
89

910
v ?= patch
1011

1112
build: node_modules $(LIB)
1213
lib/%.js: src/%.js
1314
@mkdir -p $(@D)
14-
@browserify $< --standalone $(@F:%.js=%) | uglifyjs -o $@
15+
@babel $(OPT) -o $@ $<
1516

1617
node_modules: package.json
1718
$(NPM)

package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
{
22
"name": "@websdk/nap",
3-
"version": "0.9.8",
3+
"version": "0.10.7",
44
"description": "Organizing applications into resources",
55
"main": "lib/nap.js",
66
"devDependencies": {
77
"browserify": "11.1.0",
8-
"coveralls": "2.11.4",
8+
"coveralls": "2.11.6",
99
"d3": "3.5.6",
1010
"funkis": "0.2.0",
1111
"jsdom": "6.5.1",
1212
"nodemon": "1.7.0",
1313
"nyc": "3.2.2",
1414
"tap-dot": "1.0.0",
1515
"tape": "4.2.1",
16-
"uglifyjs": "2.4.10"
16+
"uglifyjs": "2.4.10",
17+
"babel-cli": "6.1.4",
18+
"babel-plugin-transform-es2015-modules-umd": "6.1.4"
1719
},
1820
"dependencies": {
19-
"@websdk/rhumb": "0.3.4"
21+
"@websdk/rhumb": "0.3.8"
2022
},
2123
"repository": {
2224
"type": "git",

0 commit comments

Comments
 (0)