Skip to content

Commit 9ae1ee2

Browse files
Merge master into feature/q-transform-staging
2 parents 4b80192 + e830378 commit 9ae1ee2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

packages/core/scripts/build/generateIcons.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ async function generate(mappings: Record<string, number | undefined> = {}) {
112112
template: 'css',
113113
templateClassName: 'icon',
114114
descent: 200, // Icons were negatively offset on the y-axes, this fixes it
115-
templateFontPath: path.relative(stylesheetsDir, fontsDir),
115+
templateFontPath: path.relative(stylesheetsDir, fontsDir).replace(/\\/g, '/'),
116116
glyphTransformFn: obj => {
117117
const filePath = (obj as { path?: string }).path
118118

packages/webpack.vue.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const createVueBundleName = file => {
3232
*/
3333
const createVueEntries = (targetPattern = 'index.ts') => {
3434
return glob
35-
.sync(path.resolve(currentDir, 'src', '**', 'vue', '**', targetPattern))
35+
.sync(path.resolve(currentDir, 'src', '**', 'vue', '**', targetPattern).replace(/\\/g, '/'))
3636
.map(f => ({ name: createVueBundleName(f), path: f }))
3737
.reduce((a, b) => ((a[b.name] = b.path), a), {})
3838
}

0 commit comments

Comments
 (0)