Use Chosen Package Manager (Catalog) (#1044)

* fix: use chosen package manager

* chore: use catalog deps

* changeset

* fix: default to npm

* fix: types comment

* chore: add search-insights to catalog

* fix: audit dep vulnerabilities

* chore: we'll hold off on using the catalog and workspace deps for now.

* fix: deps

* fix: types

---------

Co-authored-by: Kawika Bader <ekbader@gmail.com>

Author: kbader-godaddy

.changeset/wise-queens-care.md

@@ -0,0 +1,51 @@
+---
+"@gasket/plugin-dynamic-plugins": patch
+"@gasket/plugin-service-worker": patch
+"@gasket/plugin-docs-graphs": patch
+"@gasket/plugin-elastic-apm": patch
+"@gasket/plugin-https-proxy": patch
+"@gasket/plugin-docusaurus": patch
+"@gasket/plugin-middleware": patch
+"@gasket/plugin-typescript": patch
+"@gasket/plugin-happyfeet": patch
+"@gasket/typescript-tests": patch
+"@gasket/plugin-manifest": patch
+"@gasket/plugin-metadata": patch
+"@gasket/plugin-analyze": patch
+"@gasket/plugin-command": patch
+"@gasket/plugin-cypress": patch
+"@gasket/plugin-express": patch
+"@gasket/plugin-fastify": patch
+"@gasket/plugin-swagger": patch
+"@gasket/plugin-webpack": patch
+"@gasket/plugin-winston": patch
+"@gasket/plugin-workbox": patch
+"@gasket/plugin-logger": patch
+"@gasket/plugin-morgan": patch
+"@gasket/plugin-nextjs": patch
+"@gasket/preset-nextjs": patch
+"@gasket/plugin-https": patch
+"@gasket/plugin-mocha": patch
+"@gasket/plugin-redux": patch
+"@gasket/plugin-data": patch
+"@gasket/plugin-docs": patch
+"@gasket/plugin-intl": patch
+"@gasket/plugin-jest": patch
+"@gasket/plugin-lint": patch
+"generate-docs-index": patch
+"create-gasket-app": patch
+"@gasket/plugin-git": patch
+"@gasket/preset-api": patch
+"@gasket/react-intl": patch
+"@gasket/request": patch
+"@gasket/assets": patch
+"@gasket/nextjs": patch
+"@gasket/fetch": patch
+"@gasket/redux": patch
+"@gasket/utils": patch
+"@gasket/core": patch
+"@gasket/data": patch
+"@gasket/intl": patch
+---
+
+Updates to use user-selected package manager. Update all packages to use catalog dep versions.

.npmrc

@@ -1,6 +1,5 @@
 registry=https://registry.npmjs.org/
 package-manager=pnpm@latest
-link-workspace-packages=true
 strict-peer-dependencies=true
-strict-dependencies=true
-auto-install-peers=true
+link-workspace-packages=true
+prefer-workspace-packages=true

nx.json

@@ -64,7 +64,6 @@
     "glob": "^8.1.0",
     "js-yaml": "^4.1.0",
     "jsdom": "^20.0.3",
-    "nx": "^20.4.6",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "rimraf": "^3.0.2",

package.json

@@ -37,7 +37,8 @@ async function choosePackageManager(context, prompt) {
             { name: 'npm' },
             { name: 'pnpm' },
             { name: 'yarn' }
-          ]
+          ],
+          default: 'npm'
         }
       ])
     ).packageManager;

packages/create-gasket-app/lib/scaffold/actions/global-prompts.js

