Skip to content

Commit

Permalink
Merge branch 'main' into renovate/rollup-plugin-commonjs-25.x
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored May 22, 2023
2 parents 6f588cb + 08f4d69 commit dfcd2b1
Show file tree
Hide file tree
Showing 110 changed files with 402 additions and 616 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/vite-npm-2.9.5-d80948fb05-354189cbce.zip
Binary file not shown.
Binary file not shown.
7 changes: 3 additions & 4 deletions examples/class-prefix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "class-prefix",
"private": true,
"version": "0.26.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand All @@ -13,10 +14,8 @@
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@vitejs/plugin-react": "1.1.3",
"@vitejs/plugin-react": "4.0.0",
"sass": "^1.51.0",
"vite": "^2.9.5"
"vite": "^4.3.8"
}
}
4 changes: 1 addition & 3 deletions examples/class-prefix/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function ExampleComponent() {
)
}

function App() {
export default function App() {
return (
<>
<ExampleComponent />
Expand All @@ -20,5 +20,3 @@ function App() {
</>
);
}

export default App
11 changes: 6 additions & 5 deletions examples/class-prefix/src/main.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import './index.scss'

import React from 'react'
import ReactDOM from 'react-dom'
import React from 'react';
import { createRoot } from 'react-dom/client';
import App from './App'

ReactDOM.render(
const domNode = document.getElementById('root');
const root = createRoot(domNode);
root.render(
<React.StrictMode>
<App />
</React.StrictMode>,
document.getElementById('root')
</React.StrictMode>
);
6 changes: 1 addition & 5 deletions examples/class-prefix/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,5 @@ import react from '@vitejs/plugin-react';

// https://vitejs.dev/config/
export default defineConfig({
plugins: [
react({
jsxRuntime: 'classic',
}),
],
plugins: [react()],
});
9 changes: 5 additions & 4 deletions examples/codesandbox-styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
"name": "codesandbox-styles",
"private": true,
"version": "0.32.0",
"type": "module",
"scripts": {
"develop": "vite"
"dev": "vite"
},
"devDependencies": {
"vite": "^2.8.0"
"sass": "^1.51.0",
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.29.0",
"sass": "^1.51.0"
"@carbon/styles": "^1.29.0"
}
}
7 changes: 3 additions & 4 deletions examples/custom-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "custom-theme",
"private": true,
"version": "0.27.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand All @@ -13,10 +14,8 @@
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@vitejs/plugin-react": "1.1.3",
"@vitejs/plugin-react": "4.0.0",
"sass": "^1.51.0",
"vite": "^2.9.5"
"vite": "^4.3.8"
}
}
4 changes: 1 addition & 3 deletions examples/custom-theme/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Button } from '@carbon/react';
import React from 'react';

function App() {
export default function App() {
return (
<div>
<Button>Button with custom theme</Button>
Expand All @@ -16,5 +16,3 @@ function App() {
</div>
);
}

export default App;
15 changes: 8 additions & 7 deletions examples/custom-theme/src/main.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import './index.scss'
import './index.scss';

import React from 'react'
import ReactDOM from 'react-dom'
import App from './App'
import React from 'react';
import { createRoot } from 'react-dom/client';
import App from './App';

ReactDOM.render(
const domNode = document.getElementById('root');
const root = createRoot(domNode);
root.render(
<React.StrictMode>
<App />
</React.StrictMode>,
document.getElementById('root')
</React.StrictMode>
);
6 changes: 1 addition & 5 deletions examples/custom-theme/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,5 @@ import react from '@vitejs/plugin-react';

// https://vitejs.dev/config/
export default defineConfig({
plugins: [
react({
jsxRuntime: 'classic',
}),
],
plugins: [react()],
});
7 changes: 3 additions & 4 deletions examples/id-prefix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "id-prefix",
"private": true,
"version": "0.26.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand All @@ -13,10 +14,8 @@
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@vitejs/plugin-react": "1.1.3",
"@vitejs/plugin-react": "4.0.0",
"sass": "^1.51.0",
"vite": "^2.9.5"
"vite": "^4.3.8"
}
}
4 changes: 1 addition & 3 deletions examples/id-prefix/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function ExampleComponent() {
)
}

