Skip to content

Commit cf1a9f3

Browse files
castastrophecastastrophe
committed
feat: update postcss-preset-env to latest breaking version
1 parent bee70fb commit cf1a9f3

File tree

13 files changed

+608
-525
lines changed

13 files changed

+608
-525
lines changed

‎.storybook/main.js‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
import fs from "fs";
2-
import path from "path";
1+
import fs from "node:fs";
2+
import { createRequire } from "node:module";
3+
import path from "node:path";
34
import remarkGfm from 'remark-gfm';
45

6+
const require = createRequire(import.meta.url);
7+
58
// Get a list of all the folders in the components directory
69
const componentDir = path.resolve(__dirname, "../components");
710
const components = fs.readdirSync(componentDir, { withFileTypes: true })
@@ -104,7 +107,21 @@ export default {
104107
devSourcemap: configType === "DEVELOPMENT",
105108
},
106109
resolve: {
107-
alias: components.map(component => ({ find: `@spectrum-css/${component}`, replacement: path.resolve(__dirname, `../components/${component}`) })),
110+
alias: [
111+
...components.map(component => ({ find: `@spectrum-css/${component}`, replacement: path.resolve(__dirname, `../components/${component}`) })),
112+
{
113+
find: `@spectrum-css/tokens`,
114+
replacement: path.resolve(__dirname, `../tokens`),
115+
},
116+
{
117+
find: `@spectrum-css/tokens-legacy`,
118+
replacement: require.resolve("@spectrum-css/tokens-legacy"),
119+
},
120+
{
121+
find: `@spectrum-css/ui-icons`,
122+
replacement: path.resolve(__dirname, `../ui-icons`),
123+
},
124+
],
108125
}
109126
});
110127
},

‎.storybook/manager.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// import "@spectrum-css/bundle";
21
import { addons } from "@storybook/manager-api";
32
import { create } from "@storybook/theming";
43

‎.storybook/postcss.config.js‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*!
2+
* Copyright 2024 Adobe. All rights reserved.
3+
*
4+
* This file is licensed to you under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License. You may obtain a copy
6+
* of the License at http://www.apache.org/licenses/LICENSE-2.0
7+
*
8+
* Unless required by applicable law or agreed to in writing, software distributed under
9+
* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
10+
* OF ANY KIND, either express or implied. See the License for the specific language
11+
* governing permissions and limitations under the License.
12+
*/
13+
14+
module.exports = (options) => require("../postcss.config.js")({
15+
...options,
16+
resolveImports: false,
17+
env: "production",
18+
map: false,
19+
additionalPlugins: {
20+
"@csstools/postcss-bundler": {},
21+
},
22+
});

