Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
1d6cde5
Removed Flow (and its tooling) from the source code (#2385)
May 23, 2021
73073f3
Merge branch 'main' into ts-migration
Andarist May 24, 2021
4912b82
Add TypeScript tooling and configs (#2360)
with-heart Jun 25, 2021
7f8db2d
Migrate `@emotion/memoize` to TypeScript (#2427)
sarayourfriend Aug 14, 2021
b1d16b0
Migrate `@emotion/weak-memoize` to TypeScript (#2429)
sarayourfriend Aug 14, 2021
3119b05
Fix `types` field in recently converted packages
Andarist Aug 14, 2021
fc4d27c
Migrate `@emotion/unitless` to TypeScript (#2430)
sarayourfriend Aug 14, 2021
a1e881b
Migrate `@emotion/is-prop-valid` to TypeScript (#2432)
sarayourfriend Aug 14, 2021
52aadc6
Migrate `@emotion/sheet` to TypeScript (#2431)
sarayourfriend Aug 14, 2021
16d8a8c
Migrate `@emotion/utils` to TypeScript (#2359)
rjdestigter Aug 15, 2021
ea2c397
Migrate `@emotion/hash` to TypeScript (#2454)
Andarist Aug 15, 2021
e3a4919
Use `import type` when importing `StyleSheet` from `@emotion/sheet` i…
Andarist Aug 15, 2021
d48d7f6
Merge branch 'main' of https://github.com/emotion-js/emotion into ts-…
srmagura Nov 14, 2021
ce3bccb
Fix TS error and test failure
srmagura Nov 14, 2021
30f982c
Merge branch 'main' of https://github.com/emotion-js/emotion into ts-…
srmagura Nov 14, 2021
e0cb8ab
Remove some Flow type annotations
srmagura Nov 14, 2021
fb0d461
Remove Flow type annotations from benchmark
srmagura Nov 14, 2021
908703b
Remove .orig files (accidentally committed)
srmagura Nov 14, 2021
7d56dbf
Merge pull request #2546 from srmagura/ts-migration
emmatown Nov 19, 2021
f3ef8cb
Delete .d.ts files that shouldn't exist
emmatown Nov 19, 2021
da3f244
Merge branch 'main' into ts-migration
emmatown Nov 20, 2021
85772c3
Migrate @emotion/css to TypeScript (#2558)
emmatown Nov 23, 2021
c4bff2e
Merge branch 'main' of https://github.com/emotion-js/emotion into ts-…
srmagura Feb 19, 2022
0646268
Merge branch 'main' of https://github.com/srmagura/emotion into ts-mi…
srmagura Mar 16, 2022
ea84c40
Migrate `@emotion/babel-plugin-jsx-pragmatic` to TypeScript (#2570)
G-Rath Mar 18, 2022
5e46164
Merge branch 'ts-migration' of https://github.com/emotion-js/emotion …
srmagura Mar 18, 2022
e959f38
Merge pull request #2655 from srmagura/ts-migration-merge
Andarist Mar 19, 2022
f99981b
Migrate `babel-tester` to TypeScript (#2688)
Andarist Apr 9, 2022
304f7e3
Migrate `@emotion/eslint-plugin` to TypeScript (#2568)
G-Rath Apr 11, 2022
3045a2f
Rename a duplicate `typescript` job to `dtslint`
Andarist Apr 18, 2022
4c56bcb
Run the main CI job on the `ts-migration` branch too
Andarist Apr 18, 2022
17fee4b
Fix some TS things (#2559)
emmatown Apr 19, 2022
9ca22c6
Migrate `@emotion/serialize` to TypeScript (#2543)
danilofuchs Apr 19, 2022
a22d43b
Merge branch 'main' of https://github.com/emotion-js/emotion into ts-…
srmagura May 21, 2022
8c4e2c3
Merge pull request #2758 from srmagura/ts-merge2
Andarist May 21, 2022
f01f9bc
Remove accidentally-committed .d.ts files (#2760)
srmagura May 21, 2022
8ed0042
Fix `d.ts` emit in `@emotion/eslint-plugin` (#2761)
srmagura May 22, 2022
8c6ad60
Merge branch 'main' into ts-merge-0710
srmagura Jul 10, 2022
95726a9
Merge pull request #2816 from srmagura/ts-merge-0710
srmagura Jul 10, 2022
945169b
Fixed `dtslint` tasks for `@emotion/cache` and `@emotion/server` (#2817)
srmagura Jul 26, 2022
8546dd0
Convert `@emotion/primitives-core` to TypeScript (#2818)
srmagura Jul 31, 2022
62a513b
Add a changeset for `@emotion/primitives-core` and the missing `types…
Andarist Aug 2, 2022
5fedb73
Merge branch 'main' of https://github.com/emotion-js/emotion into ts-…
srmagura Aug 6, 2022
5cd2199
Merge pull request #2846 from srmagura/ts-merge-0806
srmagura Aug 6, 2022
62e49ad
Move `site` outside of the main typecheck task (#2851)
srmagura Aug 16, 2022
993557d
Remove accidentally comitted `src/*.d.ts` files in already converted …
Andarist Aug 16, 2022
1effaf9
Merge remote-tracking branch 'origin/main' into ts-migration
Andarist May 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' of https://github.com/srmagura/emotion into ts-mi…
…gration-merge
  • Loading branch information
srmagura committed Mar 16, 2022
commit 064626865211f4da5ebdbeb2dc9dadd3b9635e87
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
"react18-test-renderer": "npm:[email protected]",
"svg-tag-names": "^1.1.1",
"through": "^2.3.8",
"typescript": "^4.2.4",
"typescript": "^4.5.5",
"unified": "^6.1.6",
"unist-util-visit": "^1.2.0",
"webpack-bundle-analyzer": "3.3.2",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29665,10 +29665,10 @@ typedarray@^0.0.6:
resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

typescript@^4.2.4, typescript@next:
version "4.2.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
typescript@^4.5.5:
version "4.5.5"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==

ua-parser-js@^0.7.18:
version "0.7.20"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.