Skip to content

Commit 6a70a56

Browse files
authored
Merge pull request #279 from DevinoSolutions/revert-first-pr
Refactor all styles to use "upup-" prefix and fix darkmode calls
2 parents b30495a + b62b7fd commit 6a70a56

Some content is hidden

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

46 files changed

+963
-3902
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
node_modules
44
.cache
55
dist
6+
dist-node
67
.idea
78
.vscode
89

.npmignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ pnpm-lock.yaml
1010
tsconfig.json
1111
postcss.config.js
1212
tailwind.config.js
13-
tsdx.config.js
13+
tsup.config.ts
1414
!dist
15+
!dist-node

devino-dark.png

23.9 KB
Loading

devino-light.png

91.1 KB
Loading

logo-dark.png

4.21 KB
Loading

logo-white.png

2.86 KB
Loading

package.json

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "upup-react-file-uploader",
33
"author": "Devino Solutions",
44
"license": "MIT",
5-
"version": "1.2.1",
5+
"version": "1.3.2",
66
"publishConfig": {
77
"access": "public"
88
},
@@ -14,18 +14,17 @@
1414
"exports": {
1515
".": {
1616
"types": "./dist/index.browser.d.ts",
17-
"browser": "./dist/browser.esm.js",
18-
"import": "./dist/browser.esm.js",
19-
"require": "./dist/browser.cjs.development.js"
17+
"import": "./dist/index.browser.mjs",
18+
"require": "./dist/index.browser.js"
2019
},
2120
"./server": {
22-
"types": "./dist/index.node.d.ts",
23-
"default": "./dist/node.node.js"
21+
"types": "./dist-node/index.node.d.ts",
22+
"default": "./dist-node/index.node.js"
2423
},
2524
"./shared": {
2625
"types": "./dist/shared/types/StorageSDK.d.ts"
2726
},
28-
"./styles": "./dist/upup.css"
27+
"./styles": "./dist/tailwind-prefixed.css"
2928
},
3029
"typesVersions": {
3130
"*": {
@@ -56,10 +55,10 @@
5655
"decompress"
5756
],
5857
"scripts": {
59-
"start": "pnpm run prebuild && tsdx watch",
60-
"build:node": "tsdx build --no-minify --entry ./src/index.node.ts --tsconfig ./tsconfig.node.json --format cjs --name node",
61-
"build:browser": "tsdx build --no-minify --entry ./src/index.browser.ts --tsconfig ./tsconfig.browser.json --format esm,cjs --name browser",
62-
"build": "node scripts/build.js",
58+
"dev": "tsup --config tsup.config.ts --watch",
59+
"build:css": "npx tailwindcss -c tailwind.config.js -i ./src/frontend/tailwind.css -o ./dist/tailwind-prefixed.css",
60+
"build": "pnpm run prebuild && tsup --config tsup.config.ts && pnpm run build:css",
61+
"prebuild": "rimraf dist dist-node && pnpm run lint",
6362
"test": "jest",
6463
"test:watch": "jest --watch",
6564
"test:coverage": "jest --coverage",
@@ -85,6 +84,10 @@
8584
"limit": "10 KB"
8685
}
8786
],
87+
"peerDependencies": {
88+
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
89+
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
90+
},
8891
"devDependencies": {
8992
"@babel/core": "^7.23.3",
9093
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
@@ -123,7 +126,7 @@
123126
"@types/uuid": "^9.0.7",
124127
"@typescript-eslint/eslint-plugin": "^8.22.0",
125128
"@typescript-eslint/parser": "^8.22.0",
126-
"autoprefixer": "^10.4.16",
129+
"autoprefixer": "^10.4.20",
127130
"babel-loader": "^9.1.3",
128131
"css-loader": "^7.1.2",
129132
"eslint": "^9.19.0",
@@ -139,7 +142,7 @@
139142
"jest-canvas-mock": "^2.5.2",
140143
"jest-environment-jsdom": "29.7.0",
141144
"lowlight": "1.20.0",
142-
"postcss": "^8.4.31",
145+
"postcss": "^8.5.2",
143146
"postcss-loader": "^8.1.1",
144147
"prettier": "3.0.3",
145148
"prettier-plugin-organize-imports": "^3.2.4",
@@ -153,10 +156,10 @@
153156
"size-limit": "^10.0.3",
154157
"storybook": "^8.5.2",
155158
"style-loader": "^4.0.0",
156-
"tailwindcss": "^3.3.5",
159+
"tailwindcss": "^3.4.17",
157160
"ts-jest": "29.1.1",
158-
"tsdx": "^0.14.1",
159161
"tslib": "^2.6.2",
162+
"tsup": "^8.4.0",
160163
"typescript": "^5.3.2",
161164
"typescript-eslint": "^8.21.0",
162165
"webpack": "5.89.0",
@@ -193,9 +196,7 @@
193196
"jsdom": "22.1.0",
194197
"node-notifier": "10.0.1",
195198
"node-fetch": "2.6.7",
196-
"rollup": "^3.29.4",
197-
"terser": "^5.39.0",
198-
"rollup-plugin-terser": "7.0.2"
199+
"rollup": "^3.29.4"
199200
}
200201
}
201202
}

0 commit comments

Comments
 (0)