Skip to content

Commit 31e25af

Browse files
committed
Update submodule & migrate from scss to css
1 parent 363a612 commit 31e25af

File tree

155 files changed

+281
-183
lines changed

Some content is hidden

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

155 files changed

+281
-183
lines changed

build/namespaced-classname.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const SUBCOMPONENT_VARIATION_SELECTOR = /^\w+-\w+$/;
66
const NESTED_COMPONENT_PATH_REGEX = /.*\/components\/(.*)\/components/;
77

88
export function generateScopedName(name, filename) {
9-
let componentName = basename(filename, '.module.scss').replace(/\.vue.*/, '');
9+
let componentName = basename(filename, '.module.css').replace(/\.vue.*/, '');
1010
const nestedComponentMatch = NESTED_COMPONENT_PATH_REGEX.exec(filename);
1111

1212
const polarisComponentName =

build/postcss-plugins.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
11
import path from 'path';
22
import postcssShopify from '@shopify/postcss-plugin';
3+
import postcssImport from 'postcss-import';
34
import pxtorem from 'postcss-pxtorem';
45
import postcssCustomMedia from 'postcss-custom-media';
56
import postcssGlobalData from '@csstools/postcss-global-data';
7+
import postcssNesting from 'postcss-nesting';
8+
import postcssMixins from 'postcss-mixins';
9+
import postcssDiscardComments from 'postcss-discard-comments';
610

711
const mediaQueriesCssPath = path.resolve(
812
'./node_modules/@shopify/polaris-tokens/dist/css/media-queries.css',
913
);
1014

1115
const postcssPlugins = [
16+
postcssImport(),
17+
postcssMixins({
18+
mixinsDir: path.resolve('./polaris/polaris-react/postcss-mixins'),
19+
}),
20+
postcssNesting({
21+
// The way native CSS nesting & SASS nesting behave with complex selectors
22+
// differ; SASS expands out every selector into a comma separated list, but
23+
// native CSS wraps the complex selectors in an `:is()` which can result in
24+
// a different specificity. We favour the SASS convention here to ensure
25+
// compatibility with our ported-in SASS styles.
26+
// See: https://sass-lang.com/blog/sass-and-native-nesting/
27+
noIsPseudoSelector: true,
28+
}),
1229
postcssGlobalData({
1330
files: [mediaQueriesCssPath],
1431
}),
@@ -19,6 +36,7 @@ const postcssPlugins = [
1936
replace: true,
2037
propList: ['*'],
2138
}),
39+
postcssDiscardComments(),
2240
];
2341

2442
export default postcssPlugins;

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343
"docs:assets": "cp -r docs/assets/** docs/dist/assets"
4444
},
4545
"dependencies": {
46-
"@shopify/polaris-icons": "^8.7.0",
46+
"@shopify/polaris-icons": "^8.9.0",
4747
"vite-svg-loader": "^5.1.0"
4848
},
4949
"devDependencies": {
5050
"@csstools/postcss-global-data": "^2.1.1",
51-
"@shopify/polaris-tokens": "^8.8.0",
51+
"@shopify/polaris-tokens": "^8.9.0",
5252
"@shopify/postcss-plugin": "^5.0.2",
5353
"@types/node": "^20.10.4",
5454
"@vitejs/plugin-vue": "^5.0.2",
@@ -63,6 +63,10 @@
6363
"markdown-it": "^14.0.0",
6464
"path": "^0.12.7",
6565
"postcss-custom-media": "^10.0.2",
66+
"postcss-discard-comments": "^6.0.2",
67+
"postcss-import": "^16.1.0",
68+
"postcss-mixins": "^10.0.0",
69+
"postcss-nesting": "^12.1.0",
6670
"postcss-pxtorem": "^6.0.0",
6771
"pug": "^3.0.2",
6872
"sass": "^1.69.5",

polaris

src/components/ActionList/components/Item/Item.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ import {
146146
} from '@/components';
147147
import TruncateText from '../TruncateText.vue';
148148
import type { ActionListItemDescriptor, VueNode } from '@/utilities/types';
149-
import styles from '@polaris/components/ActionList/ActionList.module.scss';
149+
import styles from '@polaris/components/ActionList/ActionList.module.css';
150150
151151
type ItemProps = ActionListItemDescriptor;
152152

src/components/ActionMenu/ActionMenu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import type {
2727
ActionListItemDescriptor,
2828
} from '@/utilities/types';
2929
import { Actions, RollupActions } from './components';
30-
import styles from '@polaris/components/ActionMenu/ActionMenu.module.scss';
30+
import styles from '@polaris/components/ActionMenu/ActionMenu.module.css';
3131
3232
export interface ActionMenuProps {
3333
/** Collection of page-level secondary actions */

src/components/ActionMenu/components/Actions/Actions.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import type {
4040
} from '@/utilities/types';
4141
import useI18n from '@/use/useI18n';
4242
import { classNames } from '@/utilities/css';
43-
import styles from '@polaris/components/ActionMenu/components/Actions/Actions.module.scss';
43+
import styles from '@polaris/components/ActionMenu/components/Actions/Actions.module.css';
4444
import { SecondaryAction, MenuGroup } from '../index';
4545
import { ActionsMeasurer } from './components/ActionMeasurer';
4646
import type { MenuGroupProps } from '../MenuGroup/MenuGroup.vue';

src/components/ActionMenu/components/Actions/components/ActionMeasurer/ActionsMeasurer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { onMounted, ref } from 'vue';
2323
import useI18n from '@/use/useI18n';
2424
import type { MenuActionDescriptor, MenuGroupDescriptor } from '@/utilities/types';
2525
import { useEventListener } from '@/utilities/use-event-listener';
26-
import styles from '@polaris/components/ActionMenu/components/Actions/Actions.module.scss';
26+
import styles from '@polaris/components/ActionMenu/components/Actions/Actions.module.css';
2727
import type { SecondaryActionProps } from '../../../SecondaryAction/SecondaryAction.vue';
2828
import { SecondaryAction } from '../../../SecondaryAction';
2929

src/components/ActionMenu/components/MenuGroup/MenuGroup.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import type {
3939
ActionListItemDescriptor,
4040
ActionListSection,
4141
} from '@/utilities/types';
42-
import styles from '@polaris/components/ActionMenu/components/MenuGroup/MenuGroup.module.scss';
42+
import styles from '@polaris/components/ActionMenu/components/MenuGroup/MenuGroup.module.css';
4343
import { SecondaryAction } from '../SecondaryAction';
4444
4545
export interface MenuGroupProps {

src/components/ActionMenu/components/RollupActions/RollupActions.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { ref } from 'vue';
2626
import type { ActionListItemDescriptor, ActionListSection } from '@/utilities/types';
2727
import MenuHorizontalIcon from '@icons/MenuHorizontalIcon.svg';
2828
import useI18n from '@/use/useI18n';
29-
import styles from '@polaris/components/ActionMenu/components/RollupActions/RollupActions.module.scss';
29+
import styles from '@polaris/components/ActionMenu/components/RollupActions/RollupActions.module.css';
3030
3131
interface RollupActionsProps {
3232
/** Accessibilty label */

0 commit comments

Comments
 (0)