fix: build @packages/errors in CI, defer import to prevent errors loc…

…ally
cypress-io · Feb 5, 2022 · 7e9468d · 7e9468d
1 parent 8935f18
commit 7e9468d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/packages/errors/package.json b/packages/errors/package.json
@@ -6,9 +6,8 @@
   "browser": "src/index.ts",
   "scripts": {
     "test": "yarn test-unit",
-    "build": "tsc || echo 'type errors'",
+    "build": "../../scripts/run-if-ci.sh tsc || echo 'type errors'",
     "build-prod": "tsc",
-    "postinstall": "rm -rf test/**/*.js",
     "check-ts": "tsc --noEmit",
     "clean-deps": "rm -rf node_modules",
     "clean": "rm -f ./src/*.js ./src/**/*.js ./src/**/**/*.js ./test/**/*.js || echo 'cleaned'",

diff --git a/packages/server/lib/plugins/child/browser_launch.js b/packages/server/lib/plugins/child/browser_launch.js
@@ -1,5 +1,4 @@
 const util = require('../util')
-const { getError } = require('@packages/errors')
 
 const ARRAY_METHODS = ['concat', 'push', 'unshift', 'slice', 'pop', 'shift', 'slice', 'splice', 'filter', 'map', 'forEach', 'reduce', 'reverse', 'splice', 'includes']
 
@@ -21,7 +20,7 @@ module.exports = {
 
         hasEmittedWarning = true
 
-        const warning = getError(
+        const warning = require('@packages/errors').getError(
           'DEPRECATED_BEFORE_BROWSER_LAUNCH_ARGS',
         )
 

diff --git a/packages/server/lib/plugins/child/task.js b/packages/server/lib/plugins/child/task.js
@@ -1,6 +1,5 @@
 const _ = require('lodash')
 const util = require('../util')
-const errors = require('@packages/errors')
 
 const getBody = (ipc, events, ids, [event]) => {
   const taskEvent = _.find(events, { event: 'task' }).handler
@@ -24,7 +23,7 @@ const merge = (prevEvents, events) => {
   const duplicates = _.intersection(_.keys(prevEvents), _.keys(events))
 
   if (duplicates.length) {
-    errors.warning('DUPLICATE_TASK_KEY', duplicates.join(', '))
+    require('@packages/errors').warning('DUPLICATE_TASK_KEY', duplicates.join(', '))
   }
 
   return _.extend(prevEvents, events)

diff --git a/packages/server/test/integration/cypress_spec.js b/packages/server/test/integration/cypress_spec.js
@@ -721,7 +721,7 @@ describe('lib/cypress', () => {
 
         const found3 = _.find(argsSet, (args) => {
           return _.find(args, (arg) => {
-            return arg.message && arg.message.includes(
+            return arg.message && stripAnsi(arg.message).includes(
               'Available browsers found on your system are:\n- chrome\n- chromium\n- chrome:canary\n- electron',
             )
           })

diff --git a/scripts/run-if-ci.sh b/scripts/run-if-ci.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# If we're in CI, exit early
+if [[ !$CI ]]; then exit 0; fi
+# otherwise, run the supplied command
+"${@:1}"
diff --git a/system-tests/__snapshots__/plugin_run_events_spec.ts.js b/system-tests/__snapshots__/plugin_run_events_spec.ts.js
@@ -166,6 +166,4 @@ The error we received was:
 
 Error: error thrown in before:spec
       [stack trace lines]
-
-
 `