Skip to content

Commit 352e9e7

Browse files
castastrophecastastrophe
committed
build: single postcss entry point
1 parent 98f83b7 commit 352e9e7

File tree

433 files changed

+4536
-11614
lines changed

Some content is hidden

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

433 files changed

+4536
-11614
lines changed

‎.github/workflows/development.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
# -------------------------------------------------------------
139139
vrt:
140140
name: Testing
141-
if: ${{ contains(github.event.pull_request.labels.*.name, 'run_vrt') || ((github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'run_ci')) && github.event.pull_request.mergeable == true) }}
141+
if: github.event.pull_request.base.ref != 'spectrum-two' && (contains(github.event.pull_request.labels.*.name, 'run_vrt') || ((github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'run_ci')) && github.event.pull_request.mergeable == true))
142142
uses: ./.github/workflows/vrt.yml
143143
with:
144144
skip: ${{ contains(github.event.pull_request.labels.*.name, 'skip_vrt') }}

‎.github/workflows/publish-site.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ jobs:
9393
- name: Deploy
9494
uses: nwtgck/actions-netlify@v2
9595
with:
96-
# publish-dir: site/dist
97-
publish-dir: dist
96+
publish-dir: site/dist
9897
production-branch: main
9998
production-deploy: false
10099
netlify-config-path: ./netlify.toml

‎.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/main.js

Lines changed: 48 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { resolve } = require("path");
1+
const { join, dirname, resolve } = require("path");
22
const { readdirSync } = require("fs");
33

