Skip to content

Commit 95cac45

Browse files
committed
chore: do a bunch of updates
1 parent 77a38f5 commit 95cac45

Some content is hidden

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

47 files changed

+2649
-2692
lines changed

app/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
"dependencies": {
77
"@expo/vector-icons": "^13.0.0",
88
"@md3-ui/core": "^0.2.1",
9-
"expo": "^49.0.9",
9+
"expo": "^49.0.13",
1010
"expo-status-bar": "~1.6.0",
1111
"react": "18.2.0",
1212
"react-dom": "18.2.0",
13-
"react-native": "0.72.4",
13+
"react-native": "0.72.5",
1414
"react-native-iphone-x-helper": "^1.3.1",
15-
"react-native-safe-area-context": "4.5.0",
16-
"react-router-native": "^6.15.0",
15+
"react-native-safe-area-context": "4.6.3",
16+
"react-router-native": "^6.16.0",
1717
"uuid": "^3.4.0"
1818
},
1919
"devDependencies": {

clean-package.config.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"replace": {
3+
"main": "dist/commonjs/index.js",
4+
"module": "dist/module/index.js",
5+
"react-native": "src/index.ts",
6+
"types": "dist/typescript/index.d.ts",
7+
"exports": {
8+
".": {
9+
"types": "./dist/typescript/index.d.ts",
10+
"import": "./dist/module/index.js",
11+
"require": "./dist/commonjs/index.js"
12+
},
13+
"./package.json": "./package.json"
14+
}
15+
}
16+
}

docs/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@
1515
"@md3-ui/utils": "^0.2.1",
1616
"@mdx-js/loader": "^2.3.0",
1717
"@mdx-js/react": "^2.3.0",
18-
"@next/mdx": "^13.4.19",
18+
"@next/mdx": "^13.5.4",
1919
"@preconstruct/next": "^4.0.0",
2020
"copy-to-clipboard": "^3.3.3",
21-
"next": "^13.4.19",
21+
"next": "^13.5.4",
2222
"next-seo": "^6.1.0",
23-
"prism-react-renderer": "^2.0.6",
23+
"prism-react-renderer": "^2.1.0",
2424
"react": "18.2.0",
2525
"react-dom": "18.2.0",
26-
"react-live": "^4.1.3",
27-
"react-native": "0.72.4",
28-
"react-native-safe-area-context": "4.5.0",
26+
"react-live": "^4.1.5",
27+
"react-native": "0.72.5",
28+
"react-native-safe-area-context": "4.6.3",
2929
"react-native-svg": "13.9.0",
30-
"react-native-web": "^0.19.8",
30+
"react-native-web": "^0.19.9",
3131
"remark-emoji": "^4.0.0",
32-
"remark-gfm": "^3.0.1",
32+
"remark-gfm": "^4.0.0",
3333
"remark-slug": "^7.0.1",
3434
"webpack": "^5.88.2"
3535
},
3636
"devDependencies": {
37-
"eslint": "^8.49.0",
38-
"eslint-config-next": "^13.4.19"
37+
"eslint": "^8.51.0",
38+
"eslint-config-next": "^13.5.4"
3939
}
4040
}

