Merge branch 'main' into fix/auth/update-mock-client

redwoodjs · Jul 12, 2022 · b627ac7 · b627ac7
2 parents 75b9734 + 1ae8218
commit b627ac7
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -43,7 +43,7 @@
     "core-js": "3.23.4",
     "cross-env": "7.0.3",
     "decamelize": "5.0.0",
-    "dotenv-defaults": "5.0.0",
+    "dotenv-defaults": "5.0.2",
     "envinfo": "7.8.1",
     "execa": "5.1.1",
     "fast-glob": "3.2.11",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -62,7 +62,7 @@
     "core-js": "3.23.4",
     "css-loader": "6.7.1",
     "css-minimizer-webpack-plugin": "4.0.0",
-    "dotenv-webpack": "7.1.0",
+    "dotenv-webpack": "7.1.1",
     "esbuild": "0.14.49",
     "esbuild-loader": "2.19.0",
     "fast-glob": "3.2.11",

diff --git a/packages/structure/package.json b/packages/structure/package.json
@@ -37,7 +37,7 @@
     "camelcase": "6.3.0",
     "core-js": "3.23.4",
     "deepmerge": "4.2.2",
-    "dotenv-defaults": "5.0.0",
+    "dotenv-defaults": "5.0.2",
     "enquirer": "2.3.6",
     "findup-sync": "5.0.0",
     "graphql": "16.5.0",

diff --git a/packages/telemetry/src/telemetry.ts b/packages/telemetry/src/telemetry.ts
@@ -1,4 +1,5 @@
 import { spawn } from 'child_process'
+import os from 'node:os'
 import path from 'path'
 
 import { getPaths } from '@redwoodjs/internal'
@@ -43,8 +44,14 @@ export const timedTelemetry = async (
   return result
 }
 
+// Returns 'Windows_NT' on Windows.
+// See https://nodejs.org/docs/latest-v12.x/api/os.html#os_os_type.
+const isWindows = os.type() === 'Windows_NT'
+
 export const errorTelemetry = async (argv: Array<string>, error: any) => {
-  if (process.env.REDWOOD_DISABLE_TELEMETRY) {
+  // FIXME: on Windows, cmd opens and closes a few times.
+  // See https://github.com/redwoodjs/redwood/issues/5728.
+  if (isWindows || process.env.REDWOOD_DISABLE_TELEMETRY) {
     return
   }
 
@@ -53,7 +60,9 @@ export const errorTelemetry = async (argv: Array<string>, error: any) => {
 
 // used as yargs middleware when any command is invoked
 export const telemetryMiddleware = async () => {
-  if (process.env.REDWOOD_DISABLE_TELEMETRY) {
+  // FIXME: on Windows, cmd opens and closes a few times.
+  // See https://github.com/redwoodjs/redwood/issues/5728.
+  if (isWindows || process.env.REDWOOD_DISABLE_TELEMETRY) {
     return
   }
 

diff --git a/yarn.lock b/yarn.lock
@@ -6017,7 +6017,7 @@ __metadata:
     core-js: 3.23.4
     cross-env: 7.0.3
     decamelize: 5.0.0
-    dotenv-defaults: 5.0.0
+    dotenv-defaults: 5.0.2
     envinfo: 7.8.1
     execa: 5.1.1
     fast-glob: 3.2.11
@@ -6115,7 +6115,7 @@ __metadata:
     core-js: 3.23.4
     css-loader: 6.7.1
     css-minimizer-webpack-plugin: 4.0.0
-    dotenv-webpack: 7.1.0
+    dotenv-webpack: 7.1.1
     esbuild: 0.14.49
     esbuild-loader: 2.19.0
     fast-glob: 3.2.11
@@ -6385,7 +6385,7 @@ __metadata:
     camelcase: 6.3.0
     core-js: 3.23.4
     deepmerge: 4.2.2
-    dotenv-defaults: 5.0.0
+    dotenv-defaults: 5.0.2
     enquirer: 2.3.6
     findup-sync: 5.0.0
     graphql: 16.5.0
@@ -14495,12 +14495,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dotenv-defaults@npm:5.0.0":
-  version: 5.0.0
-  resolution: "dotenv-defaults@npm:5.0.0"
+"dotenv-defaults@npm:5.0.2":
+  version: 5.0.2
+  resolution: "dotenv-defaults@npm:5.0.2"
   dependencies:
     dotenv: ^14.0.0
-  checksum: 4029be6d1623753b3209040d96a49faf5b750587b658c151545a318e763489e2d3cfade4b5f6c5240f5ea01facae50af01cb5fe721ed470b5e99afe5fc934652
+  checksum: 89fe77f8d97a183c701307dde7d328a973271b8ce04af3a48928250cd707a9f324b04a672a2ceb770db117a7724995c48e93edc438b3c9ce1207a67adee77098
   languageName: node
   linkType: hard
 
@@ -14520,14 +14520,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dotenv-webpack@npm:7.1.0":
-  version: 7.1.0
-  resolution: "dotenv-webpack@npm:7.1.0"
+"dotenv-webpack@npm:7.1.1":
+  version: 7.1.1
+  resolution: "dotenv-webpack@npm:7.1.1"
   dependencies:
     dotenv-defaults: ^2.0.2
   peerDependencies:
     webpack: ^4 || ^5
-  checksum: 780bb44aaa400ccad12c47afdab5e2e4c1cba26c92d5092bacbf5233d2d81a578489b5533af9f2dc12dd311b027649ec9ba78317d445650111bdadcd66bd0d23
+  checksum: 49ffff039369c3192acfdf4a5c2d2fce5cef908e7ba56b5eb0dbc2e634eb3541ddba6242df2ed57ca42ab83a71bffd159e0352c8b26f017a8c44d41863995439
   languageName: node
   linkType: hard