Skip to content

Commit 7ca393c

Browse files
authored
Merge branch 'main' into 08-06-feat_nested_media_queries
2 parents 6e3bb9a + 0c78864 commit 7ca393c

23 files changed

+253
-78
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,5 @@ nitrogen/
8484

8585
# generated by bob
8686
dist/
87+
88+
.env

example/app.config.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

example/app.config.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import type { ConfigContext, ExpoConfig } from "expo/config";
2+
3+
export default ({ config }: ConfigContext): ExpoConfig => {
4+
return {
5+
...config,
6+
name: "example",
7+
slug: "example",
8+
plugins: ["expo-dev-client"],
9+
userInterfaceStyle: "automatic",
10+
android: {
11+
package: "dev.reactnativecss",
12+
},
13+
ios: {
14+
bundleIdentifier: "dev.reactnativecss",
15+
},
16+
experiments: {
17+
reactCompiler: false,
18+
buildCacheProvider:
19+
process.env.CI || process.env.EAS_BUILD_CACHE_PROVIDER
20+
? "eas"
21+
: undefined,
22+
},
23+
};
24+
};

package.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,28 @@
2727
"default": "./dist/commonjs/metro/index.js"
2828
}
2929
},
30+
"./compiler": {
31+
"source": "./src/compiler/index.ts",
32+
"import": {
33+
"types": "./dist/typescript/module/src/compiler/index.d.ts",
34+
"default": "./dist/module/compiler/index.js"
35+
},
36+
"require": {
37+
"types": "./dist/typescript/commonjs/src/compiler/index.d.ts",
38+
"default": "./dist/commonjs/compiler/index.js"
39+
}
40+
},
41+
"./jest": {
42+
"source": "./src/jest/index.ts",
43+
"import": {
44+
"types": "./dist/typescript/module/src/jest/index.d.ts",
45+
"default": "./dist/module/jest/index.js"
46+
},
47+
"require": {
48+
"types": "./dist/typescript/commonjs/src/jest/index.d.ts",
49+
"default": "./dist/commonjs/jest/index.js"
50+
}
51+
},
3052
"./babel": {
3153
"source": "./src/babel/index.ts",
3254
"import": {
@@ -112,6 +134,7 @@
112134
"files": [
113135
"src",
114136
"dist",
137+
"types.d.ts",
115138
"!**/__tests__",
116139
"!**/__fixtures__",
117140
"!**/__mocks__"
@@ -146,6 +169,7 @@
146169
"babel-plugin-tester": "^12.0.0",
147170
"babel-preset-expo": "13.3.0-canary-20250713-8f814f8",
148171
"commitlint": "^19.8.1",
172+
"eas-build-cache-provider": "^16.4.2",
149173
"eslint": "^9.30.1",
150174
"eslint-config-prettier": "^10.1.5",
151175
"eslint-plugin-prettier": "^5.5.1",

src/__tests__/vendor/tailwind.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import { render, screen } from "@testing-library/react-native";
12
import { View } from "react-native-css/components/View";
2-
import { registerCSS, render, screen, testID } from "react-native-css/jest";
3+
import { registerCSS, testID } from "react-native-css/jest";
34

45
/**
56
* Tailwind CSS utilities

src/jest/index.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
1-
/* eslint-disable @typescript-eslint/no-namespace */
2-
import { Dimensions } from "react-native";
1+
import { Appearance, Dimensions } from "react-native";
32

43
import { compile, type CompilerOptions } from "../compiler";
54
import { StyleCollection } from "../runtime/native/injection";
65
import { colorScheme, dimensions, rem } from "../runtime/native/reactivity";
76

87
declare global {
8+
/* eslint-disable @typescript-eslint/no-namespace */
99
namespace jest {
1010
interface Matchers<R> {
11-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
12-
toHaveAnimatedStyle(style?: any): R;
11+
toHaveAnimatedStyle(style?: unknown): R;
1312
}
1413
}
1514
}
1615

17-
export * from "@testing-library/react-native";
1816
export const testID = "react-native-css";
1917

2018
beforeEach(() => {
2119
StyleCollection.styles.clear();
2220
dimensions.set(Dimensions.get("window"));
2321
rem.set(14);
22+
Appearance.setColorScheme(null);
2423
colorScheme.set(null);
2524
});
2625

src/runtime/native/__tests__/attributes.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { render, screen } from "@testing-library/react-native";
12
import { Text } from "react-native-css/components/Text";
23
import { View } from "react-native-css/components/View";
3-
import { registerCSS, render, screen, testID } from "react-native-css/jest";
4+
import { registerCSS, testID } from "react-native-css/jest";
45

56
test(":disabled", () => {
67
registerCSS(`.test:disabled { width: 10px; }`);

src/runtime/native/__tests__/calc.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import { render, screen } from "@testing-library/react-native";
12
import { View } from "react-native-css/components/View";
2-
import { registerCSS, render, screen, testID } from "react-native-css/jest";
3+
import { registerCSS, testID } from "react-native-css/jest";
34

45
describe("css", () => {
56
test("calc(10px + 100px)", () => {

src/runtime/native/__tests__/colors.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import { render, screen } from "@testing-library/react-native";
12
import { View } from "react-native-css/components/View";
2-
import { registerCSS, render, screen, testID } from "react-native-css/jest";
3+
import { registerCSS, testID } from "react-native-css/jest";
34

45
describe("hsl", () => {
56
test("inline", () => {

src/runtime/native/__tests__/container-queries.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import { fireEvent, render, screen } from "@testing-library/react-native";
12
import { View } from "react-native-css/components/View";
2-
import { fireEvent, registerCSS, render, screen } from "react-native-css/jest";
3+
import { registerCSS } from "react-native-css/jest";
34

45
const parentID = "parent";
56
const childID = "child";

0 commit comments

Comments
 (0)