Skip to content

Commit e55c503

Browse files
castastrophecastastrophe
committed
chore(storybook): update postcss config
1 parent c520dae commit e55c503

File tree

144 files changed

+2453
-5277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+2453
-5277
lines changed

‎.npmignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
/node_modules
44
/tasks
55
/temp
6-
/gulpfile.js
76
npm-debug.log
87
/.github
98
/dist/docs/

‎.storybook/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"homepage": "https://opensource.adobe.com/spectrum-css/preview",
88
"main": "main.js",
99
"scripts": {
10-
"build": "storybook build --config-dir . --output-dir ./storybook-static"
10+
"build": "storybook build --config-dir ."
1111
},
1212
"dependencies": {
1313
"@adobe/spectrum-css-workflow-icons": "^1.5.4",
@@ -21,24 +21,24 @@
2121
"@babel/core": "^7.22.1",
2222
"@chromaui/addon-visual-tests": "^0.0.124",
2323
"@etchteam/storybook-addon-status": "^4.2.4",
24-
"@spectrum-css/component-builder": "^4.0.19",
25-
"@spectrum-css/component-builder-simple": "^3.0.2",
2624
"@storybook/addon-a11y": "^7.5.1",
2725
"@storybook/addon-actions": "^7.5.1",
2826
"@storybook/addon-console": "^1.2.3",
2927
"@storybook/addon-docs": "^7.5.1",
30-
"@storybook/addon-essentials": "^7.0.20",
28+
"@storybook/addon-essentials": "^7.5.1",
3129
"@storybook/addon-interactions": "^7.5.1",
30+
"@storybook/addons": "^7.5.1",
3231
"@storybook/api": "^7.5.1",
33-
"@storybook/blocks": "^7.0.20",
32+
"@storybook/blocks": "^7.5.1",
3433
"@storybook/client-api": "^7.5.1",
35-
"@storybook/components": "^7.0.20",
36-
"@storybook/core-events": "^7.0.20",
34+
"@storybook/client-logger": "^7.5.1",
35+
"@storybook/components": "^7.5.1",
36+
"@storybook/core-events": "^7.5.1",
3737
"@storybook/jest": "^0.2.3",
38-
"@storybook/manager-api": "^7.0.20",
39-
"@storybook/preview-api": "^7.0.20",
38+
"@storybook/manager-api": "^7.5.1",
39+
"@storybook/preview-api": "^7.5.1",
4040
"@storybook/testing-library": "^0.2.2",
41-
"@storybook/theming": "^7.0.20",
41+
"@storybook/theming": "^7.5.1",
4242
"@storybook/web-components-webpack5": "^7.5.1",
4343
"@whitespace/storybook-addon-html": "^5.1.6",
4444
"chromatic": "^7.0.0",

‎.storybook/postcss.config.js

Lines changed: 12 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
const { resolve, basename } = require("path");
22
const { existsSync } = require("fs");
3-
const warnCleaner = require("postcss-warn-cleaner");
4-
5-
const simpleBuilder = require("@spectrum-css/component-builder-simple/css/postcss.plugins.js");
6-
const legacyBuilder = require("@spectrum-css/component-builder/css/postcss.plugins.js");
73

84
/**
95
* Determines the package name from a file path
@@ -15,11 +11,12 @@ function getPackageFromPath(filePath) {
1511
}
1612

1713
module.exports = (ctx) => {
18-
let plugins = [];
19-
const componentPath = resolve(__dirname, "../components");
20-
/** @todo put together a more robust fallback determination */
14+
const plugins = [
15+
require("postcss-import")()
16+
];
17+
18+
/** @todo put together a more robust fallback determination */
2119
const folderName = getPackageFromPath(ctx.file) ?? "tokens";
22-
const pkgPath = resolve(componentPath, folderName, "package.json");
2320

2421
/**
2522
* For our token libraries, include a little extra parsing to allow duplicate
@@ -33,8 +30,7 @@ module.exports = (ctx) => {
3330
.replace("global", "")
3431
: "";
3532

36-
plugins = [
37-
require("postcss-import")(),
33+
plugins.push(
3834
require("postcss-selector-replace")({
3935
before: [":root"],
4036
after: [
@@ -43,8 +39,10 @@ module.exports = (ctx) => {
4339
}${!isExpress && !modifier ? ".spectrum" : ""}`,
4440
],
4541
}),
46-
...(isExpress
47-
? [
42+
);
43+
44+
if (isExpress) {
45+
plugins.push(
4846
require("postcss-prefix-selector")({
4947
prefix: ".spectrum--express",
5048
transform(_prefix, selector, prefixedSelector) {
@@ -53,44 +51,15 @@ module.exports = (ctx) => {
5351
return prefixedSelector.replace(" ", "");
5452
},
5553
}),
56-
]
57-
: []),
58-
];
59-
} else if (existsSync(pkgPath)) {
60-
/**
61-
* If a path has a package.json, we can assume it's a component and
62-
* we want to leverage the correct plugins for it.
63-
*/
64-
const {
65-
peerDependencies = {},
66-
devDependencies = {},
67-
dependencies = {}
68-
} = require(pkgPath);
69-
70-
const deps = [...new Set([
71-
...Object.keys(peerDependencies),
72-
...Object.keys(dependencies),
73-
...Object.keys(devDependencies),
74-
])];
75-
76-
if (
77-
deps.includes("@spectrum-css/vars")
78-
) {
79-
plugins.push(...legacyBuilder.plugins);
80-
} else {
81-
if (ctx.file.split("/").includes("themes")) {
82-
plugins.push(...simpleBuilder.getPlugins({ noSelectors: false }));
83-
} else {
84-
plugins.push(...simpleBuilder.plugins);
85-
}
54+
);
8655
}
8756
}
8857

