Skip to content

Commit

Permalink
chore: 🔨 updated
Browse files Browse the repository at this point in the history
  • Loading branch information
zouyaoji committed Oct 24, 2023
1 parent a324984 commit bd18bbb
Show file tree
Hide file tree
Showing 6 changed files with 6,288 additions and 5,573 deletions.
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,17 @@
"@types/lodash-es": "4.17.6",
"@types/markdown-it": "12.2.3",
"@types/merge-descriptors": "1.0.1",
"@types/node": "*",
"@types/node": "20.8.8",
"@types/proj4": "2.5.0",
"@types/sass": "^1.43.1",
"@types/webpack-dev-server": "^4.1.0",
"@typescript-eslint/eslint-plugin": "5.58.0",
"@typescript-eslint/parser": "5.58.0",
"@vue/babel-plugin-jsx": "1.1.1",
"@vue/compiler-sfc": "^3.2.30",
"@vue/compiler-sfc": "3.2.47",
"@vue/component-compiler-utils": "^3.3.0",
"@vue/shared": "^3.2.30",
"@vue/test-utils": "2.0.0-rc.18",
"@vue/shared": "3.2.47",
"@vue/test-utils": "2.3.2",
"algoliasearch": "^4.10.5",
"babel-jest": "^26.6.3",
"babel-loader": "^8.2.3",
Expand All @@ -126,7 +126,7 @@
"echarts": "^5.2.1",
"element-plus": "^2.0.5",
"element-theme-chalk": "^2.15.6",
"esbuild": "0.14.20",
"esbuild": "0.19.5",
"eslint": "^8.23.1",
"eslint-config-prettier": "^8.8.0",
"eslint-define-config": "1.17.0",
Expand All @@ -141,7 +141,7 @@
"highlight.js": "^11.2.0",
"html-webpack-plugin": "4.3.0",
"husky": "7.0.4",
"jest": "26.6.3",
"jest": "29.7.0",
"jest-electron": "0.1.12",
"lint-staged": "12.3.3",
"markdown-it": "^12.2.0",
Expand All @@ -165,17 +165,17 @@
"sucrase": "3.20.3",
"throttle-debounce": "2.3.0",
"transliteration": "^2.2.0",
"ts-jest": "26.5.6",
"ts-morph": "13.0.3",
"ts-jest": "29.1.1",
"ts-morph": "20.0.0",
"type-fest": "^2.18.0",
"typescript": "^5.0.4",
"typescript": "^5.2.2",
"url-loader": "^4.1.1",
"vitest": "0.12.6",
"vitest": "0.34.6",
"vue": "3.2.47",
"vue-jest": "5.0.0-alpha.10",
"vue-loader": "16.5.0",
"vue-router": "^4.0.12",
"vue-tsc": "^1.2.0",
"vue-tsc": "^1.8.20",
"webpack": "4.44.1",
"webpack-bundle-analyzer": "3.9.0",
"webpack-cli": "3.3.12",
Expand Down
12 changes: 9 additions & 3 deletions packages/composables/use-global-config/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* @Author: zouyaoji@https://github.com/zouyaoji
* @Date: 2022-02-09 16:19:57
* @LastEditTime: 2022-09-06 23:38:00
* @LastEditors: zouyaoji
* @LastEditTime: 2023-10-23 17:23:48
* @LastEditors: zouyaoji [email protected]
* @Description:
* @FilePath: \vue-cesium@next\packages\composables\use-global-config\index.ts
*/
Expand Down Expand Up @@ -44,7 +44,13 @@ export const provideGlobalConfig = (config: MaybeRef<ConfigProviderContext>, app
if (!oldConfig?.value) return cfg
return mergeConfig(oldConfig.value, cfg)
})
provideFn(configProviderContextKey, context)

if (app?.provide) {
app.provide(configProviderContextKey, context)
} else {
provide(configProviderContextKey, context)
}

if (global || !globalConfig.value) {
globalConfig.value = context.value
}
Expand Down
4 changes: 2 additions & 2 deletions packages/theme-default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"gulp-postcss": "9.0.1",
"gulp-rename": "2.0.0",
"gulp-sass": "5.1.0",
"postcss": "^8.3.9",
"postcss-import": "^14.0.2",
"postcss": "^8.4.31",
"postcss-import": "^15.1.0",
"postcss-url": "^10.1.3"
}
}
Loading

0 comments on commit bd18bbb

Please sign in to comment.