@symbo.ls/init 2.10.121 → 2.10.125
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +6 -4
- package/package.json +2 -2
package/index.js
CHANGED
|
@@ -19,7 +19,8 @@ const CONFIG = getActiveConfig()
|
|
|
19
19
|
|
|
20
20
|
const mergeWithLocalFile = (config = CONFIG, RC_FILE) => {
|
|
21
21
|
const rcfile = isObject(RC_FILE) ? RC_FILE : DYNAMIC_JSON || {}
|
|
22
|
-
|
|
22
|
+
const fileData = deepMerge(config, rcfile)
|
|
23
|
+
return fileData && fileData.system
|
|
23
24
|
}
|
|
24
25
|
|
|
25
26
|
const SET_OPTIONS = {
|
|
@@ -28,11 +29,11 @@ const SET_OPTIONS = {
|
|
|
28
29
|
useReset: true,
|
|
29
30
|
useFontImport: true,
|
|
30
31
|
useIconSprite: true,
|
|
32
|
+
useDocumentTheme: true,
|
|
31
33
|
useSvgSprite: true
|
|
32
34
|
}
|
|
33
35
|
|
|
34
|
-
export const init = (config,
|
|
35
|
-
const resultConfig = mergeWithLocalFile(config, RC_FILE)
|
|
36
|
+
export const init = (config, options = SET_OPTIONS) => {
|
|
36
37
|
const emotion = options.emotion || defaultEmotion
|
|
37
38
|
|
|
38
39
|
const conf = set({
|
|
@@ -41,8 +42,9 @@ export const init = (config, RC_FILE, options = SET_OPTIONS) => {
|
|
|
41
42
|
useFontImport: options.useFontImport,
|
|
42
43
|
useVariable: options.useVariable,
|
|
43
44
|
useSvgSprite: options.useSvgSprite,
|
|
45
|
+
useDocumentTheme: options.useDocumentTheme,
|
|
44
46
|
useIconSprite: options.useIconSprite,
|
|
45
|
-
...
|
|
47
|
+
...config
|
|
46
48
|
}, { newConfig: options.newConfig })
|
|
47
49
|
|
|
48
50
|
const FontFace = getFontFaceString(conf.FONT)
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@symbo.ls/init",
|
|
3
|
-
"version": "2.10.
|
|
3
|
+
"version": "2.10.125",
|
|
4
4
|
"license": "MIT",
|
|
5
|
-
"gitHead": "
|
|
5
|
+
"gitHead": "57e1d4f1ba73357d2452a833b28ccdb51f219b2a",
|
|
6
6
|
"source": "index.js",
|
|
7
7
|
"main": "index.js",
|
|
8
8
|
"dependencies": {
|