Merge pull request #960 from NullVoxPopuli/update-pnpm-behavior-based-on-blah-blah

Author: kategengler

README.md

@@ -121,7 +121,7 @@ module.exports = async function() {
     */
     useYarn: true,
     /*
-      If set to true, all npm scenarios will use `pnpm` for install with the `--frozen-lockfile=false` option. At cleanup, your
+      If set to true, all npm scenarios will use `pnpm` for install with the `--no-lockfile` options. At cleanup, your
       dependencies will be restored to their prior state.
     */
     usePnpm: true,
@@ -213,12 +213,12 @@ If you include `useYarn: true` in your `ember-try` config, all npm scenarios wil
 
 ##### Pnpm
 
-If you include `usePnpm: true` in your `ember-try` config, all npm scenarios will use `pnpm` for install with the `--frozen-lockfile=false` option. At cleanup, your dependencies will be restored to their prior state.
+If you include `usePnpm: true` in your `ember-try` config, all npm scenarios will use `pnpm` for install with the `--no-lockfile` options. At cleanup, your dependencies will be restored to their prior state.
 
 
 ##### A note on npm scenarios with lockfiles
 
-Lockfiles are ignored by `ember-try`. (`yarn` will run with `--no-lockfile` and `npm` will be run with `--no-shrinkwrap` and `pnpm` will be run with `--frozen-lockfile=false`).
+Lockfiles are ignored by `ember-try`. (`yarn` will run with `--no-lockfile` and `npm` will be run with `--no-shrinkwrap` and `pnpm` will be run with `--no-lockfile`).
 When testing various scenarios, it's important to "float" dependencies so that the scenarios are run with the latest satisfying versions of dependencies a user of the project would get.
 
 ##### Workspaces

lib/dependency-manager-adapters/pnpm.js

@@ -97,8 +97,10 @@ module.exports = CoreObject.extend({
       if (!Array.isArray(mgrOptions)) {
         throw new Error('buildManagerOptions must return an array of options');
       }
-    } else if (!mgrOptions.includes('--frozen-lockfile=false')) {
-      mgrOptions.push('--frozen-lockfile=false');
+    } else {
+      if (!mgrOptions.includes('--no-lockfile')) {
+        mgrOptions.push('--no-lockfile');
+      }
     }
 
     // Note: We are explicitly *not* using `--no-lockfile` here, so that we

test/dependency-manager-adapters/pnpm-adapter-test.js

@@ -67,7 +67,7 @@ describe('pnpm Adapter', () => {
       let stubbedRun = generateMockRun(
         [
           {
-            command: 'pnpm install --frozen-lockfile=false',
+            command: 'pnpm install --no-lockfile',
             async callback(command, args, opts) {
               runCount++;
               expect(opts).to.have.property('cwd', tmpdir);
@@ -115,7 +115,7 @@ describe('pnpm Adapter', () => {
   });
 
   describe('#cleanup', () => {
-    it('restores the `package.json` and `yarn-lock.yaml` files, and then runs `pnpm install`', async () => {
+    it('restores the `package.json` and `pnpm-lock.yaml` files, and then runs `pnpm install`', async () => {
       await fs.outputJson('package.json', { modifiedPackageJSON: true });
       await fs.outputJson('package.json.ember-try', { originalPackageJSON: true });
       await fs.outputFile('pnpm-lock.yaml', 'modifiedYAML: true\n');
@@ -125,7 +125,7 @@ describe('pnpm Adapter', () => {
       let stubbedRun = generateMockRun(
         [
           {
-            command: 'pnpm install --frozen-lockfile=false',
+            command: 'pnpm install --no-lockfile',
             async callback(command, args, opts) {
               runCount++;
               expect(opts).to.have.property('cwd', tmpdir);