function App() {
export default function App() {
return (
<>
<ExampleComponent />
Expand All @@ -20,5 +20,3 @@ function App() {
</>
);
}

export default App
15 changes: 8 additions & 7 deletions examples/id-prefix/src/main.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import './index.scss'
import './index.scss';

import React from 'react'
import ReactDOM from 'react-dom'
import App from './App'
import React from 'react';
import { createRoot } from 'react-dom/client';
import App from './App';

ReactDOM.render(
const domNode = document.getElementById('root');
const root = createRoot(domNode);
root.render(
<React.StrictMode>
<App />
</React.StrictMode>,
document.getElementById('root')
</React.StrictMode>
);
6 changes: 1 addition & 5 deletions examples/id-prefix/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,5 @@ import react from '@vitejs/plugin-react';

// https://vitejs.dev/config/
export default defineConfig({
plugins: [
react({
jsxRuntime: 'classic',
}),
],
plugins: [react()],
});
7 changes: 3 additions & 4 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "vite",
"private": true,
"version": "0.27.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand All @@ -13,10 +14,8 @@
"react-dom": "^18.2.0"
},
"devDependencies": {
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@vitejs/plugin-react": "1.1.3",
"@vitejs/plugin-react": "4.0.0",
"sass": "^1.51.0",
"vite": "^2.9.5"
"vite": "^4.3.8"
}
}
4 changes: 1 addition & 3 deletions examples/vite/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { Button } from '@carbon/react';
import React from 'react';

function App() {
export default function App() {
return (
<div>
<Button>Hello world</Button>
</div>
);
}

export default App
9 changes: 5 additions & 4 deletions examples/vite/src/main.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import './index.scss';

import { StrictMode } from 'react';
import React from 'react';
import { createRoot } from 'react-dom/client';
import App from './App';

const root = createRoot(document.getElementById('root'));
const domNode = document.getElementById('root');
const root = createRoot(domNode);
root.render(
<StrictMode>
<React.StrictMode>
<App />
</StrictMode>
</React.StrictMode>
);
6 changes: 1 addition & 5 deletions examples/vite/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,5 @@ import react from '@vitejs/plugin-react';

// https://vitejs.dev/config/
export default defineConfig({
plugins: [
react({
jsxRuntime: 'classic',
}),
],
plugins: [react()],
});
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
"node-sass": "^8.0.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"react-is": "~18.2.0",
"react-test-renderer": "~17.0.2"
"react-is": "~18.2.0"
},
"devDependencies": {
"@babel/core": "^7.18.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,10 @@

.#{$prefix}--actionable-notification--warning
.#{$prefix}--toast-notification__icon
path[opacity='0'] {
path[opacity='0'],
.#{$prefix}--actionable-notification--warning-alt
.#{$prefix}--toast-notification__icon
path:first-of-type {
fill: $black-100;
opacity: 1;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,10 @@

.#{$prefix}--inline-notification--warning
.#{$prefix}--inline-notification__icon
path[opacity='0'] {
path[opacity='0'],
.#{$prefix}--inline-notification--warning-alt
.#{$prefix}--inline-notification__icon
path:first-of-type {
fill: $black-100;
opacity: 1;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,10 @@

.#{$prefix}--toast-notification--warning
.#{$prefix}--toast-notification__icon
path[opacity='0'] {
path[opacity='0'],
.#{$prefix}--toast-notification--warning-alt
.#{$prefix}--toast-notification__icon
path:first-of-type {
fill: $black-100;
opacity: 1;
}
Expand Down
Loading

0 comments on commit dfcd2b1

Please sign in to comment.