Skip to content

Commit fbf2b0b

Browse files
fix: migrating from <10 to current with typescript (#24675)
* fix: migrating from <10 to current with typescript * handle other platforms * Update config.yml Co-authored-by: Mark Noonan <[email protected]>
1 parent 741019d commit fbf2b0b

File tree

5 files changed

+28
-20
lines changed

5 files changed

+28
-20
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mainBuildFilters: &mainBuildFilters
2727
branches:
2828
only:
2929
- develop
30-
- 'ryanm/fix/improve-binary-cleanup'
30+
- 'ryanm/fix/migrating-to-11-from-9-typescript'
3131

3232
# usually we don't build Mac app - it takes a long time
3333
# but sometimes we want to really confirm we are doing the right thing
@@ -36,7 +36,7 @@ macWorkflowFilters: &darwin-workflow-filters
3636
when:
3737
or:
3838
- equal: [ develop, << pipeline.git.branch >> ]
39-
- equal: [ 'ryanm/fix/improve-binary-cleanup', << pipeline.git.branch >> ]
39+
- equal: [ 'ryanm/fix/migrating-to-11-from-9-typescript', << pipeline.git.branch >> ]
4040
- matches:
4141
pattern: "-release$"
4242
value: << pipeline.git.branch >>
@@ -45,7 +45,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
4545
when:
4646
or:
4747
- equal: [ develop, << pipeline.git.branch >> ]
48-
- equal: [ 'ryanm/fix/improve-binary-cleanup', << pipeline.git.branch >> ]
48+
- equal: [ 'ryanm/fix/migrating-to-11-from-9-typescript', << pipeline.git.branch >> ]
4949
- matches:
5050
pattern: "-release$"
5151
value: << pipeline.git.branch >>
@@ -63,7 +63,7 @@ windowsWorkflowFilters: &windows-workflow-filters
6363
when:
6464
or:
6565
- equal: [ develop, << pipeline.git.branch >> ]
66-
- equal: [ 'ryanm/fix/improve-binary-cleanup', << pipeline.git.branch >> ]
66+
- equal: [ 'ryanm/fix/migrating-to-11-from-9-typescript', << pipeline.git.branch >> ]
6767
- matches:
6868
pattern: "-release$"
6969
value: << pipeline.git.branch >>
@@ -130,7 +130,7 @@ commands:
130130
- run:
131131
name: Check current branch to persist artifacts
132132
command: |
133-
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "ryanm/fix/improve-binary-cleanup" ]]; then
133+
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "ryanm/fix/migrating-to-11-from-9-typescript" ]]; then
134134
echo "Not uploading artifacts or posting install comment for this branch."
135135
circleci-agent step halt
136136
fi

tooling/v8-snapshot/cache/prod-darwin/snapshot-meta.cache.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@
3333
"./node_modules/mocha/node_modules/debug/src/node.js",
3434
"./node_modules/morgan/node_modules/debug/src/node.js",
3535
"./node_modules/prettier/index.js",
36+
"./node_modules/prettier/parser-babel.js",
37+
"./node_modules/prettier/parser-espree.js",
38+
"./node_modules/prettier/parser-flow.js",
39+
"./node_modules/prettier/parser-meriyah.js",
40+
"./node_modules/prettier/parser-typescript.js",
3641
"./node_modules/prettier/third-party.js",
3742
"./node_modules/send/node_modules/debug/src/node.js",
3843
"./node_modules/stream-parser/node_modules/debug/src/node.js",
@@ -483,12 +488,7 @@
483488
"./node_modules/pngjs/lib/parser-sync.js",
484489
"./node_modules/pngjs/lib/png.js",
485490
"./node_modules/pngjs/lib/sync-inflate.js",
486-
"./node_modules/prettier/parser-babel.js",
487-
"./node_modules/prettier/parser-espree.js",
488-
"./node_modules/prettier/parser-flow.js",
489491
"./node_modules/prettier/parser-glimmer.js",
490-
"./node_modules/prettier/parser-meriyah.js",
491-
"./node_modules/prettier/parser-typescript.js",
492492
"./node_modules/process-nextick-args/index.js",
493493
"./node_modules/pseudomap/map.js",
494494
"./node_modules/pumpify/index.js",
@@ -3644,6 +3644,7 @@
36443644
"./packages/net-stubbing/node_modules/mime-types/index.js",
36453645
"./packages/network/lib/allow-destroy.ts",
36463646
"./packages/network/lib/blocked.ts",
3647+
"./packages/network/lib/ca.ts",
36473648
"./packages/network/lib/concat-stream.ts",
36483649
"./packages/network/lib/http-utils.ts",
36493650
"./packages/network/lib/index.ts",

tooling/v8-snapshot/cache/prod-linux/snapshot-meta.cache.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@
3333
"./node_modules/mocha/node_modules/debug/src/node.js",
3434
"./node_modules/morgan/node_modules/debug/src/node.js",
3535
"./node_modules/prettier/index.js",
36+
"./node_modules/prettier/parser-babel.js",
37+
"./node_modules/prettier/parser-espree.js",
38+
"./node_modules/prettier/parser-flow.js",
39+
"./node_modules/prettier/parser-meriyah.js",
40+
"./node_modules/prettier/parser-typescript.js",
3641
"./node_modules/prettier/third-party.js",
3742
"./node_modules/send/node_modules/debug/src/node.js",
3843
"./node_modules/stream-parser/node_modules/debug/src/node.js",
@@ -482,12 +487,7 @@
482487
"./node_modules/pngjs/lib/parser-sync.js",
483488
"./node_modules/pngjs/lib/png.js",
484489
"./node_modules/pngjs/lib/sync-inflate.js",
485-
"./node_modules/prettier/parser-babel.js",
486-
"./node_modules/prettier/parser-espree.js",
487-
"./node_modules/prettier/parser-flow.js",
488490
"./node_modules/prettier/parser-glimmer.js",
489-
"./node_modules/prettier/parser-meriyah.js",
490-
"./node_modules/prettier/parser-typescript.js",
491491
"./node_modules/process-nextick-args/index.js",
492492
"./node_modules/pseudomap/map.js",
493493
"./node_modules/pumpify/index.js",

tooling/v8-snapshot/cache/prod-win32/snapshot-meta.cache.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@
3333
"./node_modules/mocha/node_modules/debug/src/node.js",
3434
"./node_modules/morgan/node_modules/debug/src/node.js",
3535
"./node_modules/prettier/index.js",
36+
"./node_modules/prettier/parser-babel.js",
37+
"./node_modules/prettier/parser-espree.js",
38+
"./node_modules/prettier/parser-flow.js",
39+
"./node_modules/prettier/parser-meriyah.js",
40+
"./node_modules/prettier/parser-typescript.js",
3641
"./node_modules/prettier/third-party.js",
3742
"./node_modules/send/node_modules/debug/src/node.js",
3843
"./node_modules/stream-parser/node_modules/debug/src/node.js",
@@ -481,12 +486,7 @@
481486
"./node_modules/pngjs/lib/parser-sync.js",
482487
"./node_modules/pngjs/lib/png.js",
483488
"./node_modules/pngjs/lib/sync-inflate.js",
484-
"./node_modules/prettier/parser-babel.js",
485-
"./node_modules/prettier/parser-espree.js",
486-
"./node_modules/prettier/parser-flow.js",
487489
"./node_modules/prettier/parser-glimmer.js",
488-
"./node_modules/prettier/parser-meriyah.js",
489-
"./node_modules/prettier/parser-typescript.js",
490490
"./node_modules/process-nextick-args/index.js",
491491
"./node_modules/pseudomap/map.js",
492492
"./node_modules/pumpify/index.js",

tooling/v8-snapshot/src/setup/force-no-rewrite.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,11 @@ export default [
5858
'packages/server/lib/open_project.ts',
5959
'packages/server/lib/project-base.ts',
6060
'packages/server/lib/socket-ct.ts',
61+
'node_modules/prettier/index.js',
62+
'node_modules/prettier/parser-babel.js',
63+
'node_modules/prettier/parser-espree.js',
64+
'node_modules/prettier/parser-flow.js',
65+
'node_modules/prettier/parser-meriyah.js',
66+
'node_modules/prettier/parser-typescript.js',
67+
'node_modules/prettier/third-party.js',
6168
]

0 commit comments

Comments
 (0)