Merge pull request #111 from bertdeblock/use-pnpm-workspaceyaml-instead-of-npmrc

Use `pnpm-workspace.yaml` instead of `.npmrc`

Author: NullVoxPopuli

.npmrc

@@ -1,9 +1,9 @@
-# Docs: https://pnpm.io/npmrc
+# Docs: https://pnpm.io/settings
 # https://github.com/emberjs/rfcs/pull/907
 
 # we don't want addons to be bad citizens of the ecosystem
-auto-install-peers=false
+autoInstallPeers: false
 
 # we want true isolation,
 # if a dependency is not declared, we want an error
-resolve-peers-from-workspace-root=false
+resolvePeersFromWorkspaceRoot: false

files/.npmrc files/pnpm-workspace.yamlfiles/.npmrc renamed to files/pnpm-workspace.yaml

@@ -62,6 +62,12 @@ module.exports = {
       files = files.filter((file) => file.indexOf('.github') < 0);
     }
 
+    if (!isPnpm(options)) {
+      let ignoredFiles = ['pnpm-workspace.yaml'];
+
+      files = files.filter((filename) => !ignoredFiles.includes(filename));
+    }
+
     if (!options.typescript) {
       let ignoredFiles = ['tsconfig.json'];
 

index.js

@@ -1,3 +1,5 @@
+autoInstallPeers: false
+resolvePeersFromWorkspaceRoot: false
 packages:
   - '.'
   - 'tests'

pnpm-workspace.yaml

@@ -1,9 +1,9 @@
-# Docs: https://pnpm.io/npmrc
+# Docs: https://pnpm.io/settings
 # https://github.com/emberjs/rfcs/pull/907
 
 # we don't want addons to be bad citizens of the ecosystem
-auto-install-peers=false
+autoInstallPeers: false
 
 # we want true isolation,
 # if a dependency is not declared, we want an error
-resolve-peers-from-workspace-root=false
+resolvePeersFromWorkspaceRoot: false

tests/fixtures/pnpm-addon-only/.npmrc …ures/pnpm-addon-only/pnpm-workspace.yamltests/fixtures/pnpm-addon-only/.npmrc renamed to tests/fixtures/pnpm-addon-only/pnpm-workspace.yaml tests/fixtures/pnpm-addon-only/.npmrc renamed to tests/fixtures/pnpm-addon-only/pnpm-workspace.yaml

@@ -1,9 +1,9 @@
-# Docs: https://pnpm.io/npmrc
+# Docs: https://pnpm.io/settings
 # https://github.com/emberjs/rfcs/pull/907
 
 # we don't want addons to be bad citizens of the ecosystem
-auto-install-peers=false
+autoInstallPeers: false
 
 # we want true isolation,
 # if a dependency is not declared, we want an error
-resolve-peers-from-workspace-root=false
+resolvePeersFromWorkspaceRoot: false

tests/fixtures/pnpm/.npmrc tests/fixtures/pnpm/pnpm-workspace.yamltests/fixtures/pnpm/.npmrc renamed to tests/fixtures/pnpm/pnpm-workspace.yaml

@@ -20,12 +20,15 @@ describe.skip('--addon-only', () => {
   it('has all the files', async () => {
     let rootContents = await dirContents(helper.projectRoot);
 
-    await matchesFixture('.npmrc', { cwd: helper.projectRoot, scenario: 'pnpm-addon-only' });
+    await matchesFixture('pnpm-workspace.yaml', {
+      cwd: helper.projectRoot,
+      scenario: 'pnpm-addon-only',
+    });
 
     expect(rootContents).to.include('.editorconfig');
     expect(rootContents).to.include('eslint.config.mjs');
     expect(rootContents).to.include('.gitignore');
-    expect(rootContents).to.include('.npmrc');
+    expect(rootContents).to.include('pnpm-workspace.yaml');
     expect(rootContents).to.include('.prettierignore');
     expect(rootContents).to.include('.prettierrc.cjs');
     expect(rootContents).to.include('.template-lintrc.cjs');

tests/smoke-tests/--addon-only.test.ts

@@ -53,9 +53,11 @@ for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
       })`${localEmberCli} addon ${addonName} -b ${blueprintPath} --skip-npm --prefer-local true --${packageManager} --typescript`;
       // Have to use --force because NPM is *stricter* when you use tags in package.json
       // than pnpm (in that tags don't match any specified stable version)
-      await execa({
-        cwd: addonDir,
-      })`${packageManager} install ${packageManager === 'npm' ? '--force' : ''}`;
+      if (packageManager === 'npm') {
+        await execa({ cwd: addonDir })`npm install --force`;
+      } else if (packageManager === 'pnpm') {
+        await execa({ cwd: addonDir })`pnpm install`;
+      }
     });
 
     it('was generated correctly', async () => {

tests/smoke-tests/--typescript.test.ts

@@ -73,7 +73,7 @@ for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
             cwd: addonDir,
             scenario: 'pnpm',
           });
-          await matchesFixture('.npmrc', {
+          await matchesFixture('pnpm-workspace.yaml', {
             cwd: addonDir,
             scenario: 'pnpm',
           });

tests/smoke-tests/defaults.test.ts

@@ -63,7 +63,7 @@ describe.skip('custom locations', () => {
   it('ignores root files', async () => {
     expect(
       fixturify.readSync(cwd, {
-        ignore: ['addons', 'tests', 'node_modules', 'pnpm-lock.yaml', '.npmrc'],
+        ignore: ['addons', 'tests', 'node_modules', 'pnpm-lock.yaml', 'pnpm-workspace.yaml'],
       }),
       'root files have not been touched',
     ).toEqual(rootFiles);