‎components/assetlist/dist/metadata.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
{
22
"sourceFile": "index.css",
33
"selectors": [
4-
".js-focus-within .spectrum-AssetList-item.is-focused[focus-within]",
5-
".js-focus-within .spectrum-AssetList-item.is-focused[focus-within]:before",
6-
".js-focus-within .spectrum-AssetList-item[focus-within]:focus-visible",
7-
".js-focus-within .spectrum-AssetList-item[focus-within]:focus-visible:before",
84
".spectrum-AssetList",
95
".spectrum-AssetList-item",
106
".spectrum-AssetList-item .spectrum-AssetList-itemThumbnail",
117
".spectrum-AssetList-item.is-branch .spectrum-AssetList-itemChildIndicator",
128
".spectrum-AssetList-item.is-focused:focus-within",
139
".spectrum-AssetList-item.is-focused:focus-within:before",
14-
".spectrum-AssetList-item.is-focused[focus-within].js-focus-within",
15-
".spectrum-AssetList-item.is-focused[focus-within].js-focus-within:before",
1610
".spectrum-AssetList-item.is-navigated",
1711
".spectrum-AssetList-item.is-navigated:focus",
1812
".spectrum-AssetList-item.is-navigated:hover",
@@ -30,8 +24,6 @@
3024
".spectrum-AssetList-itemChildIndicator",
3125
".spectrum-AssetList-itemLabel",
3226
".spectrum-AssetList-itemSelector",
33-
".spectrum-AssetList-item[focus-within]:focus-visible.js-focus-within",
34-
".spectrum-AssetList-item[focus-within]:focus-visible.js-focus-within:before",
3527
".spectrum-AssetList:dir(rtl)",
3628
"[dir=\"rtl\"] .spectrum-AssetList"
3729
],

‎components/clearbutton/dist/metadata.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"sourceFile": "index.css",
33
"selectors": [
4-
".js-focus-within .spectrum-ClearButton:not(:disabled)[focus-within]",
5-
".js-focus-within .spectrum-ClearButton:not(:disabled)[focus-within] .spectrum-ClearButton-fill",
64
".spectrum-ClearButton",
75
".spectrum-ClearButton > .spectrum-Icon",
86
".spectrum-ClearButton--overBackground:focus-visible",
@@ -24,9 +22,7 @@
2422
".spectrum-ClearButton:not(:disabled):focus-within",
2523
".spectrum-ClearButton:not(:disabled):focus-within .spectrum-ClearButton-fill",
2624
".spectrum-ClearButton:not(:disabled):hover",
27-
".spectrum-ClearButton:not(:disabled):hover .spectrum-ClearButton-fill",
28-
".spectrum-ClearButton:not(:disabled)[focus-within].js-focus-within",
29-
".spectrum-ClearButton:not(:disabled)[focus-within].js-focus-within .spectrum-ClearButton-fill"
25+
".spectrum-ClearButton:not(:disabled):hover .spectrum-ClearButton-fill"
3026
],
3127
"modifiers": [
3228
"--mod-clear-button-background-color",

‎components/dial/dist/metadata.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"sourceFile": "index.css",
33
"selectors": [
4-
".js-focus-within .spectrum-Dial-handle[focus-within]",
5-
".js-focus-within .spectrum-Dial-handle[focus-within]:after",
64
".spectrum-Dial",
75
".spectrum-Dial-controls",
86
".spectrum-Dial-controls:after",
@@ -20,8 +18,6 @@
2018
".spectrum-Dial-handle:focus-within:after",
2119
".spectrum-Dial-handle:hover",
2220
".spectrum-Dial-handle:hover:after",
23-
".spectrum-Dial-handle[focus-within].js-focus-within",
24-
".spectrum-Dial-handle[focus-within].js-focus-within:after",
2521
".spectrum-Dial-input",
2622
".spectrum-Dial-input:focus",
2723
".spectrum-Dial-label",

‎components/menu/dist/metadata.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"sourceFile": "index.css",
33
"selectors": [
4-
".js-focus-within .spectrum-Menu .spectrum-Menu-item--collapsible.is-open[focus-within]",
54
".spectrum-Menu",
65
".spectrum-Menu .spectrum-Menu-backIcon",
76
".spectrum-Menu .spectrum-Menu-checkmark",
@@ -130,7 +129,6 @@
130129
".spectrum-Menu.is-selectable .spectrum-Menu-item.is-selected",
131130
".spectrum-Menu.is-selectableMultiple .spectrum-Menu-item",
132131
".spectrum-Menu.is-selectableMultiple .spectrum-Menu-itemCheckbox",
133-
".spectrum-Menu.js-focus-within .spectrum-Menu-item--collapsible.is-open[focus-within]",
134132
".spectrum-Menu.spectrum-Menu--sizeL",
135133
".spectrum-Menu.spectrum-Menu--sizeS",
136134
".spectrum-Menu.spectrum-Menu--sizeXL",

‎components/slider/dist/metadata.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"sourceFile": "index.css",
33
"selectors": [
4-
".js-focus-within .spectrum-Slider:not(.is-disabled, .spectrum-Slider--filled, .spectrum-Slider--range) .spectrum-Slider-controls[focus-within]",
54
".spectrum-Slider",
65
".spectrum-Slider .spectrum-Slider-handle.is-focused:before",
76
".spectrum-Slider--filled .spectrum-Slider-track:first-child:before",
@@ -93,7 +92,6 @@
9392
".spectrum-Slider:not(.is-disabled, .spectrum-Slider--filled, .spectrum-Slider--range) .spectrum-Slider-controls:active",
9493
".spectrum-Slider:not(.is-disabled, .spectrum-Slider--filled, .spectrum-Slider--range) .spectrum-Slider-controls:focus-within",
9594
".spectrum-Slider:not(.is-disabled, .spectrum-Slider--filled, .spectrum-Slider--range) .spectrum-Slider-controls:hover",
96-
".spectrum-Slider:not(.is-disabled, .spectrum-Slider--filled, .spectrum-Slider--range).js-focus-within .spectrum-Slider-controls[focus-within]",
9795
".spectrum-Slider:not(.spectrum-Slider--sideLabel) .spectrum-Slider-labelContainer + .spectrum-Slider-controls:has(.spectrum-Slider-ramp)",
9896
"[dir=\"rtl\"] .spectrum-Slider",
9997
"[dir=\"rtl\"] .spectrum-Slider .spectrum-Slider-handle:before"

‎nx.json‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,27 @@
99
},
1010
"namedInputs": {
1111
"core": ["{projectRoot}/*.css", "{projectRoot}/themes/*.css"],
12-
"eslint": ["{workspaceRoot}/.eslintrc"],
12+
"eslint": [
13+
"{workspaceRoot}/.eslintrc",
14+
{ "externalDependencies": ["eslint"] }
15+
],
1316
"metadata": ["{projectRoot}/metadata/*.json"],
14-
"prettier": ["{workspaceRoot}/.prettierrc"],
17+
"prettier": [
18+
"{workspaceRoot}/.prettierrc",
19+
{ "externalDependencies": ["prettier"] }
20+
],
1521
"scripts": ["{projectRoot}/stories/*.js"],
1622
"stylelint": [
1723
"{workspaceRoot}/.stylelintignore",
1824
"{workspaceRoot}/stylelint.config.js",
19-
"{workspaceRoot}/plugins/stylelint-*/index.js"
25+
"{workspaceRoot}/plugins/stylelint-*/index.js",
26+
{ "externalDependencies": ["stylelint"] }
2027
],
2128
"tools": [
2229
"{projectRoot}/*.json",
2330
"{workspaceRoot}/postcss.config.js",
24-
"{workspaceRoot}/plugins/postcss-*/index.js"
31+
"{workspaceRoot}/plugins/postcss-*/index.js",
32+
{ "externalDependencies": ["postcss"] }
2533
]
2634
},
2735
"pluginsConfig": {
@@ -44,7 +52,6 @@
4452
"stylelint",
4553
"{workspaceRoot}/tasks/component-builder.js",
4654
"!{projectRoot}/stories/*.js",
47-
{ "externalDependencies": ["postcss"] },
4855
{ "env": "NODE_ENV" }
4956
],
5057
"options": {
@@ -115,8 +122,7 @@
115122
"scripts",
116123
"stylelint",
117124
"eslint",
118-
"prettier",
119-
{ "externalDependencies": ["stylelint", "eslint", "prettier"] }
125+
"prettier"
120126
],
121127
"options": {
122128
"commands": [
@@ -134,8 +140,7 @@
134140
"scripts",
135141
"stylelint",
136142
"eslint",
137-
"prettier",
138-
{ "externalDependencies": ["stylelint", "eslint", "prettier"] }
143+
"prettier"
139144
],
140145
"options": {
141146
"commands": [

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
"@changesets/cli": "^2.27.11",
7171
"@commitlint/cli": "^19.6.1",
7272
"@commitlint/config-conventional": "^19.6.0",
73+
"@csstools/postcss-bundler": "^2.0.6",
7374
"@nx/devkit": "^19.8.2",
74-
"@spectrum-css/tokens-legacy": "npm:@spectrum-css/tokens@^14.6.0",
7575
"@spectrum-tools/postcss-add-theming-layer": "workspace:^",
7676
"@spectrum-tools/postcss-property-rollup": "workspace:^",
7777
"@spectrum-tools/postcss-rgb-mapping": "workspace:^",
@@ -99,14 +99,14 @@
9999
"nx": "^19.8.2",
100100
"open": "^10.1.0",
101101
"pajv": "^1.2.0",
102-
"postcss": "^8.5.0",
102+
"postcss": "^8.5.1",
103103
"postcss-extend": "^1.0.5",
104104
"postcss-hover-media-feature": "^1.0.2",
105105
"postcss-import": "^16.1.0",
106106
"postcss-licensing": "^2.0.0",
107-
"postcss-load-config": "^5.1.0",
107+
"postcss-load-config": "^6.0.1",
108108
"postcss-modules": "^6.0.1",
109-
"postcss-preset-env": "^9.5.13",
109+
"postcss-preset-env": "^10.1.3",
110110
"postcss-pseudo-classes": "^0.4.0",
111111
"postcss-reporter": "^7.1.0",
112112
"postcss-selector-replace": "^1.0.2",
@@ -116,7 +116,7 @@
116116
"rimraf": "^6.0.1",
117117
"stylelint": "^16.9.0",
118118
"stylelint-config-standard": "^36.0.1",
119-
"stylelint-header": "^2.0.1",
119+
"stylelint-header": "^2.1.0",
120120
"stylelint-high-performance-animation": "^1.10.0",
121121
"stylelint-order": "^6.0.4",
122122
"stylelint-selector-bem-pattern": "^4.0.1",

0 commit comments

Comments
 (0)