Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit19f8aba

Browse files
committed
feat(config)!: support loading config synchronously
1 parent0b11b27 commit19f8aba

File tree

14 files changed

+92
-93
lines changed

14 files changed

+92
-93
lines changed

‎cspell.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"onwarn",
3939
"pluginutils",
4040
"publint",
41+
"quansync",
4142
"quasis",
4243
"quux",
4344
"quuz",

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
"unplugin":"catalog:",
7070
"unplugin-isolated-decl":"^0.11.2",
7171
"unplugin-macros":"^0.16.0",
72+
"unplugin-quansync":"^0.3.3",
7273
"unplugin-raw":"^0.4.3",
7374
"unplugin-unused":"^0.4.2",
7475
"vite":"catalog:",

‎packages/astro/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default function (options?: Options): AstroIntegration {
2121
name:'@vue-macros/astro',
2222
hooks:{
2323
'astro:config:setup':async({ config})=>{
24-
constresolvedOptions=resolveOptions(options||{})
24+
constresolvedOptions=awaitresolveOptions(options||{})
2525
constvue=findPluginAndRemove('vite:vue',config.vite.plugins)
2626
constvueJsx=findPluginAndRemove('vite:vue-jsx',config.vite.plugins)
2727

‎packages/config/package.json‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
"dev":"./src/config.ts",
3939
"default":"./dist/config.js"
4040
},
41-
"./config-worker": {
42-
"dev":"./src/config-worker.ts",
43-
"default":"./dist/config-worker.js"
44-
},
4541
"./define": {
4642
"dev":"./src/define.ts",
4743
"default":"./dist/define.js"
@@ -65,7 +61,6 @@
6561
"exports": {
6662
".":"./dist/index.js",
6763
"./config":"./dist/config.js",
68-
"./config-worker":"./dist/config-worker.js",
6964
"./define":"./dist/define.js",
7065
"./options":"./dist/options.js",
7166
"./*":"./*"
@@ -78,8 +73,8 @@
7873
},
7974
"dependencies": {
8075
"@vue-macros/common":"workspace:*",
81-
"make-synchronized":"^0.2.9",
82-
"unconfig":"^7.1.0"
76+
"quansync":"^0.2.8",
77+
"unconfig":"^7.2.0"
8378
},
8479
"devDependencies": {
8580
"@vue-macros/better-define":"workspace:*",

‎packages/config/src/config-worker.ts‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎packages/config/src/config.ts‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
1-
import{makeSynchronized}from'make-synchronized'
1+
import{quansync,typeQuansyncFn}from'quansync/macro'
2+
import{loadConfigas_loadConfig}from'unconfig'
23
importtype{Options}from'./options'
34

4-
exportfunctionloadConfig(cwd:string):Omit<Options,'plugins'>{
5-
consturl=import.meta.url
6-
constisDist=url.endsWith('.js')
7-
constfilename='config-worker.js'
8-
constworkerPath=newURL(
9-
isDist ?`./${filename}` :`../dist/${filename}`,
10-
url,
11-
)
12-
const{ loadConfigAsync}=
13-
makeSynchronized<typeofimport('./config-worker')>(workerPath)
14-
returnloadConfigAsync(cwd)
15-
}
5+
exportconstloadConfig:QuansyncFn<Options,[cwd:string]>=quansync(
6+
async(cwd:string)=>{
7+
const{ config}=await_loadConfig<Options>({
8+
sources:[
9+
{
10+
files:'vue-macros.config',
11+
extensions:['mts','cts','ts','mjs','cjs','js','json',''],
12+
},
13+
{
14+
files:'package.json',
15+
extensions:[],
16+
rewrite:(config:any)=>config?.vueMacros,
17+
},
18+
],
19+
defaults:{},
20+
cwd,
21+
})
22+
returnconfig
23+
},
24+
)

‎packages/config/src/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
export*from'./config-worker'
21
export*from'./config'
32
export*from'./define'
43
export*from'./options'

‎packages/config/src/options.ts‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
/* eslint perfectionist/sort-objects: ["error", { partitionByNewLine: true }] */
1313

1414
importprocessfrom'node:process'
15+
import{quansync,typeQuansyncFn}from'quansync/macro'
1516
import{loadConfig}from'./config'
16-
import{loadConfigAsync}from'./config-worker'
1717

1818
importtype{OptionsasOptionsBetterDefine}from'@vue-macros/better-define'
1919
importtype{OptionsasOptionsBooleanProp}from'@vue-macros/boolean-prop'
@@ -225,12 +225,11 @@ export type OptionsResolved = Required<OptionsCommon> & {
225225
[KinkeyofFeatureOptionsMap]:false|FeatureOptionsMap[K]
226226
}
227227

228-
exportfunctionresolveOptions(
229-
options?:Options,
230-
cwd:string=process.cwd(),
231-
config?:Omit<Options,'plugins'>,
232-
):OptionsResolved{
233-
config||=loadConfig(cwd)
228+
exportconstresolveOptions:QuansyncFn<
229+
OptionsResolved,
230+
[options?:Options|undefined,cwd?:string|undefined]
231+
>=quansync(async(options?:Options,cwd:string=process.cwd())=>{
232+
constconfig=awaitloadConfig(cwd)
234233

235234
let{ isProduction, nuxtContext, plugins, root, version, ...subOptions}={
236235
...config,
@@ -295,12 +294,4 @@ export function resolveOptions(
295294
...(options===true ?{} :options),
296295
}
297296
}
298-
}
299-
300-
exportasyncfunctionresolveOptionsAsync(
301-
options?:Options,
302-
cwd:string=process.cwd(),
303-
):Promise<OptionsResolved>{
304-
constconfig=awaitloadConfigAsync(cwd)
305-
returnresolveOptions(options,cwd,config)
306-
}
297+
})

‎packages/macros/src/index.ts‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { resolvePlugin } from './core/plugin'
2121
importVueBetterDefinefrom'@vue-macros/better-define'
2222
importVueBooleanPropfrom'@vue-macros/boolean-prop'
2323
importVueChainCallfrom'@vue-macros/chain-call'
24-
import{resolveOptionsAsync,typeOptions}from'@vue-macros/config'
24+
import{resolveOptions,typeOptions}from'@vue-macros/config'
2525
importVueDefineEmitfrom'@vue-macros/define-emit'
2626
importVueDefineModelsfrom'@vue-macros/define-models'
2727
importVueDefinePropfrom'@vue-macros/define-prop'
@@ -47,20 +47,15 @@ import VueShortEmits from '@vue-macros/short-emits'
4747
importVueShortVmodelfrom'@vue-macros/short-vmodel'
4848
importVueDefineOptionsfrom'unplugin-vue-define-options'
4949

50-
export{
51-
defineConfig,
52-
resolveOptions,
53-
resolveOptionsAsync,
54-
typeOptions,
55-
}from'@vue-macros/config'
50+
export{defineConfig,resolveOptions,typeOptions}from'@vue-macros/config'
5651

5752
constname=generatePluginName()
5853
constplugin:UnpluginCombineInstance<Options|undefined>=
5954
createCombinePlugin<Options|undefined>((userOptions={},meta)=>{
6055
return{
6156
name,
6257
plugins:(async()=>{
63-
constoptions=awaitresolveOptionsAsync(userOptions)
58+
constoptions=awaitresolveOptions(userOptions)
6459

6560
constframework=meta.framework!
6661
constsetupComponentPlugins=resolvePlugin(

‎packages/nuxt/src/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{defineNuxtModule,useNuxt}from'@nuxt/kit'
22
import{REGEX_SETUP_SFC}from'@vue-macros/common'
3-
import{resolveOptionsAsync,typeOptions}from'vue-macros'
3+
import{resolveOptions,typeOptions}from'vue-macros'
44
importVueMacrosfrom'vue-macros/vite'
55
import{githubRepo}from'../../../macros'with{type:'macro'}
66
importtype{}from'@nuxt/devtools'
@@ -16,7 +16,7 @@ const module: NuxtModule<Options> = defineNuxtModule<Options>({
1616
defaults:{},
1717
asyncsetup(options){
1818
constnuxt=useNuxt()
19-
constresolvedOptions=awaitresolveOptionsAsync(options)
19+
constresolvedOptions=awaitresolveOptions(options)
2020

2121
nuxt.options.typescript.tsConfig||={}
2222
//@ts-expect-error

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp