From fbf2b0b796236863ad14451f2c120e7e5f29d69b Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 14 Nov 2022 14:03:06 -0600 Subject: [PATCH] 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 --- .circleci/config.yml | 10 +++++----- .../cache/prod-darwin/snapshot-meta.cache.json | 11 ++++++----- .../cache/prod-linux/snapshot-meta.cache.json | 10 +++++----- .../cache/prod-win32/snapshot-meta.cache.json | 10 +++++----- tooling/v8-snapshot/src/setup/force-no-rewrite.ts | 7 +++++++ 5 files changed, 28 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 63129f9e1b73..727f15cd4177 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,7 +27,7 @@ mainBuildFilters: &mainBuildFilters branches: only: - develop - - 'ryanm/fix/improve-binary-cleanup' + - 'ryanm/fix/migrating-to-11-from-9-typescript' # usually we don't build Mac app - it takes a long time # but sometimes we want to really confirm we are doing the right thing @@ -36,7 +36,7 @@ macWorkflowFilters: &darwin-workflow-filters when: or: - equal: [ develop, << pipeline.git.branch >> ] - - equal: [ 'ryanm/fix/improve-binary-cleanup', << pipeline.git.branch >> ] + - equal: [ 'ryanm/fix/migrating-to-11-from-9-typescript', << pipeline.git.branch >> ] - matches: pattern: "-release$" value: << pipeline.git.branch >> @@ -45,7 +45,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters when: or: - equal: [ develop, << pipeline.git.branch >> ] - - equal: [ 'ryanm/fix/improve-binary-cleanup', << pipeline.git.branch >> ] + - equal: [ 'ryanm/fix/migrating-to-11-from-9-typescript', << pipeline.git.branch >> ] - matches: pattern: "-release$" value: << pipeline.git.branch >> @@ -63,7 +63,7 @@ windowsWorkflowFilters: &windows-workflow-filters when: or: - equal: [ develop, << pipeline.git.branch >> ] - - equal: [ 'ryanm/fix/improve-binary-cleanup', << pipeline.git.branch >> ] + - equal: [ 'ryanm/fix/migrating-to-11-from-9-typescript', << pipeline.git.branch >> ] - matches: pattern: "-release$" value: << pipeline.git.branch >> @@ -130,7 +130,7 @@ commands: - run: name: Check current branch to persist artifacts command: | - if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "ryanm/fix/improve-binary-cleanup" ]]; then + if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "ryanm/fix/migrating-to-11-from-9-typescript" ]]; then echo "Not uploading artifacts or posting install comment for this branch." circleci-agent step halt fi diff --git a/tooling/v8-snapshot/cache/prod-darwin/snapshot-meta.cache.json b/tooling/v8-snapshot/cache/prod-darwin/snapshot-meta.cache.json index 94474b178204..331e1d5c1dbf 100644 --- a/tooling/v8-snapshot/cache/prod-darwin/snapshot-meta.cache.json +++ b/tooling/v8-snapshot/cache/prod-darwin/snapshot-meta.cache.json @@ -33,6 +33,11 @@ "./node_modules/mocha/node_modules/debug/src/node.js", "./node_modules/morgan/node_modules/debug/src/node.js", "./node_modules/prettier/index.js", + "./node_modules/prettier/parser-babel.js", + "./node_modules/prettier/parser-espree.js", + "./node_modules/prettier/parser-flow.js", + "./node_modules/prettier/parser-meriyah.js", + "./node_modules/prettier/parser-typescript.js", "./node_modules/prettier/third-party.js", "./node_modules/send/node_modules/debug/src/node.js", "./node_modules/stream-parser/node_modules/debug/src/node.js", @@ -483,12 +488,7 @@ "./node_modules/pngjs/lib/parser-sync.js", "./node_modules/pngjs/lib/png.js", "./node_modules/pngjs/lib/sync-inflate.js", - "./node_modules/prettier/parser-babel.js", - "./node_modules/prettier/parser-espree.js", - "./node_modules/prettier/parser-flow.js", "./node_modules/prettier/parser-glimmer.js", - "./node_modules/prettier/parser-meriyah.js", - "./node_modules/prettier/parser-typescript.js", "./node_modules/process-nextick-args/index.js", "./node_modules/pseudomap/map.js", "./node_modules/pumpify/index.js", @@ -3644,6 +3644,7 @@ "./packages/net-stubbing/node_modules/mime-types/index.js", "./packages/network/lib/allow-destroy.ts", "./packages/network/lib/blocked.ts", + "./packages/network/lib/ca.ts", "./packages/network/lib/concat-stream.ts", "./packages/network/lib/http-utils.ts", "./packages/network/lib/index.ts", diff --git a/tooling/v8-snapshot/cache/prod-linux/snapshot-meta.cache.json b/tooling/v8-snapshot/cache/prod-linux/snapshot-meta.cache.json index e5959db684fd..32c2c7543fce 100644 --- a/tooling/v8-snapshot/cache/prod-linux/snapshot-meta.cache.json +++ b/tooling/v8-snapshot/cache/prod-linux/snapshot-meta.cache.json @@ -33,6 +33,11 @@ "./node_modules/mocha/node_modules/debug/src/node.js", "./node_modules/morgan/node_modules/debug/src/node.js", "./node_modules/prettier/index.js", + "./node_modules/prettier/parser-babel.js", + "./node_modules/prettier/parser-espree.js", + "./node_modules/prettier/parser-flow.js", + "./node_modules/prettier/parser-meriyah.js", + "./node_modules/prettier/parser-typescript.js", "./node_modules/prettier/third-party.js", "./node_modules/send/node_modules/debug/src/node.js", "./node_modules/stream-parser/node_modules/debug/src/node.js", @@ -482,12 +487,7 @@ "./node_modules/pngjs/lib/parser-sync.js", "./node_modules/pngjs/lib/png.js", "./node_modules/pngjs/lib/sync-inflate.js", - "./node_modules/prettier/parser-babel.js", - "./node_modules/prettier/parser-espree.js", - "./node_modules/prettier/parser-flow.js", "./node_modules/prettier/parser-glimmer.js", - "./node_modules/prettier/parser-meriyah.js", - "./node_modules/prettier/parser-typescript.js", "./node_modules/process-nextick-args/index.js", "./node_modules/pseudomap/map.js", "./node_modules/pumpify/index.js", diff --git a/tooling/v8-snapshot/cache/prod-win32/snapshot-meta.cache.json b/tooling/v8-snapshot/cache/prod-win32/snapshot-meta.cache.json index 86d740dacfe6..3d5cde0125f0 100644 --- a/tooling/v8-snapshot/cache/prod-win32/snapshot-meta.cache.json +++ b/tooling/v8-snapshot/cache/prod-win32/snapshot-meta.cache.json @@ -33,6 +33,11 @@ "./node_modules/mocha/node_modules/debug/src/node.js", "./node_modules/morgan/node_modules/debug/src/node.js", "./node_modules/prettier/index.js", + "./node_modules/prettier/parser-babel.js", + "./node_modules/prettier/parser-espree.js", + "./node_modules/prettier/parser-flow.js", + "./node_modules/prettier/parser-meriyah.js", + "./node_modules/prettier/parser-typescript.js", "./node_modules/prettier/third-party.js", "./node_modules/send/node_modules/debug/src/node.js", "./node_modules/stream-parser/node_modules/debug/src/node.js", @@ -481,12 +486,7 @@ "./node_modules/pngjs/lib/parser-sync.js", "./node_modules/pngjs/lib/png.js", "./node_modules/pngjs/lib/sync-inflate.js", - "./node_modules/prettier/parser-babel.js", - "./node_modules/prettier/parser-espree.js", - "./node_modules/prettier/parser-flow.js", "./node_modules/prettier/parser-glimmer.js", - "./node_modules/prettier/parser-meriyah.js", - "./node_modules/prettier/parser-typescript.js", "./node_modules/process-nextick-args/index.js", "./node_modules/pseudomap/map.js", "./node_modules/pumpify/index.js", diff --git a/tooling/v8-snapshot/src/setup/force-no-rewrite.ts b/tooling/v8-snapshot/src/setup/force-no-rewrite.ts index 077365a6d8de..a00ca0979a08 100644 --- a/tooling/v8-snapshot/src/setup/force-no-rewrite.ts +++ b/tooling/v8-snapshot/src/setup/force-no-rewrite.ts @@ -58,4 +58,11 @@ export default [ 'packages/server/lib/open_project.ts', 'packages/server/lib/project-base.ts', 'packages/server/lib/socket-ct.ts', + 'node_modules/prettier/index.js', + 'node_modules/prettier/parser-babel.js', + 'node_modules/prettier/parser-espree.js', + 'node_modules/prettier/parser-flow.js', + 'node_modules/prettier/parser-meriyah.js', + 'node_modules/prettier/parser-typescript.js', + 'node_modules/prettier/third-party.js', ]