8958
/**
9059
* For storybook, add a tool to suppress unnecessary warnings
9160
*/
9261
plugins.push(
93-
warnCleaner({
62+
require("postcss-warn-cleaner")({
9463
ignoreFiles: "**/*.css",
9564
})
9665
);

‎.storybook/project.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"implicitDependencies": [
1111
"@spectrum-css/*",
1212
"!@spectrum-css/generator",
13-
"!@spectrum-css/bundle-builder",
1413
"!@spectrum-css/component-builder",
1514
"!@spectrum-css/component-builder-simple"
1615
],

‎components/accordion/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
"@spectrum-css/icon": ">=4",
1919
"@spectrum-css/tokens": ">=13"
2020
},
21+
"devDependencies": {
22+
"@spectrum-css/component-builder-simple": "^3.0.2"
23+
},
2124
"publishConfig": {
2225
"access": "public"
2326
}

‎components/actionbar/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
"@spectrum-css/popover": ">=6",
2222
"@spectrum-css/tokens": ">=13"
2323
},
24+
"devDependencies": {
25+
"@spectrum-css/component-builder-simple": "^3.0.2"
26+
},
2427
"publishConfig": {
2528
"access": "public"
2629
}

‎components/actionbutton/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
}
2525
},
2626
"devDependencies": {
27-
"@spectrum-css/commons": "^9.0.1"
27+
"@spectrum-css/commons": "^9.0.1",
28+
"@spectrum-css/component-builder-simple": "^3.0.2"
2829
},
2930
"publishConfig": {
3031
"access": "public"

‎components/actiongroup/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
"optional": true
2424
}
2525
},
26+
"devDependencies": {
27+
"@spectrum-css/component-builder-simple": "^3.0.2"
28+
},
2629
"publishConfig": {
2730
"access": "public"
2831
}

‎components/actionmenu/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
"@spectrum-css/popover": ">=6",
2222
"@spectrum-css/tokens": ">=13"
2323
},
24+
"devDependencies": {
25+
"@spectrum-css/component-builder-simple": "^3.0.2"
26+
},
2427
"publishConfig": {
2528
"access": "public"
2629
}

‎components/alertbanner/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
"optional": true
2727
}
2828
},
29+
"devDependencies": {
30+
"@spectrum-css/component-builder-simple": "^3.0.2"
31+
},
2932
"publishConfig": {
3033
"access": "public"
3134
}

‎components/alertdialog/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
"optional": true
3131
}
3232
},
33+
"devDependencies": {
34+
"@spectrum-css/component-builder-simple": "^3.0.2"
35+
},
3336
"publishConfig": {
3437
"access": "public"
3538
}

‎components/asset/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
"peerDependencies": {
1818
"@spectrum-css/vars": ">=9"
1919
},
20+
"devDependencies": {
21+
"@spectrum-css/component-builder": "^4.0.19"
22+
},
2023
"publishConfig": {
2124
"access": "public"
2225
}

‎components/assetcard/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
"optional": true
2424
}
2525
},
26+
"devDependencies": {
27+
"@spectrum-css/component-builder-simple": "^3.0.2"
28+
},
2629
"publishConfig": {
2730
"access": "public"
2831
}

