Bump openvibe-shared v2.2.0 → v2.5.0 (#14)

ddiff --git a/lib/release-ops.js b/lib/release-ops.js
iindex 34a2bad..fdbaf6c 100644
---- a/lib/release-ops.js
++++ b/lib/release-ops.js
@@@ -146,7 +146,7 @@ async function computePlan(ctx, svc, { mode = 'deploy', to = null, fetch = true,
                  ? path.dirname(f) === path.dirname(repoVhosts) && path.basename(f).endsWith('.conf')
                  : f === repoVhosts);
              if (repoVhost && svc.nginx.skipVhosts?.includes(path.basename(f))) continue;
--            if (!buildOutput && !repoVhost) continue;
++            if ((!buildOutput && !repoVhost) || untrackedLockfiles.includes(f)) continue;   // byte-identical: already removed above
              if ((await g.show(from, f)) != null || (await g.show(target, f)) == null) continue;
              if (await exec.stat(path.join(svc.repo, f))) untrackedGenerated.push(f);
          }
ddiff --git a/package-lock.json b/package-lock.json
iindex 121f178..457aed2 100644
---- a/package-lock.json
++++ b/package-lock.json
@@@ -19,7 +19,7 @@
          "iovalkey": "^0.4.0",
          "openvibe-contracts": "https://codeload.github.com/OpenVibers/OpenVibe.Contracts/tar.gz/refs/tags/v0.83.0",
          "openvibe-sdk": "https://codeload.github.com/OpenVibers/OpenVibe.SDK/tar.gz/refs/tags/v0.26.0",
--        "openvibe-shared": "https://codeload.github.com/OpenVibers/OpenVibe.Shared/tar.gz/refs/tags/v2.2.0",
++        "openvibe-shared": "https://codeload.github.com/OpenVibers/OpenVibe.Shared/tar.gz/refs/tags/v2.5.0",
          "pg": "^8.23.0"
        },
        "bin": {
@@@ -1546,12 +1546,15 @@
        }
      },
      "node_modules/openvibe-shared": {
--      "version": "2.2.0",
--      "resolved": "https://codeload.github.com/OpenVibers/OpenVibe.Shared/tar.gz/refs/tags/v2.2.0",
--      "integrity": "sha512-1q+iUuUxzPeylTYmithW4jR++Jccvn5GEOrB1B3D18Dgn6OXQhPpvhPQAa1D1k1p+dWIa1/SmggyJwSGFnTNtw==",
++      "version": "2.5.0",
++      "resolved": "https://codeload.github.com/OpenVibers/OpenVibe.Shared/tar.gz/refs/tags/v2.5.0",
++      "integrity": "sha512-fHuUS6SXM7ezatfAyqLm1V8B6puV9YXSnz6aG6XQbWx28qghRCCHeUF3lr4nxiCGdn9SyikYtIyLGL5r1ycp9Q==",
        "license": "MIT",
        "dependencies": {
          "jsonwebtoken": "^9.0.0"
++      },
++      "bin": {
++        "openvibe-build-assets": "scripts/build-assets.js"
        }
      },
      "node_modules/parseurl": {
ddiff --git a/package.json b/package.json
iindex 388e373..e2035df 100644
---- a/package.json
++++ b/package.json
@@@ -35,7 +35,7 @@
      "iovalkey": "^0.4.0",
      "openvibe-contracts": "https://codeload.github.com/OpenVibers/OpenVibe.Contracts/tar.gz/refs/tags/v0.83.0",
      "openvibe-sdk": "https://codeload.github.com/OpenVibers/OpenVibe.SDK/tar.gz/refs/tags/v0.26.0",
--    "openvibe-shared": "https://codeload.github.com/OpenVibers/OpenVibe.Shared/tar.gz/refs/tags/v2.2.0",
++    "openvibe-shared": "https://codeload.github.com/OpenVibers/OpenVibe.Shared/tar.gz/refs/tags/v2.5.0",
      "pg": "^8.23.0"
    },
    "engines": {
ddiff --git a/test/strategy-in-place.test.js b/test/strategy-in-place.test.js
iindex fb75636..b0e62d5 100644
---- a/test/strategy-in-place.test.js
++++ b/test/strategy-in-place.test.js
@@@ -339,14 +339,14 @@ runTests([
          assert.ok(rm >= 0 && rm < merge, 'removed before the merge'); assert.strictEqual(host.calls[rm].as, 'ubuntu');
          assert.strictEqual(host.read('/opt/openvibe.sites/deploy/nginx/openvibe.work.conf'), '# work v1');
          assert.deepStrictEqual((await lastRecord(host, 'sites')).removedUntracked, ['deploy/nginx/openvibe.work.conf']);
--        // Different bytes are someone's file: never removed, the merge refuses as before.
++        // Different bytes outside the build output and the repo vhost glob are someone's file: never removed, the merge refuses as before.
          const h2 = sitesHost();
--        h2.put('/opt/openvibe.sites/deploy/nginx/local.conf', '# a hand edit', { owner: 'ubuntu' });
--        h2.push({ 'deploy/nginx/local.conf': '# from the repository' }, 'track local.conf');
++        h2.put('/opt/openvibe.sites/deploy/nginx/README.md', '# a hand edit', { owner: 'ubuntu' });
++        h2.push({ 'deploy/nginx/README.md': '# from the repository' }, 'track README.md');
          const r2 = await h2.cli('deploy', 'sites');
--        assert.notStrictEqual(r2.code, 0, r2.out); assert.match(r2.out, /deploy\/nginx\/local\.conf \/ Please move or remove them before you merge/);
--        assert.strictEqual(h2.read('/opt/openvibe.sites/deploy/nginx/local.conf'), '# a hand edit');
--        assert.ok(!h2.calls.some((c) => c.cmd === 'rm' && c.args.includes('/opt/openvibe.sites/deploy/nginx/local.conf')));
++        assert.notStrictEqual(r2.code, 0, r2.out); assert.match(r2.out, /deploy\/nginx\/README\.md \/ Please move or remove them before you merge/);
++        assert.strictEqual(h2.read('/opt/openvibe.sites/deploy/nginx/README.md'), '# a hand edit');
++        assert.ok(!h2.calls.some((c) => c.cmd === 'rm' && c.args.includes('/opt/openvibe.sites/deploy/nginx/README.md')));
      }),
  
      test('sites: nothing new does nothing', async () => {