Skip to content

Commit 427b29b

Browse files
marklawlormarklawlor
authored
Merge branch 'main' into dependabot/npm_and_yarn/lefthook-1.12.3
2 parents 42fbfbb + 330e81c commit 427b29b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1420
-536
lines changed

‎.config/cspell.json‎

Lines changed: 147 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,151 @@
1313
"borderless",
1414
"colorjs",
1515
"oklab",
16-
"prebuild"
16+
"prebuild",
17+
"aliceblue",
18+
"antiquewhite",
19+
"aqua",
20+
"aquamarine",
21+
"azure",
22+
"beige",
23+
"bisque",
24+
"black",
25+
"blanchedalmond",
26+
"blue",
27+
"blueviolet",
28+
"brown",
29+
"burlywood",
30+
"cadetblue",
31+
"chartreuse",
32+
"chocolate",
33+
"coral",
34+
"cornflowerblue",
35+
"cornsilk",
36+
"crimson",
37+
"cyan",
38+
"darkblue",
39+
"darkcyan",
40+
"darkgoldenrod",
41+
"darkgray",
42+
"darkgreen",
43+
"darkgrey",
44+
"darkkhaki",
45+
"darkmagenta",
46+
"darkolivegreen",
47+
"darkorange",
48+
"darkorchid",
49+
"darkred",
50+
"darksalmon",
51+
"darkseagreen",
52+
"darkslateblue",
53+
"darkslategrey",
54+
"darkturquoise",
55+
"darkviolet",
56+
"deeppink",
57+
"deepskyblue",
58+
"dimgray",
59+
"dimgrey",
60+
"dodgerblue",
61+
"firebrick",
62+
"floralwhite",
63+
"forestgreen",
64+
"fuchsia",
65+
"gainsboro",
66+
"ghostwhite",
67+
"gold",
68+
"goldenrod",
69+
"gray",
70+
"green",
71+
"greenyellow",
72+
"grey",
73+
"honeydew",
74+
"hotpink",
75+
"indianred",
76+
"indigo",
77+
"ivory",
78+
"khaki",
79+
"lavender",
80+
"lavenderblush",
81+
"lawngreen",
82+
"lemonchiffon",
83+
"lightblue",
84+
"lightcoral",
85+
"lightcyan",
86+
"lightgoldenrodyellow",
87+
"lightgray",
88+
"lightgreen",
89+
"lightgrey",
90+
"lightpink",
91+
"lightsalmon",
92+
"lightseagreen",
93+
"lightskyblue",
94+
"lightslategrey",
95+
"lightsteelblue",
96+
"lightyellow",
97+
"lime",
98+
"limegreen",
99+
"linen",
100+
"magenta",
101+
"maroon",
102+
"mediumaquamarine",
103+
"mediumblue",
104+
"mediumorchid",
105+
"mediumpurple",
106+
"mediumseagreen",
107+
"mediumslateblue",
108+
"mediumspringgreen",
109+
"mediumturquoise",
110+
"mediumvioletred",
111+
"midnightblue",
112+
"mintcream",
113+
"mistyrose",
114+
"moccasin",
115+
"navajowhite",
116+
"navy",
117+
"oldlace",
118+
"olive",
119+
"olivedrab",
120+
"orange",
121+
"orangered",
122+
"orchid",
123+
"palegoldenrod",
124+
"palegreen",
125+
"paleturquoise",
126+
"palevioletred",
127+
"papayawhip",
128+
"peachpuff",
129+
"peru",
130+
"pink",
131+
"plum",
132+
"powderblue",
133+
"purple",
134+
"rebeccapurple",
135+
"red",
136+
"rosybrown",
137+
"royalblue",
138+
"saddlebrown",
139+
"salmon",
140+
"sandybrown",
141+
"seagreen",
142+
"seashell",
143+
"sienna",
144+
"silver",
145+
"skyblue",
146+
"slateblue",
147+
"slategray",
148+
"snow",
149+
"springgreen",
150+
"steelblue",
151+
"tan",
152+
"teal",
153+
"thistle",
154+
"tomato",
155+
"turquoise",
156+
"violet",
157+
"wheat",
158+
"white",
159+
"whitesmoke",
160+
"yellow",
161+
"yellowgreen",
17162
]
18-
}
163+
}

.config/release-it.nightly.config.ts renamed to .config/release-it.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ import type { Config } from "release-it";
33
export default {
44
git: {
55
commitArgs: ["--no-verify"],
6-
commit: false,
76
},
87
} satisfies Config;

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
lint:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- name: Checkout
20+
- name: Checkout Repository
2121
uses: actions/checkout@v4
2222

2323
- name: Setup
@@ -32,7 +32,7 @@ jobs:
3232
test:
3333
runs-on: ubuntu-latest
3434
steps:
35-
- name: Checkout
35+
- name: Checkout Repository
3636
uses: actions/checkout@v4
3737

3838
- name: Setup
@@ -44,7 +44,7 @@ jobs:
4444
build-library:
4545
runs-on: ubuntu-latest
4646
steps:
47-
- name: Checkout
47+
- name: Checkout Repository
4848
uses: actions/checkout@v4
4949

5050
- name: Setup
@@ -59,7 +59,7 @@ jobs:
5959
build-web:
6060
runs-on: ubuntu-latest
6161
steps:
62-
- name: Checkout
62+
- name: Checkout Repository
6363
uses: actions/checkout@v4
6464

