Skip to content

Commit ab53de3

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/packages/grid/examples/css-grid/next-15.2.4
2 parents 88a96bc + 8b581dc commit ab53de3

File tree

10 files changed

+123
-8
lines changed

10 files changed

+123
-8
lines changed

examples/class-prefix/vite.config.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,26 @@ import react from '@vitejs/plugin-react';
44
// https://vitejs.dev/config/
55
export default defineConfig({
66
plugins: [react()],
7+
css: {
8+
preprocessorOptions: {
9+
// suppress mixed-declarations warnings until resolved in
10+
// https://github.com/carbon-design-system/carbon/issues/16962
11+
scss: {
12+
api: 'modern',
13+
silenceDeprecations: ['mixed-decls'],
14+
},
15+
},
16+
},
17+
// resolve font paths
18+
resolve: {
19+
alias: [
20+
{
21+
find: /~@ibm\/plex\/(.*)/,
22+
replacement: '@ibm/plex/$1',
23+
},
24+
],
25+
},
26+
optimizeDeps: {
27+
include: ['@carbon/react'],
28+
},
729
});

examples/custom-theme/vite.config.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,26 @@ import react from '@vitejs/plugin-react';
44
// https://vitejs.dev/config/
55
export default defineConfig({
66
plugins: [react()],
7+
css: {
8+
preprocessorOptions: {
9+
// suppress mixed-declarations warnings until resolved in
10+
// https://github.com/carbon-design-system/carbon/issues/16962
11+
scss: {
12+
api: 'modern',
13+
silenceDeprecations: ['mixed-decls'],
14+
},
15+
},
16+
},
17+
// resolve font paths
18+
resolve: {
19+
alias: [
20+
{
21+
find: /~@ibm\/plex\/(.*)/,
22+
replacement: '@ibm/plex/$1',
23+
},
24+
],
25+
},
26+
optimizeDeps: {
27+
include: ['@carbon/react'],
28+
},
729
});

examples/id-prefix/vite.config.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,26 @@ import react from '@vitejs/plugin-react';
44
// https://vitejs.dev/config/
55
export default defineConfig({
66
plugins: [react()],
7+
css: {
8+
preprocessorOptions: {
9+
// suppress mixed-declarations warnings until resolved in
10+
// https://github.com/carbon-design-system/carbon/issues/16962
11+
scss: {
12+
api: 'modern',
13+
silenceDeprecations: ['mixed-decls'],
14+
},
15+
},
16+
},
17+
// resolve font paths
18+
resolve: {
19+
alias: [
20+
{
21+
find: /~@ibm\/plex\/(.*)/,
22+
replacement: '@ibm/plex/$1',
23+
},
24+
],
25+
},
26+
optimizeDeps: {
27+
include: ['@carbon/react'],
28+
},
729
});

examples/v10-token-compat-in-v11/vite.config.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,23 @@ import react from '@vitejs/plugin-react';
44
// https://vitejs.dev/config/
55
export default defineConfig({
66
plugins: [react()],
7+
css: {
8+
preprocessorOptions: {
9+
// suppress mixed-declarations warnings until resolved in
10+
// https://github.com/carbon-design-system/carbon/issues/16962
11+
scss: {
12+
api: 'modern',
13+
silenceDeprecations: ['mixed-decls'],
14+
},
15+
},
16+
},
17+
// resolve font paths
18+
resolve: {
19+
alias: [
20+
{
21+
find: /~@ibm\/plex\/(.*)/,
22+
replacement: '@ibm/plex/$1',
23+
},
24+
],
25+
},
726
});

examples/vite/vite.config.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,17 @@ import react from '@vitejs/plugin-react';
44
// https://vitejs.dev/config/
55
export default defineConfig({
66
plugins: [react()],
7+
css: {
8+
preprocessorOptions: {
9+
// suppress mixed-declarations warnings until resolved in
10+
// https://github.com/carbon-design-system/carbon/issues/16962
11+
scss: {
12+
api: 'modern',
13+
silenceDeprecations: ['mixed-decls'],
14+
},
15+
},
16+
},
17+
optimizeDeps: {
18+
include: ['@carbon/react'],
19+
},
720
});

packages/react/.storybook/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ const config = {
150150
path.resolve(__dirname, '..', 'node_modules'),
151151
path.resolve(__dirname, '..', '..', '..', 'node_modules'),
152152
],
153-
// quietDeps: true,
153+
silenceDeprecations: ['mixed-decls'],
154154
},
155155
warnRuleAsWarning: true,
156156
sourceMap: true,

packages/styles/tasks/build-css.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ async function build() {
4040
`;
4141
const { css } = sass.compileString(entrypoint, {
4242
loadPaths,
43+
// suppress mixed-declarations warnings until resolved in
44+
// https://github.com/carbon-design-system/carbon/issues/16962
45+
logger: {
46+
warn: (message) =>
47+
message.includes('mixed-decls') ? undefined : { type: 'warn', message },
48+
},
4349
});
4450
const bundles = [
4551
{

packages/themes/src/component-tokens/tag/tokens.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,49 +10,42 @@ import {
1010
red40,
1111
red50,
1212
red70,
13-
red80,
1413
red20Hover,
1514
red70Hover,
1615
magenta20,
1716
magenta40,
1817
magenta50,
1918
magenta70,
20-
magenta80,
2119
magenta20Hover,
2220
magenta70Hover,
2321
purple20,
2422
purple40,
2523
purple50,
2624
purple70,
27-
purple80,
2825
purple20Hover,
2926
purple70Hover,
3027
blue20,
3128
blue40,
3229
blue50,
3330
blue70,
34-
blue80,
3531
blue20Hover,
3632
blue70Hover,
3733
cyan20,
3834
cyan40,
3935
cyan50,
4036
cyan70,
41-
cyan80,
4237
cyan20Hover,
4338
cyan70Hover,
4439
teal20,
4540
teal40,
4641
teal50,
4742
teal70,
48-
teal80,
4943
teal20Hover,
5044
teal70Hover,
5145
green20,
5246
green40,
5347
green50,
5448
green70,
55-
green80,
5649
green20Hover,
5750
green70Hover,
5851
gray10,

packages/web-components/.storybook/main.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,16 @@ const config: StorybookConfig = {
5353
litTemplateLoader(),
5454
viteSVGResultCarbonIconLoader(),
5555
],
56+
css: {
57+
preprocessorOptions: {
58+
// suppress mixed-declarations warnings until resolved in
59+
// https://github.com/carbon-design-system/carbon/issues/16962
60+
scss: {
61+
api: 'modern',
62+
silenceDeprecations: ['mixed-decls'],
63+
},
64+
},
65+
},
5666
optimizeDeps: {
5767
include: ['@storybook/web-components'],
5868
exclude: ['lit', 'lit-html'],

packages/web-components/tools/rollup-plugin-lit-scss.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@ export default function LitSCSS({
7474
...options,
7575
file: id,
7676
data: finalContent,
77+
// suppress mixed-declarations warnings until resolved in
78+
// https://github.com/carbon-design-system/carbon/issues/16962
79+
logger: {
80+
warn: (message) =>
81+
message.includes('mixed-decls')
82+
? undefined
83+
: { type: 'warn', message },
84+
},
7785
});
7886

7987
return {

0 commit comments

Comments
 (0)