Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: migrating from <10 to current with typescript #24675

Merged
merged 4 commits into from Nov 14, 2022
Merged

fix: migrating from <10 to current with typescript #24675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed54f62
fix: migrating from <10 to current with typescript
ryanthemanuel Nov 14, 2022
a8cd5da
handle other platforms
ryanthemanuel Nov 14, 2022
186a0b1
Merge branch 'develop' into ryanm/fix/migrating-to-11-from-9-typescript
marktnoonan Nov 14, 2022
74310d0
Update config.yml
ryanthemanuel Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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 >>
Expand All @@ -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 >>
Expand All @@ -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 >>
Expand Down Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions tooling/v8-snapshot/cache/prod-darwin/snapshot-meta.cache.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions tooling/v8-snapshot/cache/prod-linux/snapshot-meta.cache.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions tooling/v8-snapshot/cache/prod-win32/snapshot-meta.cache.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
7 changes: 7 additions & 0 deletions tooling/v8-snapshot/src/setup/force-no-rewrite.ts
View file
Open in desktop
Expand Up @@ -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',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how do we know this won't change under the hood with new versions of prettier or if we use new imports from prettier?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, we don't have a mechanism to verify this today. cypress in cypress testing does not use snapshots due to how the child cypress server is being launched. This is something I want to investigate a solution to ASAP, but for now I think it's worth getting this fix in.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be manually verified at release then for each release?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we would only need to verify it if we update the version of prettier that is being used: https://github.com/cypress-io/cypress/blob/develop/packages/data-context/package.json#L45

]