Skip to content
This repository was archived by the owner on Mar 10, 2020. It is now read-only.

Commit da055df

Browse files
author
Alan Shaw
committed
Merge branch 'master' of github.com:ipfs/js-ipfs-http-client
2 parents c20a568 + 74a9147 commit da055df

File tree

22 files changed

+24529
-1200
lines changed

22 files changed

+24529
-1200
lines changed

examples/browser-pubsub/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ <h1 class="aqua fw2 montserrat dib ma0 pv2 ph1 v-mid fr f3 lh-copy">Pubsub</h1>
3737
<div id="console" class="f7 db w-100 ph1 pv2 monospace input-reset ba b--black-20 border-box overflow-scroll" style="height: 300px">
3838
</div>
3939
</div>
40-
<script src="bundle.js"></script>
40+
<script src="index.js"></script>
4141
</body>
4242
</html>

examples/browser-pubsub/package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@
55
"private": true,
66
"main": "index.js",
77
"scripts": {
8-
"start": "npm run build && npm run serve",
9-
"build": "browserify index.js > bundle.js",
10-
"serve": "http-server -a 127.0.0.1 -p 8888",
11-
"test": "echo \"Error: no test specified\" && exit 1"
8+
"start": "parcel index.html"
129
},
1310
"author": "Alan Shaw",
1411
"license": "MIT",
1512
"dependencies": {
16-
"browserify": "^16.5.0",
17-
"http-server": "^0.11.1",
1813
"ipfs-http-client": "../../"
14+
},
15+
"browserslist": [
16+
"last 2 versions and not dead and > 2%"
17+
],
18+
"devDependencies": {
19+
"parcel-bundler": "^1.12.4"
1920
}
2021
}

examples/bundle-browserify/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/bundle-browserify/README.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

examples/bundle-browserify/img/1.png

-98.2 KB
Binary file not shown.

examples/bundle-browserify/img/2.png

-143 KB
Binary file not shown.

examples/bundle-browserify/index.html

Lines changed: 0 additions & 26 deletions
This file was deleted.

examples/bundle-browserify/index.js

Lines changed: 0 additions & 36 deletions
This file was deleted.

examples/bundle-browserify/package.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

examples/bundle-webpack/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
"webpack-dev-server": "~3.3.1"
2222
},
2323
"browserslist": [
24-
">1%",
25-
"not dead",
26-
"not ie <= 11",
27-
"not op_mini all"
24+
"last 2 versions and not dead and > 2%"
2825
]
2926
}

0 commit comments

Comments
 (0)