Skip to content

Commit 8262f80

Browse files
authored
fix: patch-package is not applied in dist'ed build (#19239)
1 parent 11e99fc commit 8262f80

15 files changed

+66
-25
lines changed

circle.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ macWorkflowFilters: &mac-workflow-filters
3737
when:
3838
or:
3939
- equal: [ develop, << pipeline.git.branch >> ]
40+
- equal: [ tgriesser/fix/patch-resolutions, << pipeline.git.branch >> ]
4041
- equal: [ renovate/cypress-request-2.x, << pipeline.git.branch >> ]
4142
- matches:
4243
pattern: "-release$"
@@ -47,6 +48,7 @@ windowsWorkflowFilters: &windows-workflow-filters
4748
or:
4849
- equal: [ master, << pipeline.git.branch >> ]
4950
- equal: [ develop, << pipeline.git.branch >> ]
51+
- equal: [ tgriesser/fix/patch-resolutions, << pipeline.git.branch >> ]
5052
- matches:
5153
pattern: "-release$"
5254
value: << pipeline.git.branch >>
@@ -1586,7 +1588,7 @@ jobs:
15861588
- run:
15871589
name: Check current branch to persist artifacts
15881590
command: |
1589-
if [[ "$CIRCLE_BRANCH" != "develop" ]]; then
1591+
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "tgriesser/fix/patch-resolutions" ]]; then
15901592
echo "Not uploading artifacts or posting install comment for this branch."
15911593
circleci-agent step halt
15921594
fi

packages/server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
"trash": "5.2.0",
114114
"tree-kill": "1.2.2",
115115
"ts-node": "8.5.4",
116+
"tsconfig-paths": "3.10.1",
116117
"tslib": "2.3.0",
117118
"underscore.string": "3.3.5",
118119
"url-parse": "1.5.2",
@@ -184,7 +185,6 @@
184185
"supertest-session": "4.0.0",
185186
"through2": "2.0.5",
186187
"ts-loader": "7.0.4",
187-
"tsconfig-paths": "3.10.1",
188188
"webpack": "4.43.0",
189189
"ws": "5.2.3",
190190
"xvfb": "cypress-io/node-xvfb#22e3783c31d81ebe64d8c0df491ea00cdc74726a",

packages/socket/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
},
1515
"dependencies": {
1616
"circular-json": "0.5.9",
17+
"engine.io": "5.0.0",
18+
"engine.io-parser": "4.0.2",
1719
"socket.io": "4.0.1",
1820
"socket.io-client": "4.0.1"
1921
},
@@ -30,6 +32,8 @@
3032
],
3133
"workspaces": {
3234
"nohoist": [
35+
"engine.io",
36+
"engine.io-parser",
3337
"socket.io",
3438
"socket.io/socket.io-parser",
3539
"socket.io-client",
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)