try to get working
diff --git a/bin/build-pouchdb.js b/bin/build-pouchdb.js
index 190df2f..2868422 100644
--- a/bin/build-pouchdb.js
+++ b/bin/build-pouchdb.js
@@ -19,6 +19,7 @@
var rollup = require('rollup');
var nodeResolve = require('rollup-plugin-node-resolve');
var builtIns = require('rollup-plugin-node-builtins');
+var json = require('rollup-plugin-json');
var commonjs = require('rollup-plugin-commonjs');
var inject = require('rollup-plugin-inject');
var replace = require('rollup-plugin-replace');
@@ -184,19 +185,22 @@
});
}
-function doRollupForUmd(entry, fileOut, prefix, moduleName) {
+function doRollupForUmd(entry, fileOut, prefix, moduleName, exclusions) {
var start = process.hrtime();
return rollup.rollup({
entry: addPath(entry),
+ external: exclusions,
plugins: [
nodeResolve({
+ skip: exclusions,
jsnext: true,
browser: true,
preferBuiltins: true
}),
commonjs(),
+ json(),
inject({global: 'global'}),
- builtIns()
+ builtIns
]
}).then(function (bundle) {
var code = bundle.generate({format: 'umd', moduleName: moduleName}).code;
@@ -221,7 +225,7 @@
}
// build for Browserify/Webpack (index-browser.js)
-function buildForBrowserify() {
+function buildForBundlers() {
return doRollup('src/index.js', true, {
cjs: 'lib/index-browser.js',
es: 'lib/index-browser.es.js'
@@ -231,12 +235,12 @@
// build for the browser (dist)
function buildForBrowser() {
return doRollupForUmd('lib/index-browser.es.js', 'dist/pouchdb.js',
- comments.pouchdb, 'PouchDB').then(function (code) {
+ comments.pouchdb, 'PouchDB', []).then(function (code) {
return doUglify(code, comments.pouchdb, 'dist/pouchdb.min.js')
});
}
-function buildPluginsForBrowserify() {
+function buildPluginsForBundlers() {
return all(plugins.map(function (plugin) {
return doRollup('src/plugins/' + plugin + '.js', true, {
cjs: 'lib/plugins/' + plugin + '.js'
@@ -247,12 +251,10 @@
function buildPluginsForBrowser() {
return all(plugins.map(function (plugin) {
var source = 'lib/plugins/' + plugin + '.js';
- return doBrowserify(source, {}, 'pouchdb').then(function (code) {
- code = comments[plugin] + code;
- return all([
- writeFile('packages/node_modules/pouchdb/dist/pouchdb.' + plugin + '.js', code),
- doUglify(code, comments[plugin], 'dist/pouchdb.' + plugin + '.min.js')
- ]);
+ var fileOut = 'dist/pouchdb.' + plugin + '.js';
+ return doRollupForUmd(source, fileOut, comments[plugin],
+ plugin, ['pouchdb']).then(function (code) {
+ return doUglify(code, comments[plugin], 'dist/pouchdb.' + plugin + '.min.js')
});
})).then(function () {
return rimraf(addPath('lib/plugins')); // no need for this after building dist/
@@ -289,15 +291,15 @@
}
function doBuildDev() {
- return doAll(buildForNode, buildForBrowserify)()
- .then(doAll(buildForBrowser, buildPluginsForBrowserify, buildPouchDBNext))
+ return doAll(buildForNode, buildForBundlers)()
+ .then(doAll(buildForBrowser, buildPluginsForBundlers, buildPouchDBNext))
.then(buildPluginsForBrowser);
}
function doBuildAll() {
return rimrafMkdirp('lib', 'dist', 'lib/plugins')
- .then(doAll(buildForNode, buildForBrowserify))
- .then(doAll(buildForBrowser, buildPluginsForBrowserify, buildPouchDBNext))
+ .then(doAll(buildForNode, buildForBundlers))
+ .then(doAll(buildForBrowser, buildPluginsForBundlers, buildPouchDBNext))
.then(doAll(buildPluginsForBrowser));
}
diff --git a/package.json b/package.json
index 5155bd4..af230d3 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,6 @@
"browserify": "13.1.0",
"browserify-incremental": "3.1.1",
"builtin-modules": "1.1.1",
- "bundle-collapser": "1.2.1",
"chai": "3.5.0",
"chai-as-promised": "5.3.0",
"child-process-promise": "2.2.0",
@@ -99,6 +98,7 @@
"rollup": "0.34.13",
"rollup-plugin-commonjs": "^5.0.5",
"rollup-plugin-inject": "^2.0.0",
+ "rollup-plugin-json": "^2.0.2",
"rollup-plugin-node-builtins": "^2.0.0",
"rollup-plugin-node-resolve": "2.0.0",
"rollup-plugin-replace": "1.1.1",
