Skip to content
Closed
Show file tree
Hide file tree
Changes from 16 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
packages/@spectrum-icons/color/**
packages/@spectrum-icons/ui/**
packages/@spectrum-icons/workflow/**
packages/@adobe/spectrum-css/**
node_modules
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ module.exports = {
ERROR,
{
ignore: [
'@adobe/spectrum-css-temp',
'@adobe/spectrum-css',
'@react/react-spectrum',
'@spectrum-icons/ui',
'@spectrum-icons/workflow'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ storybook-static

#allow
!.storybook-v3/lib
!packages/**/dist
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pay attention, needed for spectrum-css, not necessarily anything else, 🤷‍♂ ?

18 changes: 12 additions & 6 deletions .storybook-v3/constants.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
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';
// eslint-disable-next-line monorepo/no-internal-import
import themeLight from '@adobe/spectrum-css/dist/vars/spectrum-light-unique.css';
// eslint-disable-next-line monorepo/no-internal-import
import themeLightest from '@adobe/spectrum-css/dist/vars/spectrum-lightest-unique.css';
// eslint-disable-next-line monorepo/no-internal-import
import themeDark from '@adobe/spectrum-css/dist/vars/spectrum-dark-unique.css';
// eslint-disable-next-line monorepo/no-internal-import
import themeDarkest from '@adobe/spectrum-css/dist/vars/spectrum-darkest-unique.css';
// eslint-disable-next-line monorepo/no-internal-import
import scaleMedium from '@adobe/spectrum-css/dist/vars/spectrum-medium-unique.css';
// eslint-disable-next-line monorepo/no-internal-import
import scaleLarge from '@adobe/spectrum-css/dist/vars/spectrum-large-unique.css';

const THEME = {
light: themeLight,
Expand Down
10 changes: 5 additions & 5 deletions .storybook-v3/custom-addons/chromatic/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, {useEffect, useState} from 'react';
import addons, { makeDecorator } from '@storybook/addons';
import {getQueryParams} from '@storybook/client-api';
import React from 'react';
import { makeDecorator } from '@storybook/addons';
import {Provider} from '@react-spectrum/provider';
import Heading from '@react/react-spectrum/Heading';
import {themes, scales, locales} from '../../constants';
import './styles.css';

export const withChromaticProvider = makeDecorator({
name: 'withChromaticProvider',
Expand All @@ -16,8 +16,8 @@ export const withChromaticProvider = makeDecorator({
return (
<div style={{height}}>
{(options.colorSchemes || Object.keys(themes)).map(colorScheme =>
(options.scales || Object.keys(scales)).map(scale =>
(colorScheme === 'light' ? selectedLocales : ['en-US']).map(locale =>
(options.scales || Object.keys(scales)).map(scale =>
(colorScheme === 'light' ? selectedLocales : ['en-US']).map(locale =>
<Provider key={`${colorScheme}_${scale}_${locale}`} theme={themes[colorScheme]} colorScheme={colorScheme.replace(/est$/, '')} scale={scale} locale={locale} typekitId="pbi5ojv">
<Heading variant="subtitle3" style={{margin: 0, padding: '10px'}}>{`${colorScheme}, ${scale}, ${locale}`}</Heading>
{getStory(context)}
Expand Down
3 changes: 3 additions & 0 deletions .storybook-v3/custom-addons/chromatic/styles.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* {
transition-property: none !important;
}
6 changes: 3 additions & 3 deletions .storybook-v3/lib/vars.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(`@adobe/spectrum-css/dist/vars/spectrum-${theme}-unique.css`));
let mappings = getUniqueVars(values);
themeVars[theme] = {values, mappings};
}
Expand Down Expand Up @@ -110,9 +110,9 @@ function getVariableMappings(themes) {
return {mapping, vars, static};
}

let themes = getVariableMappings(['dark', 'darkest', 'light', 'lightest', 'middark', 'midlight']);
let themes = getVariableMappings(['dark', 'darkest', 'light', 'lightest']);
let scales = getVariableMappings(['large', 'medium']);
let globals = getVars('packages/@adobe/spectrum-css-temp/vars/spectrum-global.css');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're using individually versioned components, you can refer to @spectum-css/vars/dist/spectrum-global.css. It won't be as paired down as the -unique, but it will have all the variables that a newly added component may use. If you use -unique, you'll only ever get the variables used by the versions of the components that are specifically in that bundle release. If you add a new component or update a component to a version greater than what is in the bundle you're referencing, you might have missing variables.

let globals = getVars(require.resolve('@adobe/spectrum-css/dist/vars/spectrum-global-unique.css'));

exports.themes = themes.vars;
exports.scales = scales.vars;
Expand Down
4 changes: 2 additions & 2 deletions .storybook-v3/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ module.exports = ({config}, env) => {
include: path.resolve(__dirname, '../')
},
{
test: /packages\/.*\.css$/,
test: [/packages\/.*\.css$/, /@spectrum-css\/.*\.css$/, /@adobe\/spectrum-css\/.*\.css$/],
use: [
'style-loader',
{
Expand All @@ -95,7 +95,7 @@ module.exports = ({config}, env) => {
test: /\.css$/,
loaders: ['style-loader', 'css-loader'],
include: path.resolve(__dirname, '../'),
exclude: /packages\/.*\.css$/
exclude: [/packages\/.*\.css$/, /@spectrum-css\/.*\.css$/, /@adobe\/spectrum-css\/.*\.css$/]
},
{
test: /\.(ttf|woff|woff2|svg|gif|cur|eot|png|jpg)(\?[a-f0-9]{32})?$/,
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@
"chromatic": "CHROMATIC_APP_CODE=k5oflhpwx98 chromatic test --build-script-name build-storybook"
},
"workspaces": [
"packages/*/*"
"packages/*/*",
"packages/*/*/*"
],
"devDependencies": {
"@actions/core": "^1.1.0",
"@actions/github": "^1.1.0",
"@adobe/spectrum-css": "^2.14.0",
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/node": "^7.4.5",
Expand Down
147 changes: 0 additions & 147 deletions packages/@adobe/spectrum-css-temp/components/accordion/index.css

This file was deleted.

65 changes: 0 additions & 65 deletions packages/@adobe/spectrum-css-temp/components/accordion/skin.css

This file was deleted.

This file was deleted.

15 changes: 0 additions & 15 deletions packages/@adobe/spectrum-css-temp/components/actionmenu/index.css

This file was deleted.

This file was deleted.

Loading