Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into opt-in-labels
Browse files Browse the repository at this point in the history
  • Loading branch information
Andarist committed Jun 13, 2024
2 parents 5591561 + fc74bee commit 9c8c5f0
Show file tree
Hide file tree
Showing 506 changed files with 39,300 additions and 39,306 deletions.
5 changes: 5 additions & 0 deletions .changeset/clever-clocks-yell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/unitless': minor
---

Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
5 changes: 5 additions & 0 deletions .changeset/eighty-spies-beam.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/css': minor
---

Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
5 changes: 0 additions & 5 deletions .changeset/empty-terms-beam.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/healthy-elephants-serve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/serialize': minor
---

Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
5 changes: 5 additions & 0 deletions .changeset/hip-moons-play.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/memoize': minor
---

Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
5 changes: 5 additions & 0 deletions .changeset/hot-yaks-flow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/is-prop-valid': minor
---

Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
5 changes: 5 additions & 0 deletions .changeset/loud-hairs-approve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/weak-memoize': minor
---

Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
5 changes: 5 additions & 0 deletions .changeset/lovely-zebras-admire.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/eslint-plugin': patch
---

An empty css prop (`<div css />`) will now raise an error in the `@emotion/syntax-preference` rule instead of crashing on this case.
5 changes: 5 additions & 0 deletions .changeset/modern-penguins-play.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/eslint-plugin': minor
---

Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
5 changes: 5 additions & 0 deletions .changeset/modern-tomatoes-work.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/css': patch
---

Fixed `options` parameter to `createEmotion` from `@emotion/css/create-instance` incorrectly being marked as optional when it's required.
9 changes: 9 additions & 0 deletions .changeset/neat-shoes-search.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@emotion/primitives-core': minor
---

author: @srmagura
pr: #2818
commit: 8546dd0

Source code has been migrated to TypeScript so from now on type declarations will be available in the published package.
5 changes: 5 additions & 0 deletions .changeset/old-years-breathe.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/utils': minor
---

Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
5 changes: 5 additions & 0 deletions .changeset/sharp-trees-smell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/eslint-plugin': patch
---

Fixed a crash on empty css prop (`<div css />`) in the `@emotion/jsx-import` rule.
5 changes: 5 additions & 0 deletions .changeset/stale-dogs-wink.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/hash': patch
---

Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
5 changes: 5 additions & 0 deletions .changeset/thick-tips-join.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/sheet': minor
---

Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
5 changes: 5 additions & 0 deletions .changeset/thirty-years-divide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/sheet': patch
---

Type declaration for `StyleSheet`'s constructor has been fixed. It incorrectly was specifying that `options` were optional when in reality they weren't.
5 changes: 5 additions & 0 deletions .changeset/wet-boxes-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@emotion/babel-plugin-jsx-pragmatic': minor
---

Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
2 changes: 1 addition & 1 deletion .codesandbox/ci.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"packages": ["packages/*"],
"sandboxes": ["pk1qjqpw67"],
"node": "12"
"node": "16"
}
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_style = space

[*.{js,ts,tsx,json,yml}]
indent_size = 2
3 changes: 1 addition & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ coverage/
node_modules/
stylis.min.js
/demo/dist
/packages/site/build
flow-typed/
/site/out
23 changes: 0 additions & 23 deletions .flowconfig

This file was deleted.

26 changes: 0 additions & 26 deletions .flowconfig-ci

This file was deleted.

20 changes: 3 additions & 17 deletions .github/actions/ci-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,12 @@ name: 'CI setup'
runs:
using: 'composite'
steps:
- name: Set Node.js 16.x
- name: Setup Node.js 16.x
uses: actions/setup-node@v3
with:
node-version: 16.x

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
shell: bash

- uses: actions/cache@v3
id: yarn-cache
with:
path: |
${{ steps.yarn-cache-dir-path.outputs.dir }}
node_modules
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
cache: yarn

- name: Install Dependencies
run: yarn --frozen-lockfile
run: yarn --immutable
shell: bash
12 changes: 8 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ on:
push:
branches:
- main
- ts-migration
pull_request:

permissions:
contents: read # to fetch code (actions/checkout)

jobs:
test:
name: 'Tests on ${{matrix.platform}}'
Expand All @@ -27,15 +31,15 @@ jobs:
uses: codecov/codecov-action@v1
if: ${{ matrix.platform == 'ubuntu-latest' && always() }}

flow:
name: Flow
typescript:
name: TypeScript
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/ci-setup

- name: Check Types
run: yarn flow:check
run: yarn tsc:all

test_react18:
name: Test React 18
Expand Down Expand Up @@ -67,7 +71,7 @@ jobs:
- name: ESLint
run: yarn lint:check

typescript:
dtslint:
name: dtslint
runs-on: ubuntu-latest
steps:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,14 @@ on:

concurrency: ${{ github.workflow }}-${{ github.ref }}

permissions: {}
jobs:
release:
permissions:
contents: write # to create release
issues: write # to post issue comments
pull-requests: write # to create pull request

name: Release
runs-on: ubuntu-latest
steps:
Expand All @@ -20,6 +26,7 @@ jobs:
uses: changesets/action@v1
with:
publish: yarn release
version: yarn version-packages
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
18 changes: 14 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,22 @@ dist/
node_modules/
*.log
.idea
site/build
package-lock.json
.DS_Store
.cache
public/
!playgrounds/cra/public
.env
.vscode
.parcel-cache/
.parcel-cache/
*.orig
*.tsbuildinfo

.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# Website
/site/out
.next
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12
16
3 changes: 0 additions & 3 deletions .prettierrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,3 @@ overrides:
- files: 'docs/*.md'
options:
printWidth: 60
- files: '*.js'
options:
parser: flow
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/node_modules/jest-cli/node_modules/jest-snapshot/build/InlineSnapshots.js b/node_modules/jest-cli/node_modules/jest-snapshot/build/InlineSnapshots.js
index 5f9c3d5..1ec2ce5 100644
--- a/node_modules/jest-cli/node_modules/jest-snapshot/build/InlineSnapshots.js
+++ b/node_modules/jest-cli/node_modules/jest-snapshot/build/InlineSnapshots.js
diff --git a/build/InlineSnapshots.js b/build/InlineSnapshots.js
index 5f9c3d5816c5e944f6810bc42ff67ed649d84a2b..1ec2ce5d6a5a81ccd8cd898fb65be432b04cb514 100644
--- a/build/InlineSnapshots.js
+++ b/build/InlineSnapshots.js
@@ -219,7 +219,8 @@ const saveSnapshotsForFile = (snapshots, sourceFilePath, prettier) => {
filename: sourceFilePath,
plugins,
Expand Down
28 changes: 28 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Large diffs are not rendered by default.

783 changes: 783 additions & 0 deletions .yarn/releases/yarn-3.2.3.cjs

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion .yarnrc

This file was deleted.

9 changes: 9 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
nodeLinker: node-modules

npmPublishAccess: public

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"

yarnPath: .yarn/releases/yarn-3.2.3.cjs
Loading

0 comments on commit 9c8c5f0

Please sign in to comment.