Skip to content

Commit 2e94c80

Browse files
committed
Merge remote-tracking branch 'origin/dev'
2 parents 919a128 + fa5a177 commit 2e94c80

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.postcssrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ module.exports = {
99
postcssModules({
1010
generateScopedName: classConfig,
1111
getJSON: (cssFileName, json) => {
12+
/* Ignore generate common polaris tokens style file */
13+
if (cssFileName.indexOf('@shopify/polaris-tokens') !== -1) {
14+
return;
15+
}
16+
1217
let cssName = path.basename(cssFileName, '.vue');
1318

1419
let projectPath = path.basename(__dirname, './');

src/components/CustomProperties/CustomProperties.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
component(
33
:is="'style'",
44
data-polaris-custom-properties="",
5-
v-html="styles"
5+
v-html="rawStyles"
66
)
77
component(
88
v-bind="$attrs",
@@ -14,7 +14,7 @@ component(
1414
</template>
1515
<script setup lang="ts">
1616
import { computed } from 'vue';
17-
import { styles } from 'polaris/polaris-react/src/components/CustomProperties/styles';
17+
import rawStyles from '@shopify/polaris-tokens/css/styles.scss?inline';
1818
import { DEFAULT_COLOR_SCHEME, STYLE_SHEET_ID } from './utils';
1919
import type { CustomPropertiesProps } from './utils';
2020

0 commit comments

Comments
 (0)