Added pnpm

src/.npmrc

@@ -0,0 +1 @@
+auto-install-peers=false

src/bin/doc/package-lock.json

@@ -1,13 +0,0 @@
-{
-  "name": "node-doc-generator",
-  "version": "0.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "marked": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-12.0.0.tgz",
-      "integrity": "sha512-Vkwtq9rLqXryZnWaQc86+FHLC6tr/fycMfYAhiOIXkrNmeGAyhSxjqu0Rs1i0bBqw5u0S7+lV9fdH2ZSVaoa0w=="
-    }
-  }
-}

src/bin/doc/package.json

@@ -1,15 +0,0 @@
-{
-  "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
-  "name": "node-doc-generator",
-  "description": "Internal tool for generating Node.js API docs",
-  "version": "0.0.0",
-  "engines": {
-    "node": ">=12.17.0"
-  },
-  "dependencies": {
-    "marked": "^12.0.0"
-  },
-  "devDependencies": {},
-  "optionalDependencies": {},
-  "bin": "./generate.js"
-}

src/bin/installDeps.sh

@@ -12,12 +12,12 @@ cd "${MY_DIR}/../.." || exit 1
 # Not checking io.js, default installation creates a symbolic link to node
 is_cmd node || fatal "Please install node.js ( https://nodejs.org )"
 
-# Is npm installed?
-is_cmd npm || fatal "Please install npm ( https://npmjs.org )"
+# Is pnpm installed?
+is_cmd pnpm || fatal "Please install pnpm ( https://pnpmjs.org )"
 
-# Check npm version
-require_minimal_version "npm" "$(get_program_version "npm")" \
-    "$REQUIRED_NPM_MAJOR" "$REQUIRED_NPM_MINOR"
+# Check pnpm version
+require_minimal_version "pnpm" "$(get_program_version "pnpm")" \
+    "$REQUIRED_pnpm_MAJOR" "$REQUIRED_pnpm_MINOR"
 
 # Check node version
 require_minimal_version "nodejs" "$(get_program_version "node")" \
@@ -48,10 +48,10 @@ cd src
 
 if [ -z "${ETHERPAD_PRODUCTION}" ]; then
   log "Installing dev dependencies"
- npm ci --no-optional --omit=optional --include=dev --lockfile-version 1 || exit 1
+ pnpm ci --no-optional --omit=optional --include=dev --lockfile-version 1 || exit 1
 else
   log "Installing production dependencies"
-  npm ci --no-optional --omit=optional --omit=dev --lockfile-version 1 --production || exit 1
+  pnpm ci --no-optional --omit=optional --omit=dev --lockfile-version 1 --production || exit 1
 fi
 
 # Remove all minified data to force node creating it new

src/package.json

@@ -54,7 +54,6 @@
     "log4js": "^6.9.1",
     "measured-core": "^2.0.0",
     "mime-types": "^2.1.35",
-    "npm": "^6.14.18",
     "openapi-backend": "^5.10.6",
     "proxy-addr": "^2.0.7",
     "rate-limiter-flexible": "^4.0.1",

src/static/js/pluginfw/installer.js

@@ -47,7 +47,7 @@ const migratePluginsFromNodeModules = async () => {
   //   * The `--no-production` flag is required (or the `NODE_ENV` environment variable must be
   //     unset or set to `development`) because otherwise `npm ls` will not mention any packages
   //     that are not included in `package.json` (which is expected to not exist).
-  const cmd = ['npm', 'ls', '--long', '--json', '--depth=0', '--no-production'];
+  const cmd = ['pnpm', 'ls', '--long', '--json', '--depth=0', '--no-production'];
   const {dependencies = {}} = JSON.parse(await runCmd(cmd, {stdio: [null, 'string']}));
   await Promise.all(Object.entries(dependencies).map(async ([pkg, info]) => {
     if (pkg.startsWith(plugins.prefix) && pkg !== 'ep_etherpad-lite') {

src/static/js/pluginfw/plugins.js

@@ -16,10 +16,10 @@ const logger = log4js.getLogger('plugins');
 // Log the version of npm at startup.
 (async () => {
   try {
-    const version = await runCmd(['npm', '--version'], {stdio: [null, 'string']});
-    logger.info(`npm --version: ${version}`);
+    const version = await runCmd(['pnpm', '--version'], {stdio: [null, 'string']});
+    logger.info(`pnpm --version: ${version}`);
   } catch (err) {
-    logger.error(`Failed to get npm version: ${err.stack || err}`);
+    logger.error(`Failed to get pnpm version: ${err.stack || err}`);
     // This isn't a fatal error so don't re-throw.
   }
 })();