From 7d9f4ad103441a588de7c801a9a08283849a3ec7 Mon Sep 17 00:00:00 2001 From: Tushar Choudhari <33191895+chtushar@users.noreply.github.com> Date: Sun, 12 Dec 2021 00:49:08 +0530 Subject: [PATCH 1/3] :sparkles: Update script to build scss files along css files --- .gitignore | 1 + package.json | 4 ++-- scripts/build-css-modules.js | 17 ----------------- scripts/build-stylesheets.js | 29 +++++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 19 deletions(-) delete mode 100644 scripts/build-css-modules.js create mode 100644 scripts/build-stylesheets.js diff --git a/.gitignore b/.gitignore index 508583c..4318b1f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ /types .DS_Store /*.css +/*.scss index.js index.mjs diff --git a/package.json b/package.json index 5cb0032..c2534af 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,8 @@ "module": "index.mjs", "types": "types/index.d.ts", "scripts": { - "build": "yarn clean && yarn && rollup -c && yarn build-css-modules", - "build-css-modules": "node ./scripts/build-css-modules.js", + "build": "yarn clean && yarn && rollup -c && yarn build-stylesheets", + "build-stylesheets": "node ./scripts/build-stylesheets.js", "postpublish": "yarn clean", "clean": "git clean -fdX" }, diff --git a/scripts/build-css-modules.js b/scripts/build-css-modules.js deleted file mode 100644 index f3b7031..0000000 --- a/scripts/build-css-modules.js +++ /dev/null @@ -1,17 +0,0 @@ -const fs = require('fs'); -const path = require('path'); -const allColorScales = require('../index'); - -const outputDir = require('../tsconfig.json').compilerOptions.outDir; - -Object.entries(allColorScales).forEach(([colorScaleName, scale]) => { - const selector = /DarkA?$/.test(colorScaleName) ? '.dark-theme' : ':root'; - const scaleAssCssProperties = Object.entries(scale) - .map(([name, value]) => ` --${name}: ${value};`) - .join('\n'); - const scaleAsCssFile = `${selector} {\n${scaleAssCssProperties}\n}`; - fs.writeFileSync( - path.join(outputDir, colorScaleName + '.css'), - scaleAsCssFile - ); -}); diff --git a/scripts/build-stylesheets.js b/scripts/build-stylesheets.js new file mode 100644 index 0000000..058a1bf --- /dev/null +++ b/scripts/build-stylesheets.js @@ -0,0 +1,29 @@ +const fs = require("fs"); +const path = require("path"); +const allColorScales = require("../index"); + +const outputDir = require("../tsconfig.json").compilerOptions.outDir; + +Object.entries(allColorScales).forEach(([colorScaleName, scale]) => { + const selector = /DarkA?$/.test(colorScaleName) ? ".dark-theme" : ":root"; + + // Building css modules + const scaleAsCssProperties = Object.entries(scale) + .map(([name, value]) => ` --${name}: ${value};`) + .join("\n"); + const scaleAsCssFile = `${selector} {\n${scaleAsCssProperties}\n}`; + fs.writeFileSync( + path.join(outputDir, colorScaleName + ".css"), + scaleAsCssFile + ); + + // Building scss modules + const scaleAsScssProperties = Object.entries(scale) + .map(([name, value]) => ` $${name}: ${value};`) + .join("\n"); + const scaleAsScssFile = `${selector} {\n${scaleAsScssProperties}\n}`; + fs.writeFileSync( + path.join(outputDir, colorScaleName + ".scss"), + scaleAsScssFile + ); +}); From fb8c5c46e09a0eb760380d7e8923926772a8ff57 Mon Sep 17 00:00:00 2001 From: Tushar Choudhari <33191895+chtushar@users.noreply.github.com> Date: Sun, 12 Dec 2021 14:39:38 +0530 Subject: [PATCH 2/3] :bookmark: Version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c2534af..210e541 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@radix-ui/colors", - "version": "0.1.8", + "version": "0.1.9", "contributors": [ "Colm Tuite ", "Vlad Moroz " From 499d4897b3aafd6fdf8ca16770100812015d8d00 Mon Sep 17 00:00:00 2001 From: Tushar Choudhari <33191895+chtushar@users.noreply.github.com> Date: Mon, 13 Dec 2021 22:56:59 +0530 Subject: [PATCH 3/3] :fire: Remove :root selector for the scss builds --- scripts/build-stylesheets.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/build-stylesheets.js b/scripts/build-stylesheets.js index 058a1bf..ba27ab7 100644 --- a/scripts/build-stylesheets.js +++ b/scripts/build-stylesheets.js @@ -5,13 +5,14 @@ const allColorScales = require("../index"); const outputDir = require("../tsconfig.json").compilerOptions.outDir; Object.entries(allColorScales).forEach(([colorScaleName, scale]) => { - const selector = /DarkA?$/.test(colorScaleName) ? ".dark-theme" : ":root"; + const isDarkScale = /DarkA?$/.test(colorScaleName); // Building css modules + const selectorForCSS = isDarkScale ? ".dark-theme" : ":root"; const scaleAsCssProperties = Object.entries(scale) .map(([name, value]) => ` --${name}: ${value};`) .join("\n"); - const scaleAsCssFile = `${selector} {\n${scaleAsCssProperties}\n}`; + const scaleAsCssFile = `${selectorForCSS} {\n${scaleAsCssProperties}\n}`; fs.writeFileSync( path.join(outputDir, colorScaleName + ".css"), scaleAsCssFile @@ -21,7 +22,9 @@ Object.entries(allColorScales).forEach(([colorScaleName, scale]) => { const scaleAsScssProperties = Object.entries(scale) .map(([name, value]) => ` $${name}: ${value};`) .join("\n"); - const scaleAsScssFile = `${selector} {\n${scaleAsScssProperties}\n}`; + const scaleAsScssFile = isDarkScale + ? `.dark-theme {\n${scaleAsScssProperties}\n}` + : scaleAsScssProperties; fs.writeFileSync( path.join(outputDir, colorScaleName + ".scss"), scaleAsScssFile