WIP: Epic: https://github.com/pouchdb/pouchdb/issues/8661

.eslintrc.json

@@ -3,7 +3,7 @@
   "extends": "eslint:recommended",
 
   "parserOptions": {
-    "ecmaVersion": 8,
+    "ecmaVersion": "latest",
     "sourceType": "module"
   },
 

.gitignore

@@ -1,6 +1,7 @@
+dist
 tmp*
 .DS_Store
-/node_modules
+node_modules
 docs/_site
 docs/static/css
 docs/.jekyll-cache
@@ -14,16 +15,15 @@ bower_components
 tests/integration/cordova/www
 tests/pouchdb_server
 tests/performance-bundle.js
-packages/node_modules/pouchdb/dist/*
 pouchdb-webpack.js
 lib
+!/packages/pouchdb-lib/lib
+!/packages/pouchdb-platform/lib
 lib_unit
 src_browser/
 lerna-debug.log
 tests/integration/utils-bundle.js
 *.heapsnapshot
 /pouchdb-server-install
-package-lock.json
-yarn.lock
 /.eslintcache
-release-todo.txt
+release-todo.txt

README.md

@@ -45,3 +45,18 @@ Contributing
 We're always looking for new contributors! If you'd like to try your hand at writing code, writing documentation, designing the website, writing a blog post, or answering [questions on StackOverflow](http://stackoverflow.com/search?tab=newest&q=pouchdb), then we'd love to have your input.
 
 If you have a pull request that you'd like to submit, please read the [contributing guide](https://github.com/pouchdb/pouchdb/blob/master/CONTRIBUTING.md) for info on style, commit message format, and other (slightly!) nitpicky things like that. PouchDB is heavily tested, so you'll also want to check out the [testing guide](https://github.com/pouchdb/pouchdb/blob/master/TESTING.md).
+
+```sh
+
+git clone this
+## TODO: fix build scripts to use only the packages/ folder without node_modules.
+## link ./packages/node_modules
+npm --prefix ./packages install
+# or
+cd packages
+npm install
+
+## Update migration lib
+cd packages/pouchdb-lib/
+rollup -c
+```

bin/build-module.js

@@ -17,8 +17,7 @@ var denodeify = require('denodeify');
 var mkdirp = denodeify(require('mkdirp'));
 var rimraf = denodeify(require('rimraf'));
 var builtInModules = require('builtin-modules');
-var fs = require('fs');
-var all = Promise.all.bind(Promise);
+var fs = require('node:fs');
 
 // special case - pouchdb-for-coverage is heavily optimized because it's
 // simpler to run the coverage reports that way.
@@ -34,9 +33,9 @@ var BROWSER_ONLY_PACKAGES =
 var BROWSER_DEPENDENCY_ONLY_PACKAGES =
   ['pouchdb-adapter-leveldb'];
 
-function buildModule(filepath) {
+async function buildModule(filepath) {
   var pkg = require(path.resolve(filepath, 'package.json'));
-  var topPkg = require(path.resolve(filepath, '../../../package.json'));
+  var topPkg = require(path.resolve(filepath, '../../package.json'));
   var pouchdbPackages = fs.readdirSync(path.resolve(filepath, '..'));
   // All external modules are assumed to be CommonJS, and therefore should
   // be skipped by Rollup. We may revisit this later.
@@ -56,47 +55,40 @@ function buildModule(filepath) {
   var skipBrowserField = BROWSER_DEPENDENCY_ONLY_PACKAGES.indexOf(pkg.name) !== -1;
   if (!skipBrowserField && pkg.browser && pkg.browser['./lib/index.js'] !==
       './lib/index-browser.js') {
-    return Promise.reject(new Error(pkg.name +
-      ' is missing a "lib/index.js" entry in the browser field'));
+    new Error(pkg.name +
+      ' is missing a "lib/index.js" entry in the browser field');
   }
 
   // special case for "pouchdb-browser" - there is only one index.js,
   // and it's built in "browser mode"
   var forceBrowser = BROWSER_ONLY_PACKAGES.indexOf(pkg.name) !== -1;
-
-  return Promise.resolve().then(function () {
-    return rimraf(path.resolve(filepath, 'lib'));
-  }).then(function () {
-    return mkdirp(path.resolve(filepath, 'lib'));
-  }).then(function () {
-    return all(versions.map(function (isBrowser) {
-      return rollup({
+  rimraf(path.resolve(filepath, 'lib'));
+  mkdirp(path.resolve(filepath, 'lib'));
+
+  return versions.map((isBrowser) => ['es'].map(
+    async (format) => {
+      const file = (isBrowser ? 'lib/index-browser' : 'lib/index') +
+        (format === 'es' ? '.es.js' : '.js');
+      await (await rollup({
         input: path.resolve(filepath, './src/index.js'),
         external: depsToSkip,
         plugins: rollupPlugins({
-          mainFields: ['module', 'main'],
           browser: isBrowser || forceBrowser
         })
-      }).then(function (bundle) {
-        var formats = ['cjs', 'es'];
-        return all(formats.map(function (format) {
-          var file = (isBrowser ? 'lib/index-browser' : 'lib/index') +
-            (format === 'es' ? '.es.js' : '.js');
-          return bundle.write({
-            format: format,
-            file: path.resolve(filepath, file)
-          }).then(function () {
-            console.log('  \u2713' + ' wrote ' +
-              path.basename(filepath) + '/' + file + ' in ' +
-                (isBrowser ? 'browser' :
-                versions.length > 1 ? 'node' : 'vanilla') +
-              ' mode');
-          });
-        }));
+      })).write({
+        inlineDynamicImports: true,
+        format: format,
+        file: path.resolve(filepath, file)
       });
-    }));
-  });
+      console.log('  \u2713' + ' wrote ' +
+        path.basename(filepath) + '/' + file + ' in ' +
+          (isBrowser ? 'browser' :
+          versions.length > 1 ? 'node' : 'vanilla') +
+        ' mode');
+    }
+  ));
 }
+
 if (require.main === module) {
   buildModule(process.argv[process.argv.length - 1]).catch(function (err) {
     console.error('build-module.js error');

bin/build-modules.js

@@ -4,29 +4,23 @@
 
 var path = require('path');
 var denodeify = require('denodeify');
-var fs = require('fs');
+var fs = require('node:fs');
+const fsPromises = fs.promises;
 var readDir = denodeify(fs.readdir);
-var stat = denodeify(fs.stat);
 
 var buildModule = require('./build-module');
 var buildPouchDB = require('./build-pouchdb');
 
-function buildPackage(pkg) {
-  return stat(path.resolve('packages/node_modules', pkg)).then(function (stat) {
-    if (!stat.isDirectory()) { // skip e.g. 'npm-debug.log'
-      return;
-    }
-    console.log('Building ' + pkg + '...');
-    if (pkg === 'pouchdb') {
-      return buildPouchDB();
-    } else {
-      return buildModule(path.resolve('./packages/node_modules', pkg));
-    }
-  });
-}
-
-readDir('packages/node_modules').then(function (packages) {
-  return Promise.all(packages.map(buildPackage)).catch(function (err) {
+readDir('packages').then(function (packages) {
+  console.log(packages);
+  return Promise.all(packages.map(async (pkg) => {
+    const isDir = pkg !== 'server' && 
+    pkg.startsWith('pouchdb') && 
+    (await fsPromises.stat(path.resolve('packages', pkg))).isDirectory();
+    isDir && console.log('Building ' + pkg + '...');
+    return isDir && pkg === 'pouchdb' ? buildPouchDB() : buildModule(path.resolve('./packages', pkg));
+
+  })).catch(function (err) {
     console.error('build error');
     console.error(err.stack);
     process.exit(1);

bin/build-pouchdb.js

@@ -7,20 +7,18 @@
 
 var DEV_MODE = process.env.CLIENT === 'dev';
 
-var path = require('path');
+var path = require('node:path');
 var denodeify = require('denodeify');
 var rollup = require('rollup');
 var rollupPlugins = require('./rollupPlugins');
 var rimraf = denodeify(require('rimraf'));
 var mkdirp = denodeify(require('mkdirp'));
-var all = Promise.all.bind(Promise);
 var buildUtils = require('./build-utils');
-var addPath = buildUtils.addPath;
 var doUglify = buildUtils.doUglify;
 var doBrowserify = buildUtils.doBrowserify;
 var writeFile = buildUtils.writeFile;
 
-var pkg = require('../packages/node_modules/pouchdb/package.json');
+var pkg = require('../packages/pouchdb/package.json');
 var version = pkg.version;
 
 var builtInModules = require('builtin-modules');
@@ -70,44 +68,51 @@ var comments = {
   '\n// http://pouchdb.com\n',
 };
 
-function doRollup(input, browser, formatsToFiles) {
+async function doRollup(inputPath, browser, formatsToFiles) {
   var start = process.hrtime();
-  return rollup.rollup({
-    input: addPath('pouchdb', input),
-    external: external,
+  console.log('ROLLUP:',{ inputPath });
+  const input = path.resolve('packages/' + 'pouchdb/' + inputPath);
+  const bundle = (await rollup.rollup({
+    input,
+    external,
     plugins: rollupPlugins({
-      mainFields: ["module"],
-      browser: browser
+      //mainFields: ["module"],
+      browser
     })
-  }).then(function (bundle) {
-    return Promise.all(Object.keys(formatsToFiles).map(function (format) {
-      var fileOut = formatsToFiles[format];
-      return bundle.generate({format: format}).then(function (bundle) {
-        if (DEV_MODE) {
-          var ms = Math.round(process.hrtime(start)[1] / 1000000);
-          console.log('    took ' + ms + ' ms to rollup ' +
-                      path.dirname(input) + '/' + path.basename(input));
-        }
-        return writeFile(addPath('pouchdb', fileOut), bundle.code);
-      });
-    }));
-  });
+  }));
+
+  return Promise.all(Object.keys(formatsToFiles).map(function (format) {
+    return bundle.generate({format: format}).then(function (bundle) {
+      if (DEV_MODE) {
+        var ms = Math.round(process.hrtime(start)[1] / 1000000);
+        console.log('    took ' + ms + ' ms to rollup ' +
+          path.dirname(input) + '/' + path.basename(input));
+      }
+
+      return writeFile(path.resolve('packages/' + 'pouchdb/' + formatsToFiles[format]), bundle.output[0].code);
+    });
+  }));
+
 }
+// true == isBrowser
+const builds = [['src/index.js', false, {
+  cjs: 'lib/index.js',
+  es: 'lib/index.es.js'
+}],['src/index.js', true, {
+  cjs: 'lib/index-browser.js',
+  es: 'lib/index-browser.es.js'
+}]];
+
 
 // build for Node (index.js)
 function buildForNode() {
-  return doRollup('src/index.js', false, {
-    cjs: 'lib/index.js',
-    es: 'lib/index.es.js'
-  });
+  return doRollup(...builds[0]);
 }
 
 // build for Browserify/Webpack (index-browser.js)
-function buildForBrowserify() {
-  return doRollup('src/index.js', true, {
-    cjs: 'lib/index-browser.js',
-    es: 'lib/index-browser.es.js'
-  });
+async function buildForBrowserify() {
+  return true;
+  //return doRollup(...builds[1]);
 }
 
 // build for the browser (dist)
@@ -116,67 +121,65 @@ function buildForBrowser() {
     standalone: 'PouchDB'
   }).then(function (code) {
     code = comments.pouchdb + code;
-    return all([
-      writeFile(addPath('pouchdb', 'dist/pouchdb.js'), code),
+    //console.log('comments:',{code});
+    return Promise.all([
+      writeFile(path.resolve('packages/' + 'pouchdb/' + 'dist/pouchdb.js'), code),
       doUglify('pouchdb', code, comments.pouchdb, 'dist/pouchdb.min.js')
     ]);
   });
 }
 
 function buildPluginsForBrowserify() {
-  return all(plugins.map(function (plugin) {
-    return doRollup('src/plugins/' + plugin + '.js', true, {
-      cjs: 'lib/plugins/' + plugin + '.js'
-    });
+  return plugins.map(async (plugin) => await doRollup('src/plugins/' + plugin + '.js', true, {
+    cjs: 'lib/plugins/' + plugin + '.js'
   }));
 }
 
 function buildPluginsForBrowser() {
-  return all(plugins.map(function (plugin) {
+  return Promise.all(plugins.map(function (plugin) {
     var source = 'lib/plugins/' + plugin + '.js';
     return doBrowserify('pouchdb', source, {}, 'pouchdb').then(function (code) {
       code = comments[plugin] + code;
-      return all([
-        writeFile('packages/node_modules/pouchdb/dist/pouchdb.' + plugin + '.js', code),
+      return Promise.all([
+        writeFile('packages/pouchdb/dist/pouchdb.' + plugin + '.js', code),
         doUglify('pouchdb', code, comments[plugin], 'dist/pouchdb.' + plugin + '.min.js')
       ]);
     });
   })).then(function () {
-    return rimraf(addPath('pouchdb', 'lib/plugins')); // no need for this after building dist/
+    return rimraf(path.resolve('packages/' + 'pouchdb/' + 'lib/plugins')); // no need for this after building dist/
   });
 }
 
 var rimrafMkdirp = function (...args) {
-  return all(args.map(function (otherPath) {
-    return rimraf(addPath('pouchdb', otherPath));
+  return Promise.all(args.map(function (otherPath) {
+    return rimraf(path.resolve('packages/' + 'pouchdb/' + otherPath));
   })).then(function () {
-    return all(args.map(function (otherPath) {
-      return mkdirp(addPath('pouchdb', otherPath));
+    return Promise.all(args.map(function (otherPath) {
+      return mkdirp(path.resolve('packages/' + 'pouchdb/' + otherPath));
     }));
   });
 };
 
-var doAll = function (...args) {
-  return function () {
-    return all(args.map(function (promiseFactory) {
-      return promiseFactory();
-    }));
-  };
-};
-
-function doBuildNode() {
-  return mkdirp(addPath('pouchdb', 'lib/plugins'))
-    .then(buildForNode);
+async function doBuildNode() {
+  await mkdirp(path.resolve('packages/' + 'pouchdb/' + 'lib/plugins'));
+  buildForNode();
 }
 
-function doBuildAll() {
-  return rimrafMkdirp('lib', 'dist', 'lib/plugins')
-    .then(doAll(buildForNode, buildForBrowserify))
-    .then(doAll(buildForBrowser, buildPluginsForBrowserify))
-    .then(doAll(buildPluginsForBrowser));
+async function doBuildAll() {
+  await rimrafMkdirp('lib', 'dist', 'lib/plugins');
+  Promise.all([
+    buildForNode,
+    //buildForBrowserify,
+    buildForBrowser,
+    //buildPluginsForBrowserify,
+    //buildPluginsForBrowser
+  ].map((fn) => fn()));  
+
+
 }
 
 function doBuild() {
+  //return doBuildNode();
   if (process.env.BUILD_NODE) { // rebuild before "npm test"
     return doBuildNode();
   } else { // normal, full build