Merge branch 'master' into docs-docker

alxndrsn · Jan 9, 2025 · 12b8942 · 12b8942
2 parents 1fa30f4 + 8f38843
commit 12b8942
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 74 deletions.
diff --git a/.github/actions/install-node-package/action.yml b/.github/actions/install-node-package/action.yml
@@ -21,5 +21,5 @@ runs:
         restore-keys: |
           ${{ runner.os }}-node-
 
-    - run: npm install
+    - run: npm clean-install
       shell: bash
diff --git a/bin/build-site.js b/bin/build-site.js
@@ -74,7 +74,7 @@ if (!process.env.BUILD) {
   const watchGlob = require('glob-watcher');
 
   watchGlob('**', buildJekyll);
-  watchGlob('docs/static/less/*/*.less', buildCSS);
+  watchGlob('static/less/*/*.less', buildCSS);
   http_server.createServer({root: '_site', cache: '-1'}).listen(4000);
   console.log('Server address: http://localhost:4000');
 }

diff --git a/bin/release.sh b/bin/release.sh
@@ -10,7 +10,7 @@ fi
 
 #make sure deps are up to date
 rm -fr node_modules
-npm install
+npm clean-install
 
 # get current version
 VERSION=$(node --eval "console.log(require('./packages/node_modules/pouchdb/package.json').version);")

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
@@ -47,16 +47,14 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.9)
     rouge (3.30.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    strscan (3.1.0)
 
 PLATFORMS
   ruby

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/node_modules/pouchdb-adapter-http/src/index.js b/packages/node_modules/pouchdb-adapter-http/src/index.js
@@ -75,23 +75,22 @@ function preprocessAttachments(doc) {
   }));
 }
 
-function hasUrlPrefix(opts) {
-  if (!opts.prefix) {
+function hasUrlPrefix(prefix) {
+  if (!prefix) {
     return false;
   }
-  const protocol = parseUri(opts.prefix).protocol;
+  const protocol = parseUri(prefix).protocol;
   return protocol === 'http' || protocol === 'https';
 }
 
 // Get all the information you possibly can about the URI given by name and
 // return it as a suitable object.
-function getHost(name, opts) {
+function getHost({ name, prefix }) {
   // encode db name if opts.prefix is a url (#5574)
-  if (hasUrlPrefix(opts)) {
-    const dbName = opts.name.substr(opts.prefix.length);
+  if (hasUrlPrefix(prefix)) {
+    const dbName = name.substr(prefix.length);
     // Ensure prefix has a trailing slash
-    const prefix = opts.prefix.replace(/\/?$/, '/');
-    name = prefix + encodeURIComponent(dbName);
+    name = prefix.replace(/\/?$/, '/') + encodeURIComponent(dbName);
   }
 
   const uri = parseUri(name);
@@ -157,7 +156,7 @@ function HttpPouch(opts, callback) {
   // The functions that will be publicly available for HttpPouch
   const api = this;
 
-  const host = getHost(opts.name, opts);
+  const host = getHost(opts);
   const dbUrl = genDBUrl(host, '');
 
   opts = clone(opts);