jest.config.js

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module.exports = {
1+
/** @type {import('jest').Config} */
2+
const config = {
23
testEnvironment: "jsdom",
34
collectCoverageFrom: ["packages/**/*.{ts,tsx}"],
45
moduleFileExtensions: [
@@ -15,7 +16,18 @@ module.exports = {
1516
"^react-native$": "react-native-web",
1617
},
1718
transform: {
18-
"^.+\\.(ts|tsx|js|jsx)?$": "babel-jest",
19+
"^.+\\.(ts|tsx|js|jsx)?$": [
20+
"@swc/jest",
21+
{
22+
jsc: {
23+
transform: {
24+
react: {
25+
runtime: "automatic",
26+
},
27+
},
28+
},
29+
},
30+
],
1931
},
2032
transformIgnorePatterns: [
2133
"node_modules/(?!(jest-)?react-native(-.*)?|@react-native(-community)?/)",
@@ -26,3 +38,5 @@ module.exports = {
2638
"jest-watch-typeahead/testname",
2739
],
2840
}
41+
42+
module.exports = config

jest.setup.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import "@testing-library/jest-dom"
2+
13
if (typeof window.matchMedia !== "function") {
24
Object.defineProperty(window, "matchMedia", {
35
enumerable: true,

package.json

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,75 +9,78 @@
99
"docs"
1010
],
1111
"dependencies": {
12-
"@babel/core": "^7.22.15",
12+
"@babel/core": "^7.23.0",
1313
"@babel/plugin-proposal-class-properties": "^7.18.6",
1414
"@babel/plugin-proposal-private-methods": "^7.18.6",
1515
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
16-
"@babel/preset-env": "^7.22.15",
16+
"@babel/preset-env": "^7.22.20",
1717
"@babel/preset-react": "^7.22.15",
18-
"@babel/preset-typescript": "^7.22.15",
18+
"@babel/preset-typescript": "^7.23.0",
1919
"@manypkg/cli": "^0.21.0",
20+
"@nicolo-ribaudo/semver-v6": "^6.3.3",
2021
"@preconstruct/hook": "^0.4.0",
21-
"@storybook/addon-a11y": "^7.4.0",
22-
"@storybook/addon-essentials": "^7.4.0",
23-
"@storybook/react": "^7.4.0",
24-
"@storybook/react-webpack5": "^7.4.0",
25-
"@types/jest": "^29.5.4",
26-
"@types/node": "^18.17.14",
27-
"@types/react": "^18.2.21",
28-
"@types/react-dom": "^18.2.7",
29-
"@typescript-eslint/eslint-plugin": "^6.6.0",
30-
"@typescript-eslint/parser": "^6.6.0",
31-
"babel-jest": "^29.6.4",
32-
"babel-plugin-react-native-web": "^0.19.8",
33-
"eslint": "^8.49.0",
22+
"@storybook/addon-a11y": "^7.4.6",
23+
"@storybook/addon-essentials": "^7.4.6",
24+
"@storybook/react": "^7.4.6",
25+
"@storybook/react-webpack5": "^7.4.6",
26+
"@swc/core": "^1.3.92",
27+
"@swc/jest": "^0.2.29",
28+
"@types/jest": "^29.5.5",
29+
"@types/node": "^18.18.4",
30+
"@types/react": "^18.2.25",
31+
"@types/react-dom": "^18.2.11",
32+
"@typescript-eslint/eslint-plugin": "^6.7.4",
33+
"@typescript-eslint/parser": "^6.7.4",
34+
"babel-plugin-react-native-web": "^0.19.9",
35+
"clean-package": "^2.2.0",
36+
"eslint": "^8.51.0",
3437
"eslint-config-airbnb": "^19.0.4",
3538
"eslint-config-airbnb-typescript": "^17.1.0",
3639
"eslint-config-prettier": "^9.0.0",
3740
"eslint-plugin-import": "^2.28.1",
38-
"eslint-plugin-jsdoc": "^46.5.1",
41+
"eslint-plugin-jsdoc": "^46.8.2",
3942
"eslint-plugin-jsx-a11y": "^6.7.1",
4043
"eslint-plugin-react": "^7.33.2",
4144
"eslint-plugin-react-hooks": "^4.6.0",
42-
"eslint-plugin-storybook": "^0.6.13",
43-
"eslint-plugin-testing-library": "^5.11.1",
45+
"eslint-plugin-storybook": "^0.6.14",
46+
"eslint-plugin-testing-library": "^6.0.2",
4447
"eslint-plugin-unicorn": "^48.0.1",
4548
"gh-pages": "^6.0.0",
46-
"glob": "^10.3.4",
49+
"glob": "^10.3.10",
4750
"husky": "^8.0.3",
48-
"jest": "^29.6.4",
49-
"jest-environment-jsdom": "^29.6.4",
51+
"jest": "^29.7.0",
52+
"jest-environment-jsdom": "^29.7.0",
5053
"jest-watch-typeahead": "^2.2.2",
51-
"knip": "^2.22.0",
52-
"lerna": "^7.2.0",
54+
"knip": "^2.32.0",
55+
"lerna": "^7.3.0",
5356
"lint-staged": "^14.0.1",
5457
"prettier": "^3.0.3",
5558
"prettier-plugin-organize-imports": "^3.2.3",
5659
"react": "18.2.0",
5760
"react-dom": "18.2.0",
58-
"react-native": "0.72.4",
59-
"react-native-builder-bob": "^0.21.3",
60-
"react-native-safe-area-context": "4.5.0",
61+
"react-native": "0.72.5",
62+
"react-native-builder-bob": "^0.23.1",
63+
"react-native-safe-area-context": "4.6.3",
6164
"react-native-svg": "13.9.0",
62-
"react-native-web": "^0.19.8",
63-
"rimraf": "^5.0.1",
64-
"storybook": "^7.4.0",
65+
"react-native-web": "^0.19.9",
66+
"rimraf": "^5.0.5",
67+
"storybook": "^7.4.6",
6568
"storybook-addon-performance": "^0.17.1",
6669
"storybook-dark-mode": "^3.0.1",
67-
"tsx": "^3.12.8",
70+
"tsx": "^3.13.0",
6871
"typescript": "~5.2.2",
6972
"webpack": "^5.88.2",
7073
"yarn-deduplicate": "^6.0.2"
7174
},
7275
"resolutions": {
73-
"@types/react": "^18.2.21"
76+
"@types/react": "^18.2.25"
7477
},
7578
"scripts": {
7679
"build": "lerna run build --ignore=\"@md3-ui/docs\"",
7780
"build:props-docs": "yarn typedocs && lerna run build --scope=\"@md3-ui/props-docs\"",
7881
"deploy": "yarn storybook:build && gh-pages -d storybook-static && rimraf storybook-static",
7982
"lint": "eslint .",
80-
"postinstall": "manypkg check && tsx scripts/create-dist.ts",
83+
"postinstall": "manypkg check",
8184
"prepare": "husky install",
8285
"prestorybook": "rimraf node_modules/.cache/storybook",
8386
"storybook": "sb dev -p 6006",

packages/app-bar/package.json

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
{
22
"name": "@md3-ui/app-bar",
33
"version": "0.2.1",
4-
"main": "dist/commonjs/index.js",
5-
"module": "dist/module/index.js",
6-
"react-native": "src/index.ts",
7-
"types": "dist/typescript/index.d.ts",
8-
"exports": {
9-
".": {
10-
"types": "./dist/typescript/index.d.ts",
11-
"import": "./dist/module/index.js",
12-
"require": "./dist/commonjs/index.js"
13-
},
14-
"./package.json": "./package.json"
15-
},
4+
"main": "src/index.ts",
165
"license": "MIT",
176
"homepage": "https://eikefoken.com/md3-ui/",
187
"repository": {
@@ -40,17 +29,19 @@
4029
"devDependencies": {
4130
"@md3-ui/button": "^0.2.1",
4231
"@md3-ui/icons": "^0.2.1",
43-
"@types/react": "^18.2.21",
32+
"@types/react": "^18.2.25",
4433
"react": "18.2.0",
45-
"react-native": "0.72.4"
34+
"react-native": "0.72.5"
4635
},
4736
"peerDependencies": {
4837
"@types/react": "^18.2.0",
4938
"react": "^18.2.0",
50-
"react-native": ">=0.71.7"
39+
"react-native": ">=0.72.5"
5140
},
5241
"scripts": {
5342
"build": "bob build",
43+
"prepack": "clean-package",
44+
"postpack": "clean-package restore",
5445
"typecheck": "tsc --noEmit",
5546
"typedocs": "tsx ../../scripts/generate-type-docs.ts"
5647
},

packages/badge/package.json

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
{
22
"name": "@md3-ui/badge",
33
"version": "0.2.1",
4-
"main": "dist/commonjs/index.js",
5-
"module": "dist/module/index.js",
6-
"react-native": "src/index.ts",
7-
"types": "dist/typescript/index.d.ts",
8-
"exports": {
9-
".": {
10-
"types": "./dist/typescript/index.d.ts",
11-
"import": "./dist/module/index.js",
12-
"require": "./dist/commonjs/index.js"
13-
},
14-
"./package.json": "./package.json"
15-
},
4+
"main": "src/index.ts",
165
"license": "MIT",
176
"homepage": "https://eikefoken.com/md3-ui/",
187
"repository": {
@@ -40,17 +29,19 @@
4029
},
4130
"devDependencies": {
4231
"@md3-ui/icons": "^0.2.1",
43-
"@types/react": "^18.2.21",
32+
"@types/react": "^18.2.25",
4433
"react": "18.2.0",
45-
"react-native": "0.72.4"
34+
"react-native": "0.72.5"
4635
},
4736
"peerDependencies": {
4837
"@types/react": "^18.2.0",
4938
"react": "^18.2.0",
50-
"react-native": ">=0.71.7"
39+
"react-native": ">=0.72.5"
5140
},
5241
"scripts": {
5342
"build": "bob build",
43+
"prepack": "clean-package",
44+
"postpack": "clean-package restore",
5445
"typecheck": "tsc --noEmit",
5546
"typedocs": "tsx ../../scripts/generate-type-docs.ts"
5647
},

packages/button/package.json

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
{
22
"name": "@md3-ui/button",
33
"version": "0.2.1",
4-
"main": "dist/commonjs/index.js",
5-
"module": "dist/module/index.js",
6-
"react-native": "src/index.ts",
7-
"types": "dist/typescript/index.d.ts",
8-
"exports": {
9-
".": {
10-
"types": "./dist/typescript/index.d.ts",
11-
"import": "./dist/module/index.js",
12-
"require": "./dist/commonjs/index.js"
13-
},
14-
"./package.json": "./package.json"
15-
},
4+
"main": "src/index.ts",
165
"license": "MIT",
176
"homepage": "https://eikefoken.com/md3-ui/",
187
"repository": {
@@ -42,17 +31,19 @@
4231
"devDependencies": {
4332
"@md3-ui/icons": "^0.2.1",
4433
"@md3-ui/layout": "^0.2.1",
45-
"@types/react": "^18.2.21",
34+
"@types/react": "^18.2.25",
4635
"react": "18.2.0",
47-
"react-native": "0.72.4"
36+
"react-native": "0.72.5"
4837
},
4938
"peerDependencies": {
5039
"@types/react": "^18.2.0",
5140
"react": "^18.2.0",
52-
"react-native": ">=0.71.7"
41+
"react-native": ">=0.72.5"
5342
},
5443
"scripts": {
5544
"build": "bob build",
45+
"prepack": "clean-package",
46+
"postpack": "clean-package restore",
5647
"typecheck": "tsc --noEmit",
5748
"typedocs": "tsx ../../scripts/generate-type-docs.ts"
5849
},

packages/button/src/button-base.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,9 @@ export const ButtonBase = forwardRef<RNView, ButtonBaseProps>(
250250
>([])
251251

252252
const [{ backgroundColor = null, ...containerStyle }] = splitProps(
253-
StyleSheet.flatten([style, styles?.root]),
253+
Platform.OS === "web"
254+
? ({ backgroundColor: undefined } as RNViewStyle)
255+
: StyleSheet.flatten([style, styles?.root]),
254256
[
255257
"backgroundColor",
256258
"borderRadius",

0 commit comments

Comments
 (0)