From ec559485f25e85592b321acedc1c2de657e7b18c Mon Sep 17 00:00:00 2001 From: Florian Spreckelsen Date: Fri, 9 Aug 2024 15:20:16 +0200 Subject: [PATCH 1/4] [REFACTOR]: Use fontsource/poppins instead of googlefonts --- src/Avatar/Avatar.scss | 1 - src/Dropzone/components/dropzone/Dropzone.scss | 1 - src/FileCard/FileCard.scss | 3 +-- src/FileMosaic/components/file-mosaic/FileMosaic.scss | 3 +-- src/MaterialButton/MaterialButton.scss | 1 - src/index.ts | 10 +++++++++- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Avatar/Avatar.scss b/src/Avatar/Avatar.scss index bdaa99a..dc359df 100644 --- a/src/Avatar/Avatar.scss +++ b/src/Avatar/Avatar.scss @@ -1,4 +1,3 @@ -@import url(https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,900); .fui-avatar-main-container { width: 200px; diff --git a/src/Dropzone/components/dropzone/Dropzone.scss b/src/Dropzone/components/dropzone/Dropzone.scss index 1dc78ee..26878a4 100644 --- a/src/Dropzone/components/dropzone/Dropzone.scss +++ b/src/Dropzone/components/dropzone/Dropzone.scss @@ -1,4 +1,3 @@ -@import url(https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,900); .fui-dropzone-root { width: 100%; diff --git a/src/FileCard/FileCard.scss b/src/FileCard/FileCard.scss index 86f3f63..1b14df5 100644 --- a/src/FileCard/FileCard.scss +++ b/src/FileCard/FileCard.scss @@ -1,4 +1,3 @@ -@import url(https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,900); .files-ui-file-card-main-container { border-radius: 8px; @@ -241,4 +240,4 @@ background-color: rgba(154, 160, 166, 0.85); } } -} */ \ No newline at end of file +} */ diff --git a/src/FileMosaic/components/file-mosaic/FileMosaic.scss b/src/FileMosaic/components/file-mosaic/FileMosaic.scss index 2a96708..13f548d 100644 --- a/src/FileMosaic/components/file-mosaic/FileMosaic.scss +++ b/src/FileMosaic/components/file-mosaic/FileMosaic.scss @@ -1,4 +1,3 @@ -@import url(https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,900); .files-ui-file-mosaic-main-container { //min width @@ -193,4 +192,4 @@ } } } - */ \ No newline at end of file + */ diff --git a/src/MaterialButton/MaterialButton.scss b/src/MaterialButton/MaterialButton.scss index e2f7934..774c007 100644 --- a/src/MaterialButton/MaterialButton.scss +++ b/src/MaterialButton/MaterialButton.scss @@ -1,4 +1,3 @@ -@import url(https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,900); .material-button-root { border: 0; diff --git a/src/index.ts b/src/index.ts index 746ee0e..1a4fef8 100644 --- a/src/index.ts +++ b/src/index.ts @@ -154,4 +154,12 @@ export { default as FilesUiProvider } from "./FilesUiProvider/FilesUiProvider"; export * from "./FilesUiProvider/FilesUiProvider"; -export type { IconsSet, FilesUIConfig } from "./FilesUiProvider"; \ No newline at end of file +export type { IconsSet, FilesUIConfig } from "./FilesUiProvider"; + +import '@fontsource/poppins/300.css'; +import '@fontsource/poppins/400.css'; +import '@fontsource/poppins/500.css'; +import '@fontsource/poppins/600.css'; +import '@fontsource/poppins/700.css'; +import '@fontsource/poppins/800.css'; +import '@fontsource/poppins/900.css'; \ No newline at end of file From 5583c9efc9c6513c058756cc9953711dc3cb9570 Mon Sep 17 00:00:00 2001 From: Florian Spreckelsen Date: Fri, 9 Aug 2024 16:22:36 +0200 Subject: [PATCH 2/4] [REFACTOR]: Add fontsource/poppins and rollup-plugin-import-css deps --- package.json | 6 ++++-- rollup.config.js | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8d56e76..52725c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@files-ui/react", - "version": "1.2.3", + "version": "1.3.0", "description": "UI components for file uploads with React js", "main": "./build/index.js", "module": "./build/index.es.js", @@ -54,6 +54,7 @@ "identity-obj-proxy": "^3.0.0", "jest": "^29.5.0", "jest-environment-jsdom": "^29.5.0", + "rollup-plugin-import-css": "^3.5.0", "rollup-plugin-peer-deps-external": "^2.2.4", "rollup-plugin-sass": "^1.12.19", "rollup-plugin-terser": "^7.0.2", @@ -68,7 +69,8 @@ }, "dependencies": { "@dynamicss/dynamicss": "^2.2.8", - "@files-ui/core": "^2.0.6" + "@files-ui/core": "^2.0.6", + "@fontsource/poppins": "^5.0.14" }, "publishConfig": { "access": "public" diff --git a/rollup.config.js b/rollup.config.js index b0622e9..0b0eab6 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,4 +1,5 @@ import commonjs from "@rollup/plugin-commonjs"; +import css from "rollup-plugin-import-css"; import resolve from "@rollup/plugin-node-resolve"; import peerDepsExternal from "rollup-plugin-peer-deps-external"; import typescript from "rollup-plugin-typescript2"; @@ -22,6 +23,7 @@ export default { }, ], plugins: [ + css(), sass({ insert: true }), peerDepsExternal(), From d983383d35bbeaa97659ad992ab0f4a2181f66b9 Mon Sep 17 00:00:00 2001 From: Florian Spreckelsen Date: Fri, 9 Aug 2024 16:24:32 +0200 Subject: [PATCH 3/4] [FIX]: Typo --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52725c5..bf65134 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@files-ui/react", - "version": "1.3.0", + "version": "1.2.4", "description": "UI components for file uploads with React js", "main": "./build/index.js", "module": "./build/index.es.js", From 618d25a7b982991770293254d9b711553e4315ce Mon Sep 17 00:00:00 2001 From: Florian Spreckelsen Date: Fri, 9 Aug 2024 16:24:56 +0200 Subject: [PATCH 4/4] [REFACTOR]: Also update package-lock.json with new deps --- package-lock.json | 56 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 540ecc2..1cdc85a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,17 @@ { "name": "@files-ui/react", - "version": "1.2.2", + "version": "1.3.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@files-ui/react", - "version": "1.2.2", + "version": "1.3.0", "license": "MIT", "dependencies": { "@dynamicss/dynamicss": "^2.2.8", - "@files-ui/core": "^2.0.6" + "@files-ui/core": "^2.0.6", + "@fontsource/poppins": "^5.0.14" }, "devDependencies": { "@rollup/plugin-commonjs": "^24.0.1", @@ -22,6 +23,7 @@ "identity-obj-proxy": "^3.0.0", "jest": "^29.5.0", "jest-environment-jsdom": "^29.5.0", + "rollup-plugin-import-css": "^3.5.0", "rollup-plugin-peer-deps-external": "^2.2.4", "rollup-plugin-sass": "^1.12.19", "rollup-plugin-terser": "^7.0.2", @@ -650,6 +652,11 @@ "resolved": "https://registry.npmjs.org/@files-ui/core/-/core-2.0.6.tgz", "integrity": "sha512-+odVQIHyX6w/TMP/X/qYwcN9eFzkqmKfgUblkTtU2cJ0YRKc67KgRvy+BnH77+u28bFmdWAeB6wbDoC7CFLnnw==" }, + "node_modules/@fontsource/poppins": { + "version": "5.0.14", + "resolved": "https://registry.npmjs.org/@fontsource/poppins/-/poppins-5.0.14.tgz", + "integrity": "sha512-nmM1zpPo3Uh4JcGAVSQuWaZNYh2FbbwWhZ5t6hRaynmJaNTBW85d3nEh9zMmzI0HX7X5xqQVdRHeDatKpOGsnA==" + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -1223,9 +1230,9 @@ } }, "node_modules/@rollup/pluginutils": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz", - "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", + "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", "dev": true, "dependencies": { "@types/estree": "^1.0.0", @@ -1236,7 +1243,7 @@ "node": ">=14.0.0" }, "peerDependencies": { - "rollup": "^1.20.0||^2.0.0||^3.0.0" + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" }, "peerDependenciesMeta": { "rollup": { @@ -5305,6 +5312,21 @@ "fsevents": "~2.3.2" } }, + "node_modules/rollup-plugin-import-css": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-import-css/-/rollup-plugin-import-css-3.5.0.tgz", + "integrity": "sha512-JOVow6n00qt2C/NnsqPmIjFOfxIAudwWqC5SaC84CodMGiMFaP1gPAdgnJ8g8hcG+P85TCYp2kI98grYCEt5pg==", + "dev": true, + "dependencies": { + "@rollup/pluginutils": "^5.0.4" + }, + "engines": { + "node": ">=16" + }, + "peerDependencies": { + "rollup": "^2.x.x || ^3.x.x || ^4.x.x" + } + }, "node_modules/rollup-plugin-peer-deps-external": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/rollup-plugin-peer-deps-external/-/rollup-plugin-peer-deps-external-2.2.4.tgz", @@ -6805,6 +6827,11 @@ "resolved": "https://registry.npmjs.org/@files-ui/core/-/core-2.0.6.tgz", "integrity": "sha512-+odVQIHyX6w/TMP/X/qYwcN9eFzkqmKfgUblkTtU2cJ0YRKc67KgRvy+BnH77+u28bFmdWAeB6wbDoC7CFLnnw==" }, + "@fontsource/poppins": { + "version": "5.0.14", + "resolved": "https://registry.npmjs.org/@fontsource/poppins/-/poppins-5.0.14.tgz", + "integrity": "sha512-nmM1zpPo3Uh4JcGAVSQuWaZNYh2FbbwWhZ5t6hRaynmJaNTBW85d3nEh9zMmzI0HX7X5xqQVdRHeDatKpOGsnA==" + }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -7237,9 +7264,9 @@ } }, "@rollup/pluginutils": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz", - "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", + "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", "dev": true, "requires": { "@types/estree": "^1.0.0", @@ -10297,6 +10324,15 @@ "fsevents": "~2.3.2" } }, + "rollup-plugin-import-css": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-import-css/-/rollup-plugin-import-css-3.5.0.tgz", + "integrity": "sha512-JOVow6n00qt2C/NnsqPmIjFOfxIAudwWqC5SaC84CodMGiMFaP1gPAdgnJ8g8hcG+P85TCYp2kI98grYCEt5pg==", + "dev": true, + "requires": { + "@rollup/pluginutils": "^5.0.4" + } + }, "rollup-plugin-peer-deps-external": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/rollup-plugin-peer-deps-external/-/rollup-plugin-peer-deps-external-2.2.4.tgz",