44
const componentsPath = resolve(__dirname, "../components");
@@ -7,6 +7,7 @@ const componentPkgs = readdirSync(componentsPath, {
77
})
88
.filter((dirent) => dirent.isDirectory())
99
.map((dirent) => dirent.name);
10+
1011
module.exports = {
1112
stories: [
1213
"../components/*/stories/*.stories.js",
@@ -48,15 +49,18 @@ module.exports = {
4849
env: {
4950
MIGRATED_PACKAGES: componentPkgs.filter((dir) => {
5051
const {
51-
devDependencies = {},
52-
} = require(resolve(componentsPath, dir, "package.json"));
53-
if (
54-
devDependencies &&
55-
devDependencies["@spectrum-css/component-builder-simple"]
56-
) {
57-
return true;
58-
}
59-
return false;
52+
peerDependencies = {}
53+
} = require(
54+
`@spectrum-css/${dir}/package.json`
55+
) ?? {};
56+
return Boolean(peerDependencies["@spectrum-css/tokens"]);
57+
}),
58+
VERSIONS: componentPkgs.reduce((currObj, dir) => {
59+
const { version } = require(
60+
`@spectrum-css/${dir}/package.json`
61+
) ?? {};
62+
currObj[dir] = version;
63+
return currObj;
6064
}),
6165
},
6266
webpackFinal: function (config) {
@@ -66,50 +70,42 @@ module.exports = {
6670

6771
// Parse out any storybook rules for CSS so we can replace them with our own
6872
const storybookRules =
69-
config && config.module && config.module.rules
73+
config?.module?.rules
7074
? config.module.rules.filter(
7175
(rule) => !(rule.test && rule.test.toString().includes("css"))
7276
)
7377
: [];
78+
7479
return {
7580
...config,
76-
stats: {
77-
/* Suppress autoprefixer warnings from storybook build */
78-
warningsFilter: [/autoprefixer: /],
79-
},
80-
/* Add support for root node_modules imports */
81+
ignoreWarnings: [
82+
...config.ignoreWarnings ?? [],
83+
/autoprefixer: /
84+
],
8185
resolve: {
82-
...(config.resolve ? config.resolve : {}),
86+
...(config.resolve ?? {}),
8387
modules: [
84-
...(config.resolve ? config.resolve.modules : []),
88+
...(config.resolve?.modules ?? []),
89+
/* Add support for root node_modules imports */
8590
resolve(__dirname, "../node_modules"),
8691
],
8792
alias: {
88-
...(config.resolve ? config.resolve.alias : {}),
93+
...(config.resolve?.alias ?? {}),
8994
...componentPkgs.reduce((pkgs, dir) => {
90-
const pkg = require(resolve(componentsPath, dir, "package.json"));
91-
pkgs[pkg.name] = resolve(componentsPath, dir);
95+
const { name } = require(`@spectrum-css/${dir}/package.json`);
96+
const pkgPath = resolve(require.resolve(`@spectrum-css/${dir}/package.json`));
97+
pkgs[name] = dirname(pkgPath);
9298
return pkgs;
9399
}, {}),
94-
},
100+
}
95101
},
96102
module: {
97-
...(config.module ?? []),
103+
...(config.module ?? {}),
98104
rules: [
99105
...storybookRules,
100-
{
101-
test: /^\w+\.{ico,jpg,jpeg,png,gif,webp}$/i,
102-
use: [
103-
{
104-
loader: "file-loader",
105-
options: {
106-
outputPath: (url) => `assets/images/${url.replace(/_\//g, "")}`,
107-
},
108-
},
109-
],
110-
},
111106
{
112107
test: /\.css$/i,
108+
// exclude: [/node_modules/, /dist/],
113109
sideEffects: true,
114110
use: [
115111
{
@@ -119,64 +115,50 @@ module.exports = {
119115
attributes: {
120116
"data-source": "processed",
121117
},
122-
},
118+
}
123119
},
124120
{
125-
loader: "file-loader",
121+
loader: 'file-loader',
126122
options: {
127-
name: "[path][name].[ext][query]",
123+
name: '[path][name].[ext][query]',
128124
outputPath: (url) => {
129-
const cleanURL = url.replace(/_\//g, "");
130-
if (/node_modules\/@spectrum-css/.test(url)) {
131-
return `assets/css/${cleanURL.replace(/node_modules\/@spectrum-css\//g, "")}`;
125+
const cleanUrl = url.replace(/_\//g, '');
126+
if (/node_modules\/@spectrum-css/.test(cleanUrl)) {
127+
return `assets/css/${cleanUrl.replace(/node_modules\/@spectrum-css\//g, "")}`;
132128
}
133-
134-
return `assets/css/${cleanURL}`;
129+
return `assets/css/${cleanUrl}`;
135130
},
136131
esModule: false,
137132
},
138133
},
139134
{
140-
loader: "postcss-loader",
135+
// Gets options from `postcss.config.js`
136+
loader: 'postcss-loader',
141137
options: {
142-
implementation: require("postcss"),
138+
implementation: require('postcss'),
143139
postcssOptions: {
144-
config: resolve(__dirname, "postcss.config.js"),
140+
config: true,
145141
},
146-
},
147-
},
142+
sourceMap: true,
143+
}
144+
}
148145
],
149146
},
150-
{
151-
test: /\.js$/,
152-
enforce: "pre",
153-
use: ["source-map-loader"],
154-
} /* Raw SVG loader */,
155-
{
156-
test: /\.svg$/i,
157-
loader: "raw-loader",
158-
},
159-
],
160-
},
147+
]
148+
}
161149
};
162150
},
163151
framework: {
164152
name: "@storybook/web-components-webpack5",
165-
options: {},
166153
},
167154
features: {
168155
/* Code splitting flag; load stories on-demand */
169156
storyStoreV7: true,
170157
/* Builds stories.json to help with on-demand loading */
171158
buildStoriesJson: true,
159+
lazyCompilation: true,
160+
fsCache: true,
172161
},
173-
// refs: {
174-
// 'swc': {
175-
// title: 'Spectrum Web Components',
176-
// url: 'https://opensource.adobe.com/spectrum-web-components/storybook/',
177-
// expanded: false,
178-
// },
179-
// },
180162
docs: {
181163
autodocs: true, // see below for alternatives
182164
defaultName: "Docs", // set to change the name of generated docs entries

‎.storybook/package.json

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,47 +17,41 @@
1717
"@spectrum-css/vars": "^9.0.8"
1818
},
1919
"devDependencies": {
20-
"@babel/core": "^7.22.1",
21-
"@chromaui/addon-visual-tests": "^0.0.124",
20+
"@babel/core": "^7.23.9",
21+
"@chromaui/addon-visual-tests": "^1.0.0",
2222
"@etchteam/storybook-addon-status": "^4.2.4",
23-
"@spectrum-css/component-builder": "^7.0.2",
24-
"@spectrum-css/component-builder-simple": "^5.0.4",
25-
"@storybook/addon-a11y": "^7.6.16",
26-
"@storybook/addon-actions": "^7.6.16",
23+
"@storybook/addon-a11y": "^7.6.17",
24+
"@storybook/addon-actions": "^7.6.17",
2725
"@storybook/addon-console": "^3.0.0",
28-
"@storybook/addon-docs": "^7.6.16",
29-
"@storybook/addon-essentials": "^7.6.14",
30-
"@storybook/addon-interactions": "^7.6.16",
31-
"@storybook/api": "^7.6.16",
32-
"@storybook/blocks": "^7.6.14",
33-
"@storybook/client-api": "^7.6.16",
34-
"@storybook/components": "^7.6.14",
35-
"@storybook/core-events": "^7.6.14",
26+
"@storybook/addon-docs": "^7.6.17",
27+
"@storybook/addon-essentials": "^7.6.17",
28+
"@storybook/addon-interactions": "^7.6.17",
29+
"@storybook/api": "^7.6.17",
30+
"@storybook/blocks": "^7.6.17",
31+
"@storybook/client-api": "^7.6.17",
32+
"@storybook/components": "^7.6.17",
33+
"@storybook/core-events": "^7.6.17",
3634
"@storybook/jest": "^0.2.3",
37-
"@storybook/manager-api": "^7.6.14",
38-
"@storybook/preview-api": "^7.6.14",
35+
"@storybook/manager-api": "^7.6.17",
36+
"@storybook/preview-api": "^7.6.17",
3937
"@storybook/testing-library": "^0.2.2",
40-
"@storybook/theming": "^7.6.14",
41-
"@storybook/web-components-webpack5": "^7.6.16",
38+
"@storybook/theming": "^7.6.17",
39+
"@storybook/web-components-webpack5": "^7.6.17",
4240
"@whitespace/storybook-addon-html": "^5.1.6",
43-
"chromatic": "^10.3.1",
41+
"chromatic": "^11.0.0",
4442
"file-loader": "6.2.0",
4543
"lit": "^3.1.2",
4644
"lodash-es": "^4.17.21",
4745
"postcss": "^8.4.35",
48-
"postcss-class-prefix": "^0.3.0",
49-
"postcss-loader": "^4.0.0",
50-
"postcss-prefix-selector": "^1.16.0",
51-
"postcss-selector-replace": "^1.0.2",
52-
"postcss-warn-cleaner": "^0.1.9",
46+
"postcss-loader": "^8.1.0",
5347
"prettier": "^2.8.8",
5448
"raw-loader": "^4.0.2",
55-
"react": "^18.0.0",
56-
"react-dom": "^18.0.0",
49+
"react": "^18.2.0",
50+
"react-dom": "^18.2.0",
5751
"react-syntax-highlighter": "^15.5.0",
58-
"source-map-loader": "^4.0.1",
59-
"storybook": "^7.6.16",
52+
"source-map-loader": "^5.0.0",
53+
"storybook": "^7.6.17",
6054
"style-loader": "3.3.4",
61-
"webpack": "^5.83.1"
55+
"webpack": "^5.90.3"
6256
}
6357
}

‎.storybook/postcss.config.js

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)