Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
be2d27f
Break out url.parse and _removeDotSegment into own modules.
ariutta Jan 27, 2016
0e24e54
move _removeDotSegments require up so it's defined early enough to be…
ariutta Jan 27, 2016
c7ce138
Clean up jsonld.nextTick/jsonld.setImmediate
ariutta Feb 20, 2016
e4d7a3a
Merge branch 'master' of https://github.com/digitalbazaar/jsonld.js
ariutta Mar 1, 2016
491b47e
Undo modularizing of _removeDotSegments
ariutta Mar 1, 2016
d1652f2
Use setImmediate instead of nextTick. Also create minimal build system.
ariutta Mar 2, 2016
74c3d88
Merge branch 'master' of https://github.com/digitalbazaar/jsonld.js
ariutta Mar 2, 2016
850da14
Don't need remove-dot-segments module any more.
ariutta Mar 2, 2016
cc9c82b
Modularize library.
ariutta Mar 3, 2016
84cc219
Further clean up to handle both node and the browser.
ariutta Mar 4, 2016
9e2121c
Ignore files in dist
ariutta Mar 4, 2016
180adb4
Update dependencies.
ariutta Mar 4, 2016
d0c33cf
Export node environment variable before tests.
ariutta Mar 4, 2016
0dcc83b
Try to make the tests use the correct JSDIR env var.
ariutta Mar 4, 2016
6889152
Needed fs-extra
ariutta Mar 4, 2016
f3f06c7
all constant declarations in a single module. specify JSDIR in Makefile.
ariutta Mar 5, 2016
e37df44
Remove simple option from jsonld.url.parse (again)
ariutta Mar 5, 2016
4cbeb53
Use lib dir for source code. Remove js and browser dirs.
ariutta Mar 7, 2016
bf37730
Add default file.
ariutta Mar 7, 2016
1ef71df
Rename NormalizeHashDOTinit to NormalizeHashDOT_init
ariutta Mar 7, 2016
f33b220
Rename NormalizeHashDOTinit to NormalizeHashDOT_init
ariutta Mar 7, 2016
74c8cfa
Improve documentLoader
ariutta Mar 7, 2016
6843c9c
Added custom bundling feature.
ariutta Mar 7, 2016
a110445
Use dist/custom/
ariutta Mar 7, 2016
d42ea15
Correct dest for custom.
ariutta Mar 7, 2016
b4d65e1
Smaller custom bundles.
ariutta Mar 7, 2016
feb3c20
Cleaned up exporting, e.g., compact instead of jsonldDOTcompact
ariutta Mar 8, 2016
d850f37
Get custom working again.
ariutta Mar 8, 2016
75c9c1b
Minor clean up.
ariutta Mar 8, 2016
2eae8be
Using babel, so need a config for it.
ariutta Mar 9, 2016
298f07d
require fails, but injectJs works. Uglify again.
ariutta Mar 9, 2016
4fa3a02
Polyfill Promises for Node 0.10
ariutta Mar 9, 2016
78dd530
Changes to try to address bug with build step when installed as dep.
ariutta Mar 9, 2016
48fc2ce
Changes to try to address bug with build step when installed as dep.
ariutta Mar 9, 2016
e10283a
Changes to try to address bug with build step when installed as dep.
ariutta Mar 9, 2016
55824d4
Changes to try to address bug with build step when installed as dep.
ariutta Mar 9, 2016
4a6bad8
Changes to try to address bug with build step when installed as dep.
ariutta Mar 9, 2016
75e2ed8
Changes to try to address bug with build step when installed as dep.
ariutta Mar 9, 2016
e9e290e
Changes to try to address bug with build step when installed as dep.
ariutta Mar 9, 2016
3411dde
Changes to try to address bug with build step when installed as dep.
ariutta Mar 9, 2016
355d753
Changes to try to address bug with build step when installed as dep.
ariutta Mar 9, 2016
7a16b68
Changes to try to address bug with build step when installed as dep.
ariutta Mar 9, 2016
fbfcdb5
Changes to try to address bug with build step when installed as dep.
ariutta Mar 9, 2016
326873d
Changes to try to address bug with build step when installed as dep.
ariutta Mar 9, 2016
1e8c4bc
Changes to try to address bug with build step when installed as dep.
ariutta Mar 9, 2016
a2425bb
Implemented kludge to address bug with build step when installed as dep.
ariutta Mar 9, 2016
749b182
Add Promise polyfill via config.intro for Node.
ariutta Mar 9, 2016
0e7b302
Don't include Promise polyfill for browser.
ariutta Mar 9, 2016
581da8d
Trying another way to polyfill Promise for old Node.
ariutta Mar 9, 2016
07b7387
Needed paths and extensions for includePaths.
ariutta Mar 9, 2016
e45b633
Ignore Promise for browser build.
ariutta Mar 9, 2016
2972f7f
Travis build system/Node 0.10 will just have to say it's broken, when…
ariutta Mar 10, 2016
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
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": [ "es2015-rollup" ]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
coverage
node_modules
v8.log
dist
3 changes: 2 additions & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"maxerr": 9999
"maxerr": 9999,
"esnext": true
}
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ test-suite-node:
exit 1; \
fi
@if [ -d $(JSONLD_TEST_SUITE) ]; then \
NODE_ENV=test ./node_modules/.bin/mocha -A -R $(REPORTER) $(TESTS); \
NODE_ENV=test JSDIR=./dist/node ./node_modules/.bin/mocha -A -R $(REPORTER) $(TESTS); \
else \
echo "Error: tests not found at $(JSONLD_TEST_SUITE)"; \
exit 1; \
Expand All @@ -25,7 +25,7 @@ test-suite-browser:
exit 1; \
fi
@if [ -d $(JSONLD_TEST_SUITE) ]; then \
NODE_ENV=test ./node_modules/.bin/phantomjs $(TESTS); \
NODE_ENV=test JSDIR=./dist/browser ./node_modules/.bin/phantomjs $(TESTS); \
else \
echo "Error: tests not found at $(JSONLD_TEST_SUITE)"; \
exit 1; \
Expand Down
1 change: 0 additions & 1 deletion browser/ignore.js

This file was deleted.

1 change: 1 addition & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('./dist/node/jsonld');
Loading