@symbo.ls/init 2.10.25 → 2.10.41

package/index.js

@@ -3,11 +3,12 @@
 import {
   set,
   getActiveConfig,
-  getFontFaceString
+  getFontFaceString,
+  appendSVGSprite,
+  appendIconsSprite
 } from '@symbo.ls/scratch'
 
 import { isObject, deepMerge } from '@domql/utils'
-import { initDOMQLEmotion } from 'domql/packages/emotion'
 
 import { emotion as defaultEmotion } from '@symbo.ls/emotion'
 // import { setClassname } from 'css-in-props'
@@ -16,7 +17,7 @@ import DYNAMIC_JSON from './dynamic.json'
 
 const CONFIG = getActiveConfig()
 
-const prepareInit = (config = CONFIG, RC_FILE) => {
+const mergeWithLocalFile = (config = CONFIG, RC_FILE) => {
   const rcfile = isObject(RC_FILE) ? RC_FILE : DYNAMIC_JSON || {}
   return deepMerge(config, rcfile)
 }
@@ -25,37 +26,55 @@ const SET_OPTIONS = {
   emotion: defaultEmotion,
   useVariable: true,
   useReset: true,
-  initDOMQLDefine: true
+  useFontImport: true,
+  useIconSprite: true,
+  useSvgSprite: true
 }
 
 export const init = (config, RC_FILE, options = SET_OPTIONS) => {
-  if (options.initDOMQLDefine) initDOMQLEmotion(options.emotion, options)
-
-  const resultConfig = prepareInit(config, RC_FILE)
+  const resultConfig = mergeWithLocalFile(config, RC_FILE)
   const emotion = options.emotion || defaultEmotion
 
   const conf = set({
-    verbose: false,
+    verbose: options.verbose,
     useReset: options.useReset,
+    useFontImport: options.useFontImport,
+    useVariable: options.useVariable,
+    useSvgSprite: options.useSvgSprite,
+    useIconSprite: options.useIconSprite,
     ...resultConfig
   }, { newConfig: options.newConfig })
 
   const FontFace = getFontFaceString(conf.FONT)
 
-  emotion.injectGlobal(FontFace)
-  if (options.useVariable) emotion.injectGlobal({ ':root': conf.CSS_VARS })
-  if (options.useReset) emotion.injectGlobal(conf.RESET)
-
+  const useReset = conf.useReset
+  const useVariable = conf.useVariable
+  const useFontImport = conf.useFontImport
+  const useSvgSprite = conf.useSvgSprite
+  const hasSvgs = config.svg || config.SVG
+  const useIconSprite = conf.useIconSprite
+  const hasIcons = config.icons || config.ICONS
+
+  if (useFontImport) emotion.injectGlobal(FontFace)
+  if (useVariable) emotion.injectGlobal({ ':root': conf.CSS_VARS })
+  if (useReset) emotion.injectGlobal(conf.RESET)
+
+  if (hasSvgs) appendSVGSprite(hasSvgs, { document: options.document })
+  else if (useSvgSprite) appendSVGSprite(conf.SVG, { document: options.document })
+  
+  if (hasIcons) appendIconsSprite(hasIcons, { document: options.document })
+  else if (useIconSprite) appendIconsSprite(conf.ICONS, { document: options.document })
+  
   return conf
 }
 
 export const updateReset = (config, RC_FILE, options = { emotion: defaultEmotion }) => {
-  const resultConfig = prepareInit(config, RC_FILE)
+  const resultConfig = mergeWithLocalFile(config, RC_FILE)
   const conf = set({
     verbose: false,
     ...resultConfig
   })
-  options.emotion.injectGlobal({ ':root': conf.CSS_VARS })
+  options.emotion.injectGlobal({':root': conf.CSS_VARS })
   options.emotion.injectGlobal(conf.RESET)
 }
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@symbo.ls/init",
-  "version": "2.10.25",
+  "version": "2.10.41",
   "license": "MIT",
-  "gitHead": "891c18159d1045914b41f121474c6b707ac9db83",
+  "gitHead": "fe191d138564726ccb26fb5a6643c4d78709f0d3",
   "source": "index.js",
   "main": "index.js",
   "targets": {