Skip to content

Commit

Permalink
chore: update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
haoziqaq committed Jan 12, 2025
1 parent 21dcf76 commit 6590f46
Show file tree
Hide file tree
Showing 17 changed files with 1,372 additions and 74 deletions.
5 changes: 0 additions & 5 deletions .eslintrc

This file was deleted.

5 changes: 0 additions & 5 deletions .prettierrc

This file was deleted.

5 changes: 5 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { defineConfig } from '@configurajs/eslint'

export default defineConfig({
ignores: ['**/svg-esm', '**/svg-cjs', '**/svg-types', '**/svg-components'],
})
11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
{
"root": true,
"version": "0.6.0",
"type": "module",
"scripts": {
"preinstall": "npx only-allow pnpm",
"postinstall": "simple-git-hooks",
"bootstrap": "pnpm install && pnpm build",
"build": "pnpm --dir packages/varlet-icon-builder build && pnpm --dir packages/varlet-unplugin-icon-builder build",
"lint": "eslint --ext .ts,.js",
"lint": "eslint --fix .",
"format": "prettier --write .",
"release": "pnpm build && vr release",
"clean": "rimraf ./node_modules ./packages/*/node_modules"
},
"devDependencies": {
"@varlet/release": "0.2.5",
"eslint": "^8.53.0",
"prettier": "^3.1.0",
"@configurajs/eslint": "^0.1.0",
"@configurajs/prettier": "^0.1.1",
"eslint": "^9.18.0",
"prettier": "^3.4.2",
"simple-git-hooks": "^2.9.0",
"nano-staged": "^0.8.0",
"typescript": "^5.2.2",
Expand Down Expand Up @@ -43,4 +46,4 @@
"object.values": "npm:@nolyfill/object.values@latest"
}
}
}
}
4 changes: 2 additions & 2 deletions packages/playground-vite/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineConfig } from 'vite'
import vue from '@vitejs/plugin-vue'
import icon from '@varlet/unplugin-icon-builder/vite'
import vue from '@vitejs/plugin-vue'
import { defineConfig } from 'vite'