‎components/assetlist/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
"optional": true
2828
}
2929
},
30+
"devDependencies": {
31+
"@spectrum-css/component-builder-simple": "^3.0.2"
32+
},
3033
"publishConfig": {
3134
"access": "public"
3235
}

‎components/avatar/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
"peerDependencies": {
1818
"@spectrum-css/tokens": ">=13"
1919
},
20+
"devDependencies": {
21+
"@spectrum-css/component-builder-simple": "^3.0.2"
22+
},
2023
"publishConfig": {
2124
"access": "public"
2225
}

‎components/badge/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
"optional": true
2424
}
2525
},
26+
"devDependencies": {
27+
"@spectrum-css/component-builder-simple": "^3.0.2"
28+
},
2629
"publishConfig": {
2730
"access": "public"
2831
}

‎components/breadcrumb/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
"optional": true
2828
}
2929
},
30+
"devDependencies": {
31+
"@spectrum-css/component-builder-simple": "^3.0.2"
32+
},
3033
"publishConfig": {
3134
"access": "public"
3235
}

‎components/button/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
}
2525
},
2626
"devDependencies": {
27-
"@spectrum-css/commons": "^9.0.1"
27+
"@spectrum-css/commons": "^9.0.1",
28+
"@spectrum-css/component-builder-simple": "^3.0.2"
2829
},
2930
"publishConfig": {
3031
"access": "public"

‎components/buttongroup/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
"@spectrum-css/button": ">=11",
1919
"@spectrum-css/tokens": ">=13"
2020
},
21+
"devDependencies": {
22+
"@spectrum-css/component-builder-simple": "^3.0.2"
23+
},
2124
"publishConfig": {
2225
"access": "public"
2326
}

‎components/calendar/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
"@spectrum-css/actionbutton": ">=5",
1919
"@spectrum-css/tokens": ">=13"
2020
},
21+
"devDependencies": {
22+
"@spectrum-css/component-builder-simple": "^3.0.2"
23+
},
2124
"publishConfig": {
2225
"access": "public"
2326
}

‎components/card/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
"optional": true
4343
}
4444
},
45+
"devDependencies": {
46+
"@spectrum-css/component-builder-simple": "^3.0.2"
47+
},
4548
"publishConfig": {
4649
"access": "public"
4750
}

‎components/checkbox/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
"@spectrum-css/icon": ">=4",
1919
"@spectrum-css/tokens": ">=13"
2020
},
21+
"devDependencies": {
22+
"@spectrum-css/component-builder-simple": "^3.0.2"
23+
},
2124
"publishConfig": {
2225
"access": "public"
2326
}

‎components/clearbutton/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
"@spectrum-css/icon": ">=4",
1919
"@spectrum-css/tokens": ">=13"
2020
},
21+
"devDependencies": {
22+
"@spectrum-css/component-builder-simple": "^3.0.2"
23+
},
2124
"publishConfig": {
2225
"access": "public"
2326
}

‎components/closebutton/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
"@spectrum-css/tokens": ">=13"
2020
},
2121
"devDependencies": {
22-
"@spectrum-css/commons": "^9.0.1"
22+
"@spectrum-css/commons": "^9.0.1",
23+
"@spectrum-css/component-builder-simple": "^3.0.2"
2324
},
2425
"publishConfig": {
2526
"access": "public"

‎components/coachindicator/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
"peerDependencies": {
1818
"@spectrum-css/tokens": ">=13"
1919
},
20+
"devDependencies": {
21+
"@spectrum-css/component-builder-simple": "^3.0.2"
22+
},
2023
"publishConfig": {
2124
"access": "public"
2225
}

‎components/coachmark/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
"optional": true
2929
}
3030
},
31+
"devDependencies": {
32+
"@spectrum-css/component-builder-simple": "^3.0.2"
33+
},
3134
"publishConfig": {
3235
"access": "public"
3336
}

‎components/colorarea/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
"@spectrum-css/colorhandle": ">=7",
1919
"@spectrum-css/tokens": ">=13"
2020
},
21+
"devDependencies": {
22+
"@spectrum-css/component-builder-simple": "^3.0.2"
23+
},
2124
"publishConfig": {
2225
"access": "public"
2326
}

‎components/colorhandle/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
"optional": true
2525
}
2626
},
27+
"devDependencies": {
28+
"@spectrum-css/component-builder-simple": "^3.0.2"
29+
},
2730
"publishConfig": {
2831
"access": "public"
2932
}

0 commit comments

Comments
 (0)