From 1e100c26c6ec5d87efb2ab44d24ffc2084ff6899 Mon Sep 17 00:00:00 2001 From: Vendeville Antoine Date: Tue, 26 Jul 2022 18:11:02 +0200 Subject: [PATCH] build(@vtmn/svelte): switch to postcss --- packages/sources/svelte/package.json | 19 ++++---- packages/sources/svelte/rollup.config.js | 23 ++++++++- yarn.lock | 61 +++++++++++++++++------- 3 files changed, 75 insertions(+), 28 deletions(-) diff --git a/packages/sources/svelte/package.json b/packages/sources/svelte/package.json index d71eaf963b..01979e3a83 100644 --- a/packages/sources/svelte/package.json +++ b/packages/sources/svelte/package.json @@ -31,7 +31,10 @@ "test": "jest src", "test:watch": "npm run test -- --watch" }, - "dependencies": { + "devDependencies": { + "@rollup/plugin-node-resolve": "^13.1.2", + "@testing-library/jest-dom": "^5.16.2", + "@testing-library/svelte": "^3.0.3", "@vtmn/css-accordion": "^0.5.0", "@vtmn/css-alert": "^0.8.2", "@vtmn/css-badge": "^0.13.0", @@ -64,20 +67,18 @@ "@vtmn/css-toast": "^0.7.2", "@vtmn/css-toggle": "^0.8.2", "@vtmn/css-tooltip": "^0.8.2", - "@vtmn/icons": "^0.14.0" - }, - "devDependencies": { - "@rollup/plugin-node-resolve": "^13.1.2", - "@testing-library/jest-dom": "^5.16.2", - "@testing-library/svelte": "^3.0.3", + "@vtmn/icons": "^0.14.0", "babel-jest": "^28.1.0", "chokidar-cli": "^3.0.0", "eslint": "8.18.0", "eslint-plugin-svelte3": "4.0.0", "jest": "^28.1.0", "jest-environment-jsdom": "^28.1.0", + "postcss": "^8.4.14", + "postcss-import": "^14.1.0", + "postcss-url": "^10.1.3", "rollup": "^2.73.0", - "rollup-plugin-css-only": "^3.1.0", + "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-svelte": "^7.1.0", "svelte": "3.49.0", "svelte-jester": "^2.3.2", @@ -109,7 +110,7 @@ "url": "http://www.apache.org/licenses/LICENSE-2.0" } ], - "main": "src/index.js", + "main": "dist/", "svelte": "src/index.js", "babel": { "presets": [ diff --git a/packages/sources/svelte/rollup.config.js b/packages/sources/svelte/rollup.config.js index dbe91be8d1..8001fea5ed 100644 --- a/packages/sources/svelte/rollup.config.js +++ b/packages/sources/svelte/rollup.config.js @@ -1,7 +1,12 @@ import resolve from '@rollup/plugin-node-resolve'; -import css from 'rollup-plugin-css-only'; import svelte from 'rollup-plugin-svelte'; import sveltePreprocess from 'svelte-preprocess'; +import postcss from 'rollup-plugin-postcss'; +import postcssImport from 'postcss-import'; +import postcssUrl from 'postcss-url'; +import fs from 'fs'; +import path from 'path'; + const preprocessOptions = require('./svelte.config').preprocessOptions; const src = { @@ -91,7 +96,21 @@ const svelteOptions = (component) => ({ svelte({ preprocess: sveltePreprocess(preprocessOptions), }), - css({ output: `${component}.css` }), + postcss({ + extract: `${component}.css`, + plugins: [ + postcssImport(), + postcssUrl({ + url: ({ url, absolutePath, pathname }) => { + const destinationPath = path.join(__dirname, 'dist', pathname); + if (!fs.existsSync(destinationPath)) { + fs.copyFileSync(absolutePath, destinationPath); + } + return pathname; + }, + }), + ], + }), resolve(), ], }); diff --git a/yarn.lock b/yarn.lock index 34ce757915..6dc5cbc7b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3304,14 +3304,6 @@ make-dir "^3.1.0" mime "^2.4.6" -"@rollup/pluginutils@4", "@rollup/pluginutils@^4.1.2", "@rollup/pluginutils@^4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d" - integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ== - dependencies: - estree-walker "^2.0.1" - picomatch "^2.2.2" - "@rollup/pluginutils@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" @@ -3321,6 +3313,14 @@ estree-walker "^1.0.1" picomatch "^2.2.2" +"@rollup/pluginutils@^4.1.2", "@rollup/pluginutils@^4.2.1": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d" + integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ== + dependencies: + estree-walker "^2.0.1" + picomatch "^2.2.2" + "@rushstack/eslint-patch@^1.1.0": version "1.1.4" resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.1.4.tgz#0c8b74c50f29ee44f423f7416829c0bf8bb5eb27" @@ -9653,6 +9653,11 @@ cubic2quad@^1.2.1: resolved "https://registry.yarnpkg.com/cubic2quad/-/cubic2quad-1.2.1.tgz#2442260b72c02ee4b6a2fe998fcc1c4073622286" integrity sha512-wT5Y7mO8abrV16gnssKdmIhIbA9wSkeMzhh27jAguKrV82i24wER0vL5TGhUJ9dbJNDcigoRZ0IAHFEEEI4THQ== +cuint@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b" + integrity sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw== + currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" @@ -15689,7 +15694,7 @@ make-dir@^2.0.0, make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" -make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: +make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0, make-dir@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== @@ -16121,6 +16126,11 @@ mime@^2.4.4, mime@^2.4.6: resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== +mime@~2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" + integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== + mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" @@ -16203,6 +16213,13 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" +minimatch@~3.0.4: + version "3.0.8" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1" + integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q== + dependencies: + brace-expansion "^1.1.7" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -18498,6 +18515,16 @@ postcss-unique-selectors@^5.1.1: dependencies: postcss-selector-parser "^6.0.5" +postcss-url@^10.1.3: + version "10.1.3" + resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-10.1.3.tgz#54120cc910309e2475ec05c2cfa8f8a2deafdf1e" + integrity sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw== + dependencies: + make-dir "~3.1.0" + mime "~2.5.2" + minimatch "~3.0.4" + xxhashjs "~0.2.2" + postcss-value-parser@^3.3.0: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" @@ -20159,19 +20186,12 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rollup-plugin-css-only@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-css-only/-/rollup-plugin-css-only-3.1.0.tgz#6a701cc5b051c6b3f0961e69b108a9a118e1b1df" - integrity sha512-TYMOE5uoD76vpj+RTkQLzC9cQtbnJNktHPB507FzRWBVaofg7KhIqq1kGbcVOadARSozWF883Ho9KpSPKH8gqA== - dependencies: - "@rollup/pluginutils" "4" - rollup-plugin-peer-deps-external@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/rollup-plugin-peer-deps-external/-/rollup-plugin-peer-deps-external-2.2.4.tgz#8a420bbfd6dccc30aeb68c9bf57011f2f109570d" integrity sha512-AWdukIM1+k5JDdAqV/Cxd+nejvno2FVLVeZ74NKggm3Q5s9cbbcOgUPGdbxPi4BXu7xGaZ8HG12F+thImYu/0g== -rollup-plugin-postcss@^4.0.0: +rollup-plugin-postcss@^4.0.0, rollup-plugin-postcss@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/rollup-plugin-postcss/-/rollup-plugin-postcss-4.0.2.tgz#15e9462f39475059b368ce0e49c800fa4b1f7050" integrity sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w== @@ -24007,6 +24027,13 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== +xxhashjs@~0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8" + integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw== + dependencies: + cuint "^0.2.2" + y18n@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"