Merge branch 'main' into ds-add-missing-dep-to-internal

redwoodjs · May 19, 2022 · 1bd0b73 · 1bd0b73
2 parents da6420d + c04684b
commit 1bd0b73
Show file tree

Hide file tree

Showing 3 changed files with 203 additions and 211 deletions.
diff --git a/packages/cli/src/commands/setup/deploy/helpers/index.js b/packages/cli/src/commands/setup/deploy/helpers/index.js
@@ -1,4 +1,4 @@
-import { spawnSync } from 'child_process'
+import { execSync } from 'child_process'
 import fs from 'fs'
 import path from 'path'
 
@@ -114,9 +114,9 @@ export const addPackagesTask = ({
       ].filter(Boolean),
     ]
   } else {
-    const { stdout } = spawnSync('yarn', ['--version'])
+    const stdout = execSync('yarn --version')
 
-    const yarnVersion = stdout.toString()
+    const yarnVersion = stdout.toString().trim()
 
     installCommand = [
       'yarn',

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -61,7 +61,7 @@
     "copy-webpack-plugin": "11.0.0",
     "core-js": "3.22.5",
     "css-loader": "6.7.1",
-    "css-minimizer-webpack-plugin": "3.4.1",
+    "css-minimizer-webpack-plugin": "4.0.0",
     "dotenv-webpack": "7.1.0",
     "esbuild": "0.14.39",
     "esbuild-loader": "2.19.0",