export default defineConfig({
plugins: [vue(), icon({ lib: '@varlet/test-icons/svg-icons', onDemand: true })],
Expand Down
2 changes: 1 addition & 1 deletion packages/playground-webpack/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import App from './App.vue'
import { createApp } from 'vue'
import App from './App.vue'
import 'virtual-icons'

createApp(App).mount('#app')
1 change: 0 additions & 1 deletion packages/playground-webpack/src/shims-vue.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable */
declare module '*.vue' {
import type { DefineComponent } from 'vue'
const component: DefineComponent<{}, {}, any>
Expand Down
2 changes: 1 addition & 1 deletion packages/varlet-icon-builder/bin/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env node
import { build, generate, figma } from '../dist/index.js'
import { Command } from 'commander'
import { build, figma, generate } from '../dist/index.js'

const program = new Command()

Expand Down
10 changes: 5 additions & 5 deletions packages/varlet-icon-builder/src/commands/build.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import fse from 'fs-extra'
import { resolve } from 'path'
import { webfont } from '@varlet/webfont'
import chokidar from 'chokidar'
import fse from 'fs-extra'
import { slash } from 'rattail'
import { getViConfig, VIConfig } from '../utils/config.js'
import logger from '../utils/logger.js'
import { webfont } from '@varlet/webfont'
import { resolvePath } from '../utils/shared.js'
import { slash } from 'rattail'
import { resolve } from 'path'
import { VIConfig, getViConfig } from '../utils/config.js'

export interface BuildCommandOptions {
watch?: boolean
Expand Down
4 changes: 2 additions & 2 deletions packages/varlet-icon-builder/src/commands/figma.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { AxleInstance, createAxle } from '@varlet/axle'
import fse from 'fs-extra'
import { kebabCase } from 'rattail'
import { getViConfig } from '../utils/config.js'
import { resolvePath } from '../utils/shared.js'
import fse from 'fs-extra'
import logger from '../utils/logger.js'
import { resolvePath } from '../utils/shared.js'

export interface FigmaCommandOptions {
token?: string
Expand Down
12 changes: 6 additions & 6 deletions packages/varlet-icon-builder/src/commands/generate.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { getViConfig } from '../utils/config.js'
import { resolve } from 'path'
import { compileSFC } from '../utils/compiler.js'
import { removeExtname } from '../utils/shared.js'
import { getTransformResult } from '../utils/esbuild.js'
import { generateVueSfc, generateVueSfcTypes } from '../framework/vue3.js'
import fse from 'fs-extra'
import { generateReactTsx, generateReactTsxTypes } from '../framework/react.js'
import { generateVueSfc, generateVueSfcTypes } from '../framework/vue3.js'
import { compileSFC } from '../utils/compiler.js'
import { getViConfig } from '../utils/config.js'
import { INDEX_FILE } from '../utils/constants.js'
import fse from 'fs-extra'
import { getTransformResult } from '../utils/esbuild.js'
import logger from '../utils/logger.js'
import { removeExtname } from '../utils/shared.js'

export interface GenerateCommandOptions {
entry?: string
Expand Down
6 changes: 3 additions & 3 deletions packages/varlet-icon-builder/src/framework/react.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import fse from 'fs-extra'
import { resolve } from 'path'
import { pascalCase, camelize } from 'rattail'
import { injectSvgCurrentColor, removeExtname } from '../utils/shared'
import fse from 'fs-extra'
import { camelize, pascalCase } from 'rattail'
import { INDEX_D_FILE, INDEX_FILE } from '../utils/constants'
import { injectSvgCurrentColor, removeExtname } from '../utils/shared'

export function camelizeSvgAttributes(content: string) {
return content.replace(/((\w|-|:)+)(?==")/g, (_, p1) => camelize(p1.replace(/:/g, '-')))
Expand Down
4 changes: 2 additions & 2 deletions packages/varlet-icon-builder/src/framework/vue3.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import fse from 'fs-extra'
import { resolve } from 'path'
import fse from 'fs-extra'
import { pascalCase } from 'rattail'
import { injectSvgCurrentColor, removeExtname } from '../utils/shared.js'
import { INDEX_D_FILE, INDEX_FILE } from '../utils/constants.js'
import { injectSvgCurrentColor, removeExtname } from '../utils/shared.js'

export function injectVueSfcSvgStyle(content: string) {
return content.replace('<svg', '<svg style="width: var(--x-icon-size, 1em); height: var(--x-icon-size, 1em)"')
Expand Down
4 changes: 2 additions & 2 deletions packages/varlet-icon-builder/src/utils/compiler.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { parse as parseSFC, compileTemplate, compileScript as compileScriptSFC, registerTS } from '@vue/compiler-sfc'
import ts from 'typescript'
import { compileScript as compileScriptSFC, compileTemplate, parse as parseSFC, registerTS } from '@vue/compiler-sfc'
import fse from 'fs-extra'
import hash from 'hash-sum'
import ts from 'typescript'

registerTS(() => ts)

Expand Down
18 changes: 9 additions & 9 deletions packages/varlet-unplugin-icon-builder/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type { UnpluginFactory } from 'unplugin'
import type { Options } from './types'
import { createUnplugin } from 'unplugin'
import { basename, isAbsolute, resolve } from 'path'
import { buildIcons } from '@varlet/icon-builder'
import { isAbsolute, resolve, basename } from 'path'
import { debounce, isPlainObject, uniq, slash } from 'rattail'
import chokidar from 'chokidar'
import glob from 'fast-glob'
import fse from 'fs-extra'
import chokidar from 'chokidar'
import { debounce, isPlainObject, slash, uniq } from 'rattail'
import type { UnpluginFactory } from 'unplugin'
import { createUnplugin } from 'unplugin'
import type { Options } from './types'

export function resolvePath(path: string) {
return isAbsolute(path) ? path : resolve(process.cwd(), path)
Expand Down Expand Up @@ -67,7 +67,7 @@ export const unpluginFactory: UnpluginFactory<Options | undefined> = (options: O
function getOnDemandFilter() {
const defaultInclude = ['./src/**/*.{vue,jsx,tsx,js,ts}']
const internalInclude = ['node_modules', generatedFileId]
const include = isPlainObject(onDemand) ? onDemand.include ?? defaultInclude : defaultInclude
const include = isPlainObject(onDemand) ? (onDemand.include ?? defaultInclude) : defaultInclude
const exclude = isPlainObject(onDemand) ? [...internalInclude, ...(onDemand.exclude ?? [])] : internalInclude

return {
Expand Down Expand Up @@ -211,7 +211,7 @@ export const unpluginFactory: UnpluginFactory<Options | undefined> = (options: O
fse.outputFileSync(generatedFileId, cssTemplate)

if (!base64) {
fse.outputFileSync(generatedFontId, ttf!)
fse.outputFileSync(generatedFontId, ttf! as any)
}
} catch (e) {
console.error(e)
Expand All @@ -229,7 +229,7 @@ export const unpluginFactory: UnpluginFactory<Options | undefined> = (options: O
}
},

async resolveId(id) {
resolveId(id) {
if (id === moduleId) {
return generatedFileId
}
Expand Down
Loading

0 comments on commit 6590f46

Please sign in to comment.