@@ -6,20 +6,34 @@ import { runShellCommand } from '@gasket/utils';
  * @type {import('../../internal').postCreateHooks}
  */
 async function postCreateHooks({ gasket, context }) {
-  const { dest } = context;
+  const { dest, packageManager } = context;
 
   /**
-   * Run an npm script in the context of the created application
-   * @param  {string} script name of script
-   * @returns {Promise} A promise represents if npm succeeds or fails.
+   * Determines the correct command for running scripts based on the package manager.
+   * @param {string} script - The name of the script to run.
+   * @returns {Promise} A promise that resolves if the script runs successfully.
    */
   async function runScript(script) {
-    return await runShellCommand('pnpm', ['run', script], { cwd: dest });
+    let cmd;
+
+    switch (packageManager) {
+      case 'yarn':
+        cmd = 'yarn';
+        break;
+      case 'pnpm':
+        cmd = 'pnpm';
+        break;
+      case 'npm':
+      default:
+        cmd = 'npm';
+        break;
+    }
+
+    return await runShellCommand(cmd, ['run', script], { cwd: dest });
   }
 
   /**
-   * An object with one value for now, so adding more utilities
-   * in future is easy.
+   * An object with one value for now, so adding more utilities in future is easy.
    */
   const utils = { runScript };
   await gasket.exec('postCreate', context, utils);

packages/create-gasket-app/lib/scaffold/actions/post-create-hooks.js

@@ -59,6 +59,7 @@
   },
   "devDependencies": {
     "@gasket/request": "^7.3.0",
+    "@jest/globals": "^29.7.0",
     "@types/inquirer": "^9.0.7",
     "@types/jest": "^29.5.14",
     "@types/node": "^20.17.19",

packages/create-gasket-app/package.json

@@ -56,7 +56,7 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@swc/cli": "^0.3.14",
+    "@swc/cli": "^0.6.0",
     "@swc/core": "^1.10.18",
     "@types/jest": "^29.5.14",
     "@types/node": "^20.17.19",

packages/gasket-core/package.json

@@ -53,7 +53,7 @@
   "devDependencies": {
     "@gasket/plugin-data": "^7.3.0",
     "@jest/globals": "^29.7.0",
-    "@swc/cli": "^0.3.14",
+    "@swc/cli": "^0.6.0",
     "@swc/core": "^1.10.18",
     "@types/jest": "^29.5.14",
     "@types/node": "^20.17.19",

packages/gasket-data/package.json

@@ -51,7 +51,7 @@
     "jest": "^29.7.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "start-server-and-test": "^1.15.4",
+    "start-server-and-test": "^2.0.10",
     "typescript": "^5.7.3"
   },
   "eslintConfig": {

packages/gasket-plugin-cypress/package.json

@@ -54,7 +54,7 @@
     "eslint-plugin-jest": "^28.11.0",
     "eslint-plugin-unicorn": "^55.0.0",
     "typescript": "^5.7.3",
-    "vitest": "^2.1.9"
+    "vitest": "^3.0.7"
   },
   "eslintConfig": {
     "extends": [

packages/gasket-plugin-https-proxy/package.json

@@ -68,12 +68,12 @@ function makeGatherDevDeps() {
 /**
  * Creates a function to generate the correct package script execution command.
  *
- * This function returns a script command formatted for either npm or yarn, depending
+ * This function returns a script command formatted for npm, yarn, or pnpm, depending
  * on the package manager used in the given context.
  * @type {import('./internal').makeRunScriptStr}
  */
 function makeRunScriptStr(context) {
-  var runCmd = context.packageManager === 'npm' ? 'npm run' : context.packageManager;
+  let runCmd = `${context.packageManager} run`;
 
   /**
    * Formats the script command for execution.
@@ -85,7 +85,7 @@ function makeRunScriptStr(context) {
       throw new TypeError('Script name must be a non-empty string.');
     }
 
-    return runCmd === 'yarn' ? (runCmd + ' ' + script).replace(' -- ', ' ') : runCmd + ' ' + script;
+    return runCmd.includes('npm') ? `${runCmd} ${script}` : (`${runCmd} ${script}`).replace(' -- ', ' ');
   }
 
   return runScriptStr;

packages/gasket-plugin-lint/lib/utils.js

@@ -70,12 +70,12 @@ describe('utils', () => {
 
     it('[yarn] returns command', () => {
       const results = forYarn('test-script');
-      expect(results).toEqual('yarn test-script');
+      expect(results).toEqual('yarn run test-script');
     });
 
     it('[yarn] returns command with flags (removes "--")', () => {
       const results = forYarn('test-script -- --extra');
-      expect(results).toEqual('yarn test-script --extra');
+      expect(results).toEqual('yarn run test-script --extra');
     });
 
     it('throws TypeError for an invalid script name', () => {

packages/gasket-plugin-lint/test/utils.test.js

@@ -53,7 +53,7 @@
     "eslint-plugin-jest": "^28.11.0",
     "eslint-plugin-unicorn": "^55.0.0",
     "typescript": "^5.7.3",
-    "vitest": "^2.1.9"
+    "vitest": "^3.0.7"
   },
   "eslintConfig": {
     "extends": [

packages/gasket-plugin-metadata/package.json

@@ -92,12 +92,6 @@ interface ServiceWorkerLocals {
   };
 }
 
-declare module 'express-serve-static-core' {
-  interface Response {
-    locals?: ServiceWorkerLocals;
-  }
-}
-
 export function configureEndpoint(gasket: Gasket):
   RouteHandlerMethod<Http2SecureServer, Http2ServerRequest, Http2ServerResponse> |
   Application<Record<string, any>>;

packages/gasket-plugin-service-worker/lib/index.d.ts

@@ -66,6 +66,7 @@
     "eslint-plugin-unicorn": "^55.0.0",
     "fastify": "^4.29.0",
     "jest": "^29.7.0",
+    "openapi-types": "^12.1.3",
     "typescript": "^5.7.3"
   },
   "eslintConfig": {

packages/gasket-plugin-swagger/package.json

@@ -58,7 +58,7 @@
   "devDependencies": {
     "@gasket/core": "^7.3.0",
     "@jest/globals": "^29.7.0",
-    "@swc/cli": "^0.3.14",
+    "@swc/cli": "^0.6.0",
     "@swc/core": "^1.10.18",
     "@types/jest": "^29.5.14",
     "@types/node": "^20.17.19",