6565
- name: Setup
@@ -78,7 +78,7 @@ jobs:
7878
build-ios-dev:
7979
runs-on: macos-15
8080
steps:
81-
- name: Checkout
81+
- name: Checkout Repository
8282
uses: actions/checkout@v4
8383

8484
- name: Setup

‎.github/workflows/release-nightly.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Nightly Release & Publish to NPM
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * *" # every day at midnight UTC
6+
workflow_dispatch: # allow manual trigger
7+
8+
jobs:
9+
nightly:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout Repository
13+
uses: actions/checkout@v4
14+
15+
- name: Setup
16+
uses: ./.github/actions/setup
17+
18+
- name: Setup NPM registry
19+
run: |
20+
npm config set //registry.npmjs.org/:_authToken $NPM_TOKEN
21+
env:
22+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
23+
24+
- name: Set nightly version
25+
id: set-version
26+
run: |
27+
SHORT_SHA=$(git rev-parse --short HEAD)
28+
VERSION=0.0.0-nightly.$SHORT_SHA
29+
npm version $VERSION --no-git-tag-version
30+
echo "version=$VERSION" >> $GITHUB_ENV
31+
echo "version=$VERSION" >> $GITHUB_OUTPUT
32+
33+
- name: Check if version already exists
34+
id: check-version
35+
run: |
36+
if npm view react-native-css@${{ steps.set-version.outputs.version }} > /dev/null 2>&1; then
37+
echo "Version ${{ steps.set-version.outputs.version }} already exists. Skipping publish."
38+
echo "exists=true" >> $GITHUB_OUTPUT
39+
else
40+
echo "exists=false" >> $GITHUB_OUTPUT
41+
fi
42+
43+
- name: Publish nightly
44+
if: steps.check-version.outputs.exists == 'false'
45+
run: npm publish --tag nightly
46+
env:
47+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.github/workflows/release.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Release & Publish to NPM
2+
3+
on: workflow_dispatch
4+
5+
permissions:
6+
contents: write
7+
8+
jobs:
9+
release:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout Repository
13+
uses: actions/checkout@v4
14+
15+
- name: Setup
16+
uses: ./.github/actions/setup
17+
18+
- name: Initialize Git user
19+
shell: bash
20+
run: |
21+
git config user.name "github-actions"
22+
git config user.email "mwlawlor@gmail.com"
23+
24+
- name: Setup NPM registry
25+
run: |
26+
npm config set //registry.npmjs.org/:_authToken $NPM_TOKEN
27+
env:
28+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
29+
30+
- name: Run release
31+
run: |
32+
yarn release --ci --preRelease=preview
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,5 @@ nitrogen/
8585
# generated by bob
8686
dist/
8787

88-
.env
88+
.env
89+
.npmrc

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.19.0
1+
v22.18.0

‎lefthook.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ pre-commit:
33
commands:
44
lint:
55
glob: "*.{js,ts,jsx,tsx}"
6-
run: npx eslint {staged_files}
6+
run: yarn eslint {staged_files}
77
types:
88
glob: "*.{js,ts, jsx, tsx}"
9-
run: npx tsc
9+
run: yarn tsc
1010
commit-msg:
1111
parallel: true
1212
commands:
1313
commitlint:
14-
run: npx commitlint --edit
14+
run: yarn commitlint --edit

‎package.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "react-native-css",
3-
"version": "2.1.2",
3+
"version": "3.0.0-preview.1",
4+
"description": "A CSS polyfill for React Native",
45
"exports": {
56
".": {
67
"source": "./src/index.ts",
@@ -115,7 +116,6 @@
115116
"prepare": "bob build",
116117
"prepublishOnly": "bob build",
117118
"release": "release-it --config ./.config/release-it.config.ts",
118-
"release:nightly": "release-it --config ./.config/release-it.nightly.config.ts 3.0.0-nightly.\"$(git rev-parse --short HEAD)\" --npm.tag=beta && git restore :/",
119119
"start": "yarn example start",
120120
"start:build": "yarn build && yarn example build",
121121
"start:debug": "yarn build && yarn example debug",
@@ -152,6 +152,7 @@
152152
"!**/__mocks__"
153153
],
154154
"dependencies": {
155+
"@expo/metro-runtime": "~6.1.1",
155156
"babel-plugin-react-compiler": "^19.1.0-rc.2",
156157
"colorjs.io": "0.6.0-alpha.1",
157158
"comment-json": "^4.2.5",
@@ -197,12 +198,13 @@
197198
"react-native": "0.81.0",
198199
"react-native-builder-bob": "^0.40.13",
199200
"react-native-reanimated": "4.0.2",
200-
"react-native-safe-area-context": "5.6.0",
201+
"react-native-safe-area-context": "5.6.1",
201202
"react-native-worklets": "0.4.1",
202203
"react-refresh": "^0.17.0",
203204
"react-test-renderer": "^19.1.0",
204205
"release-it": "^19.0.4",
205206
"tailwindcss": "^4.1.12",
207+
"tailwindcss-safe-area": "^1.1.0",
206208
"typescript": "^5.9.2",
207209
"typescript-eslint": "^8.40.0"
208210
},

src/compiler/__tests__/@prop.test.tsx renamed to src/__tests__/compiler/@prop.test.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { render, screen } from "@testing-library/react-native";
2+
import { compile } from "react-native-css/compiler";
23
import { View } from "react-native-css/components";
34
import { registerCSS, testID } from "react-native-css/jest";
45

5-
import { compile } from "../compiler";
6-
76
test("@prop target (nested @media)", () => {
87
const compiled = registerCSS(`
98
.my-class {

0 commit comments

Comments
 (0)