update changelog

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Ember Data Changelog
 
+## 4.8.2 (2022-11-04)
+
+#### :bug: Bug Fix
+* fix: (Actually fix) publish should use pnpm pack to remove `workspace:` prefix
+
+## 4.8.1 (2022-11-04)
+
+#### :bug: Bug Fix
+* fix: publish should use pnpm pack to remove `workspace:` prefix
 
 ## 4.8.0 (2022-11-04)
 

scripts/publish.js

@@ -43,6 +43,21 @@ function cleanProject() {
   execWithLog(`cd ${projectRoot} && pnpm install`);
 }
 
+// function scrubWorkspacesForHash(hash) {
+//   Object.keys(hash).forEach(function (key) {
+//     let val = hash[key];
+//     if (val.startsWith('workspace:')) {
+//       val = val.replace('workspace:', '');
+//     }
+//   });
+// }
+// function scrubWorkspaces(pkg, path) {
+//   scrubWorkspacesForHash(pkg.dependencies);
+//   scrubWorkspacesForHash(pkg.peerDependencies);
+//   scrubWorkspacesForHash(pkg.devDependencies);
+//   fs.writeFileSync(path, JSON.stringify(pkg, null, 2), { encoding: 'utf8' });
+// }
+
 /**
  *
  * @param {*} command The command to execute
@@ -273,6 +288,11 @@ function packAllPackages() {
     const pkgPath = path.join(pkgDir, 'package.json');
     const pkgInfo = require(pkgPath);
     if (pkgInfo.private !== true) {
+      // pnpm pack / npm pack do not scrub `workspace:` prefixes when packing
+      // so we do this manually
+      // https://github.com/pnpm/pnpm/issues/5591
+      //scrubWorkspaces(pkgInfo);
+
       // will pack into the project root directory
       // due to an issue where npm does not run prepublishOnly for pack, we run it here
       // however this is also a timing bug, as typically it would be run *after* prepublish
@@ -285,7 +305,7 @@ function packAllPackages() {
           execWithLog(`cd ${pkgDir} && pnpm run prepack`);
         }
       }
-      execWithLog(`cd ${pkgDir} && npm pack --pack-destination=${projectRoot}`);
+      execWithLog(`cd ${pkgDir} && pnpm pack --pack-destination=${projectRoot}`);
     }
   });
 }