@onereach/styles 7.1.2-beta.4556.0 → 7.1.2-beta.4564.0

package/main-v3.css

@@ -2,8 +2,8 @@
 @import "tailwindcss/components.css";
 @import "tailwindcss/utilities.css";
 
-@import "font.css";
 @import "tokens-v3.css";
+@import "font.css";
 @import "scrollbar.css";
 
 @import "base.layer.css";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/styles",
-  "version": "7.1.2-beta.4556.0",
+  "version": "7.1.2-beta.4564.0",
   "description": "Styles for or-ui-next",
   "license": "UNLICENSED",
   "main": "./main.css",
@@ -29,13 +29,13 @@
   ],
   "scripts": {
     "dev": "pnpm build:scss -- --watch",
-    "build": "npm-run-all build:tokens build:scss build:autoprefixer build:cleancss build:tokens:css build:tokens:cssv3 build:resolve-config",
+    "build": "npm-run-all build:tokens build:scss build:autoprefixer build:cleancss build:tokens:css build:tokens:css:v3 build:resolve-config",
     "build:scss": "sass --embed-source-map ./src/main.scss dist/index.css",
     "build:cleancss": "cleancss -o dist/index.min.css dist/index.css",
     "build:autoprefixer": "npx postcss --use autoprefixer --map false --output dist/index.css dist/index.css",
     "build:tokens": "pnpm json-to-scss",
     "build:tokens:css": "node ./utils/makeCssVaribales.js",
-    "build:tokens:cssv3": "node ./utils/makeCssVaribalesV3.js",
+    "build:tokens:css:v3": "node ./utils/makeCssVariablesV3.js",
     "build:resolve-config": "node ./scripts/resolveConfig.js",
     "lint": "stylelint '**/*.scss'",
     "fix": "stylelint --fix '**/*.scss'",

package/tailwind/utils.js

@@ -122,7 +122,7 @@ module.exports = {
       }), {});
   },
 
-  parseColorTokensToVars(designTokens, colorGroups) {
+  parseColorTokensNames(designTokens, colorGroups) {
     const prefix = 'or-c';
     const isBackground = (name) => /\b(?:container|background|surface)\b/.test(name) && !isText(name);
     const isText = (name) => /\b(?:on)\b/.test(name);
@@ -149,7 +149,8 @@ module.exports = {
         const { name, theme } = token.name.match(/^(?:(?<theme>light|dark)-)?(?<name>.+)$/).groups;
 
         return {
-          name: `${name}${theme ? `-${theme}` : ''}`,
+          // name: `${name}${theme ? `-${theme}` : ''}`, we skip 'light' postfix now
+          name: `${name}${theme && theme !== 'light' ? `-${theme}` : ''}`,
           group: defineColorGroup(name),
           color: `var(--${prefix}-${name}${theme ? `-${theme}` : ''})`,
         };
@@ -162,15 +163,15 @@ module.exports = {
     }, {});
 
     // Add default colors
-    Object.keys(colorMap).forEach((color) => {
-      const colorParts = color.split('-');
-      if (colorParts.length > 1) {
-        const defaultColor = colorParts.slice(0, -1).join('-');
-        if (!colorMap[defaultColor]) {
-          colorMap[defaultColor] = `var(--${prefix}-${defaultColor})`;
-        }
-      }
-    });
+    // Object.keys(colorMap).forEach((color) => {
+    //   const colorParts = color.split('-');
+    //   if (colorParts.length > 1) {
+    //     const defaultColor = colorParts.slice(0, -1).join('-');
+    //     if (!colorMap[defaultColor]) {
+    //       colorMap[defaultColor] = `var(--${prefix}-${defaultColor})`;
+    //     }
+    //   }
+    // });
 
     return colorMap;
   },

package/tailwind.config.js

@@ -9,6 +9,6 @@ module.exports = {
     './node_modules/@onereach/ui-components/dist/auto/**/*.{vue,js,ts,jsx,tsx}',
   ],
   presets: [
-    require('@onereach/styles/tailwind.config.tokens.preset.js'),
+    require('@onereach/styles/tailwind.config.preset.js'),
   ],
 };