Include vars from spectrum-css as well

Fix hold affordance class on buttons

Author: snowystinger

.eslintrc.js

@@ -246,7 +246,7 @@ module.exports = {
       ERROR,
       {
         ignore: [
-          '@adobe/spectrum-css-temp',
+          '@adobe/spectrum-css',
           '@react/react-spectrum',
           '@spectrum-icons/ui',
           '@spectrum-icons/workflow'

.storybook-v3/constants.js

@@ -1,9 +1,9 @@
-import themeLight from '@adobe/spectrum-css-temp/vars/spectrum-light-unique.css';
-import themeLightest from '@adobe/spectrum-css-temp/vars/spectrum-lightest-unique.css';
-import themeDark from '@adobe/spectrum-css-temp/vars/spectrum-dark-unique.css';
-import themeDarkest from '@adobe/spectrum-css-temp/vars/spectrum-darkest-unique.css';
-import scaleMedium from '@adobe/spectrum-css-temp/vars/spectrum-medium-unique.css';
-import scaleLarge from '@adobe/spectrum-css-temp/vars/spectrum-large-unique.css';
+import themeLight from '@spectrum-css/vars/dist/spectrum-light-unique.css';
+import themeLightest from '@spectrum-css/vars/dist/spectrum-lightest-unique.css';
+import themeDark from '@spectrum-css/vars/dist/spectrum-dark-unique.css';
+import themeDarkest from '@spectrum-css/vars/dist/spectrum-darkest-unique.css';
+import scaleMedium from '@spectrum-css/vars/dist/spectrum-medium-unique.css';
+import scaleLarge from '@spectrum-css/vars/dist/spectrum-large-unique.css';
 
 const THEME = {
   light: themeLight,

.storybook-v3/lib/vars.js

@@ -56,7 +56,7 @@ function getUniqueVars(vars) {
 function getVariableMappings(themes) {
   let themeVars = {};
   for (let theme of themes) {
-    let values = getVars(`packages/@adobe/spectrum-css-temp/vars/spectrum-${theme}.css`);
+    let values = getVars(require.resolve(`@spectrum-css/vars/dist/spectrum-${theme}.css`));
     let mappings = getUniqueVars(values);
     themeVars[theme] = {values, mappings};
   }
@@ -112,7 +112,7 @@ function getVariableMappings(themes) {
 
 let themes = getVariableMappings(['dark', 'darkest', 'light', 'lightest', 'middark', 'midlight']);
 let scales = getVariableMappings(['large', 'medium']);
-let globals = getVars('packages/@adobe/spectrum-css-temp/vars/spectrum-global.css');
+let globals = getVars(require.resolve('@spectrum-css/vars/dist/spectrum-global.css'));
 
 exports.themes = themes.vars;
 exports.scales = scales.vars;

package.json

@@ -21,7 +21,8 @@
     "chromatic": "CHROMATIC_APP_CODE=qx7a91v30wc chromatic test --build-script-name build-storybook"
   },
   "workspaces": [
-    "packages/*/*"
+    "packages/*/*",
+    "packages/*/*/*"
   ],
   "devDependencies": {
     "@actions/core": "^1.1.0",