Skip to content

Commit

Permalink
Merge pull request orbitdb#185 from haadcode/feat/immutable-log
Browse files Browse the repository at this point in the history
Use immutable ipfs-log
  • Loading branch information
haadcode committed Mar 21, 2017
2 parents e7aea34 + 8f990e0 commit 00865a3
Show file tree
Hide file tree
Showing 27 changed files with 10,174 additions and 20,895 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ dump.rdb
Vagrantfile
examples/browser/bundle.js
examples/browser/*.map
examples/browser/lib
dist/*.map
orbit-db/
ipfs/
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ test: deps

build: test
npm run build
mkdir -p examples/browser/lib/
cp dist/orbitdb.min.js examples/browser/lib/orbitdb.min.js
cp node_modules/ipfs-daemon/dist/ipfs-browser-daemon.min.js examples/browser/lib/ipfs-browser-daemon.min.js
@echo "Build success!"
@echo "Output: 'dist/', 'examples/browser/'"

Expand Down
67 changes: 18 additions & 49 deletions conf/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict'

const webpack = require('webpack')
const path = require('path')

Expand All @@ -6,59 +8,26 @@ module.exports = {
output: {
libraryTarget: 'var',
library: 'OrbitDB',
filename: './dist/orbitdb.js'
},
devtool: 'sourcemap',
stats: {
colors: true,
cached: false
filename: './dist/orbitdb.min.js'
},
node: {
console: false,
process: 'mock',
Buffer: true
},
plugins: [
],
devtool: 'source-map',
resolve: {
modules: [
path.join(__dirname, '../node_modules')
'node_modules',
path.resolve(__dirname, '../node_modules')
]
},
resolveLoader: {
modules: [
'node_modules',
path.resolve(__dirname, '../node_modules')
],
alias: {
http: 'stream-http',
https: 'https-browserify',
Buffer: 'buffer'
}
moduleExtensions: ['-loader']
},
module: {
loaders: [
{
test: /\.js$/,
exclude: /node_modules/,
loader: 'babel-loader',
query: {
presets: require.resolve('babel-preset-es2015'),
plugins: require.resolve('babel-plugin-transform-runtime')
}
},
{
test: /\.js$/,
include: /node_modules\/(hoek|qs|wreck|boom|ipfs-.+|orbit-db.+|logplease|crdts|promisify-es6)/,
loader: 'babel-loader',
query: {
presets: require.resolve('babel-preset-es2015'),
plugins: require.resolve('babel-plugin-transform-runtime')
}
},
{
test: /\.json$/,
loader: 'json-loader'
}
]
node: {
console: false,
Buffer: true
},
externals: {
net: '{}',
tls: '{}',
'require-dir': '{}'
}
plugins: [],
target: 'web'
}
68 changes: 0 additions & 68 deletions conf/webpack.config.minified.js

This file was deleted.

2 changes: 1 addition & 1 deletion conf/webpack.example.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = {
//
// Can be dropped once https://github.com/devongovett/browserify-zlib/pull/18
// is shipped
zlib: 'browserify-zlib',
zlib: 'browserify-zlib-next',
// Can be dropped once https://github.com/webpack/node-libs-browser/pull/41
// is shipped
http: 'stream-http'
Expand Down
Loading

0 comments on commit 00865a3

Please sign in to comment.