feat(auto-install): support pnpm (#1012)

* feat(auto-install): support pnpm * chore: update test * test: do not snap package-lock.json
rollup · Oct 19, 2021 · 61e4a01 · 61e4a01
1 parent 5cbbba0
commit 61e4a01
Show file tree

Hide file tree

Showing 13 changed files with 92 additions and 31 deletions.
diff --git a/packages/auto-install/src/index.ts b/packages/auto-install/src/index.ts
@@ -15,15 +15,16 @@ export default function autoInstall(opts: RollupAutoInstallOptions = {}): Plugin
     // intentionally undocumented options. used for tests
     commands: {
       npm: 'npm install',
+      pnpm: 'pnpm install',
       yarn: 'yarn add'
     },
-    manager: fs.existsSync('yarn.lock') ? 'yarn' : 'npm',
+    manager: fs.existsSync('yarn.lock') ? 'yarn' : fs.existsSync('pnpm-lock.yaml') ? 'pnpm' : 'npm',
     pkgFile: path.resolve(opts.pkgFile || 'package.json')
   };
 
   const options = Object.assign({}, defaults, opts);
   const { manager, pkgFile } = options;
-  const validManagers = ['npm', 'yarn'];
+  const validManagers = ['npm', 'yarn', 'pnpm'];
 
   if (!validManagers.includes(manager)) {
     throw new RangeError(

diff --git a/packages/auto-install/test/fixtures/npm/package.json b/packages/auto-install/test/fixtures/npm/package.json
@@ -1 +1 @@
-{}
+{}
diff --git a/packages/auto-install/test/fixtures/pnpm-bare/.gitkeep b/packages/auto-install/test/fixtures/pnpm-bare/.gitkeep
diff --git a/packages/auto-install/test/fixtures/pnpm/pnpm-lock.yaml b/packages/auto-install/test/fixtures/pnpm/pnpm-lock.yaml
diff --git a/packages/auto-install/test/npm-bare.js b/packages/auto-install/test/npm-bare.js
@@ -25,7 +25,7 @@ test('npm, bare', async (t) => {
     plugins: [autoInstall(), nodeResolve()]
   });
   t.snapshot(readFileSync('package.json', 'utf-8'));
-  t.snapshot(readFileSync('package-lock.json', 'utf-8'));
+  t.truthy(readFileSync('package-lock.json', 'utf-8').includes('"node-noop"'));
 });
 
 test.after(async () => {

diff --git a/packages/auto-install/test/npm.js b/packages/auto-install/test/npm.js
@@ -45,7 +45,7 @@ test('npm', async (t) => {
     },
     plugins: [autoInstall({ pkgFile, manager }), nodeResolve()]
   });
-  t.snapshot(readFileSync('package-lock.json', 'utf-8'));
+  t.snapshot(readFileSync('package.json', 'utf-8'));
 });
 
 test.after(async () => {

diff --git a/packages/auto-install/test/pnpm-bare.js b/packages/auto-install/test/pnpm-bare.js
@@ -0,0 +1,34 @@
+const { readFileSync } = require('fs');
+const { join } = require('path');
+
+const test = require('ava');
+const del = require('del');
+const { nodeResolve } = require('@rollup/plugin-node-resolve');
+const { rollup } = require('rollup');
+
+const autoInstall = require('..');
+
+const cwd = join(__dirname, 'fixtures/pnpm-bare');
+const file = join(cwd, 'output/bundle.js');
+const input = join(cwd, '../input.js');
+
+process.chdir(cwd);
+
+test('pnpm, bare', async (t) => {
+  t.timeout(50000);
+  await rollup({
+    input,
+    output: {
+      file,
+      format: 'cjs'
+    },
+    plugins: [autoInstall({ manager: 'pnpm' }), nodeResolve()]
+  });
+  const json = JSON.parse(readFileSync('package.json', 'utf-8'));
+  // snapshots for this are a nightmare cross-platform
+  t.truthy('node-noop' in json.dependencies);
+});
+
+test.after(async () => {
+  await del(['node_modules', 'package.json', 'pnpm-lock.yaml']);
+});
diff --git a/packages/auto-install/test/pnpm.js b/packages/auto-install/test/pnpm.js
@@ -0,0 +1,36 @@
+const { readFileSync, writeFileSync } = require('fs');
+const { join } = require('path');
+
+const test = require('ava');
+const del = require('del');
+const { nodeResolve } = require('@rollup/plugin-node-resolve');
+const { rollup } = require('rollup');
+
+const autoInstall = require('..');
+
+const cwd = join(__dirname, 'fixtures/pnpm');
+const file = join(cwd, 'output/bundle.js');
+const input = join(cwd, '../input.js');
+
+process.chdir(cwd);
+
+test('pnpm', async (t) => {
+  t.timeout(50000);
+  await rollup({
+    input,
+    output: {
+      file,
+      format: 'cjs'
+    },
+    plugins: [autoInstall(), nodeResolve()]
+  });
+
+  const json = JSON.parse(readFileSync('package.json', 'utf-8'));
+  // snapshots for this are a nightmare cross-platform
+  t.truthy('node-noop' in json.dependencies);
+});
+
+test.after(async () => {
+  await del(['node_modules', 'package.json']);
+  writeFileSync('pnpm-lock.yaml', '');
+});
diff --git a/packages/auto-install/test/snapshots/npm-bare.js.md b/packages/auto-install/test/snapshots/npm-bare.js.md
@@ -2,7 +2,7 @@
 
 The actual snapshot is saved in `npm-bare.js.snap`.
 
-Generated by [AVA](https://ava.li).
+Generated by [AVA](https://avajs.dev).
 
 ## npm, bare
 
@@ -14,18 +14,3 @@ Generated by [AVA](https://ava.li).
       }␊
     }␊
     `
-
-> Snapshot 2
-
-    `{␊
-      "requires": true,␊
-      "lockfileVersion": 1,␊
-      "dependencies": {␊
-        "node-noop": {␊
-          "version": "1.0.0",␊
-          "resolved": "https://registry.npmjs.org/node-noop/-/node-noop-1.0.0.tgz",␊
-          "integrity": "sha1-R6Pn2Az/qmRYNkvSLthcqzMHvnk="␊
-        }␊
-      }␊
-    }␊
-    `
diff --git a/packages/auto-install/test/snapshots/npm-bare.js.snap b/packages/auto-install/test/snapshots/npm-bare.js.snap
diff --git a/packages/auto-install/test/snapshots/npm.js.md b/packages/auto-install/test/snapshots/npm.js.md
@@ -2,27 +2,21 @@
 
 The actual snapshot is saved in `npm.js.snap`.
 
-Generated by [AVA](https://ava.li).
+Generated by [AVA](https://avajs.dev).
 
 ## invalid manager
 
 > Snapshot 1
 
-    '\'foo\' is not a valid package manager. Valid managers include: \'npm\', \'yarn\'.'
+    '\'foo\' is not a valid package manager. Valid managers include: \'npm\', \'yarn\', \'pnpm\'.'
 
 ## npm
 
 > Snapshot 1
 
     `{␊
-      "requires": true,␊
-      "lockfileVersion": 1,␊
       "dependencies": {␊
-        "node-noop": {␊
-          "version": "1.0.0",␊
-          "resolved": "https://registry.npmjs.org/node-noop/-/node-noop-1.0.0.tgz",␊
-          "integrity": "sha1-R6Pn2Az/qmRYNkvSLthcqzMHvnk="␊
-        }␊
+        "node-noop": "^1.0.0"␊
       }␊
     }␊
     `
diff --git a/packages/auto-install/test/snapshots/npm.js.snap b/packages/auto-install/test/snapshots/npm.js.snap
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml