npq 3.10.0 → 3.10.1

package/.github/workflows/automerge.yml

@@ -0,0 +1,39 @@
+name: automerge
+on:
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - id: automerge
+        name: automerge
+        uses: "pascalgn/automerge-action@v0.16.4"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          # we only merge PRs with labels of "dependencies" 
+          MERGE_LABELS: "automerge"
+          MERGE_REMOVE_LABELS: "automerge"
+          MERGE_METHOD: "squash"
+          MERGE_COMMIT_MESSAGE: "automatic"
+          MERGE_FORKS: "false"
+          MERGE_REQUIRED_APPROVALS: "0"
+          UPDATE_METHOD: "rebase"

package/__tests__/env-var-integration.test.js

@@ -9,7 +9,7 @@ const childProcess = require('child_process')
 
 jest.mock('child_process', () => {
   return {
-    spawn: jest.fn((cmd, args, options) => {
+    spawn: jest.fn((cmd, options) => {
       return { pid: 12345 }
     })
   }
@@ -38,7 +38,7 @@ describe('NPQ_PKG_MGR Environment Variable Integration', () => {
     // Test that the package manager can spawn pnpm (which would be passed from CLI parsing)
     await packageManager.process('pnpm')
 
-    expect(childProcess.spawn).toHaveBeenCalledWith('pnpm', ['install', 'fastify'], {
+    expect(childProcess.spawn).toHaveBeenCalledWith('pnpm install fastify', {
       stdio: 'inherit',
       shell: true
     })
@@ -49,7 +49,7 @@ describe('NPQ_PKG_MGR Environment Variable Integration', () => {
 
     await packageManager.process('yarn')
 
-    expect(childProcess.spawn).toHaveBeenCalledWith('yarn', ['install', 'express', 'lodash'], {
+    expect(childProcess.spawn).toHaveBeenCalledWith('yarn install express lodash', {
       stdio: 'inherit',
       shell: true
     })
@@ -63,7 +63,7 @@ describe('NPQ_PKG_MGR Environment Variable Integration', () => {
 
       await packageManager.process(pm)
 
-      expect(childProcess.spawn).toHaveBeenCalledWith(pm, ['install', 'test-package'], {
+      expect(childProcess.spawn).toHaveBeenCalledWith(`${pm} install test-package`, {
         stdio: 'inherit',
         shell: true
       })

package/__tests__/packageManager.test.js

@@ -53,9 +53,7 @@ test('package manager spawns successfully when provided array of packages to han
   await packageManager.process('npm')
   expect(childProcess.spawn).toHaveBeenCalled()
   expect(childProcess.spawn.mock.calls.length).toBe(1)
-  expect(childProcess.spawn.mock.calls[0][0]).toBe('npm')
-
-  expect(childProcess.spawn.mock.calls[0][1]).toEqual(['install', 'semver', 'express'])
+  expect(childProcess.spawn.mock.calls[0][0]).toEqual('npm install semver express')
   childProcess.spawn.mockReset()
 })
 
@@ -72,9 +70,7 @@ test("package manager spawns successfully and ignore npq's own internal commands
   await packageManager.process('npm')
   expect(childProcess.spawn).toHaveBeenCalled()
   expect(childProcess.spawn.mock.calls.length).toBe(1)
-  expect(childProcess.spawn.mock.calls[0][0]).toBe('npm')
-
-  expect(childProcess.spawn.mock.calls[0][1]).toEqual(['install', 'semver', 'express'])
+  expect(childProcess.spawn.mock.calls[0][0]).toEqual('npm install semver express')
   childProcess.spawn.mockReset()
 })
 
@@ -83,9 +79,7 @@ test('package manager spawns with yarn when provided as parameter', async () =>
   await packageManager.process('yarn')
   expect(childProcess.spawn).toHaveBeenCalled()
   expect(childProcess.spawn.mock.calls.length).toBe(1)
-  expect(childProcess.spawn.mock.calls[0][0]).toBe('yarn')
-
-  expect(childProcess.spawn.mock.calls[0][1]).toEqual(['install', 'express'])
+  expect(childProcess.spawn.mock.calls[0][0]).toEqual('yarn install express')
   childProcess.spawn.mockReset()
 })
 
@@ -94,8 +88,6 @@ test('package manager spawns with pnpm when provided as parameter', async () =>
   await packageManager.process('pnpm')
   expect(childProcess.spawn).toHaveBeenCalled()
   expect(childProcess.spawn.mock.calls.length).toBe(1)
-  expect(childProcess.spawn.mock.calls[0][0]).toBe('pnpm')
-
-  expect(childProcess.spawn.mock.calls[0][1]).toEqual(['install', 'lodash'])
+  expect(childProcess.spawn.mock.calls[0][0]).toEqual('pnpm install lodash')
   childProcess.spawn.mockReset()
 })

package/lib/packageManager.js

@@ -12,7 +12,6 @@ class packageManager {
 
   static spawnPackageManager(packageManagerOption) {
     let args = []
-
     args = args.concat(process.argv.slice(2)).filter((item) => {
       switch (item) {
         case '--packageManager':
@@ -24,7 +23,12 @@ class packageManager {
       }
     })
 
-    const child = childProcess.spawn(packageManagerOption, args, {
+    let cmd = `${packageManagerOption}`
+    if (args.length > 0) {
+      cmd += ` ${args.join(' ')}`
+    }
+
+    const child = childProcess.spawn(cmd, {
       stdio: 'inherit',
       shell: true
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npq",
-  "version": "3.10.0",
+  "version": "3.10.1",
   "description": "marshall your npm/npm package installs with high quality and class 🎖",
   "bin": {
     "npq": "./bin/npq.js",

package/.github/mergify.yml

@@ -1,17 +0,0 @@
-queue_rules:
-  - name: Snyk PRs Queue
-    conditions:
-      - "check-success ~= .*"
-      
-pull_request_rules:
-  - name: Automatic merge Snyk PRs on Status Checks passing
-    conditions:
-      - title~=^\[Snyk\]
-      - head~=^snyk-fix
-      - base=main
-    actions:
-      queue:
-        name: "Snyk PRs Queue"
-      label:
-        add:
-          - "auto-merge"