@symbo.ls/init 1.1.7 → 1.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/init",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "license": "MIT",
   "gitHead": "54fa6500c697604b3f48ba33a573545d7bff35fa",
   "source": "src/index.js",

package/src/index.js

@@ -2,41 +2,45 @@
 
 import {
   set,
-  FONT,
-  RESET,
-  getFontFaceString,
-  CONFIG
+  getActiveConfig,
+  getFontFaceString
 } from '@symbo.ls/scratch'
 
-import { deepMerge, isObject } from '@domql/utils'
+import { isObject, deepMerge } from '@domql/utils'
+import { initDOMQLEmotion } from 'domql/packages/emotion'
 
-import CONFIG_DEFAULT from '@symbo.ls/config-default'
-import SYMBOLSRC_FILE from '../.symbolsrc.json'
+import { emotion } from '@symbo.ls/create-emotion'
+import { setClassname } from 'css-in-props'
 
 import DYNAMIC_JSON from './dynamic.json'
 
-import createEmotion from '@symbo.ls/create-emotion'
-import { setClassname } from 'css-in-props'
+const CONFIG = getActiveConfig()
 
-const { css, injectGlobal } = createEmotion
+const prepareInit = (config = {}, RC_FILE) => {
+  // const defaultConfig = merge(config, CONFIG_DEFAULT)
+  const rcfile = isObject(RC_FILE) ? RC_FILE : DYNAMIC_JSON || {}
+  return deepMerge(config, rcfile)
+}
 
-export const init = (config, RC_FILE, options = { emotion: createEmotion }) => {
-  const defaultConfig = config || CONFIG_DEFAULT || SYMBOLSRC_FILE
+export const init = (config, RC_FILE, options = { emotion, initDOMQLDefine: true }) => {
+  if (options.initDOMQLDefine) initDOMQLEmotion(options.emotion, options)
 
-  const rcfile = isObject(RC_FILE) ? RC_FILE : DYNAMIC_JSON
-  const resultConfig = deepMerge(rcfile, defaultConfig)
+  const resultConfig = prepareInit(config)
 
-  const conf = set({ verbose: false, ...resultConfig })
-  const FontFace = getFontFaceString(FONT)
+  const conf = set({ verbose: false, ...resultConfig }, { newConfig: options.newConfig })
+  const FontFace = getFontFaceString(conf.FONT)
 
-  injectGlobal(FontFace)
-  if (conf.useReset) injectGlobal(RESET)
+  options.emotion.injectGlobal(FontFace)
+  if (conf.useReset) options.emotion.injectGlobal(conf.RESET)
 
   return conf
 }
 
-export const updateReset = () => injectGlobal(RESET)
+export const updateReset = (options = { emotion }) => {
+  const CONFIG = getActiveConfig()
+  options.emotion.injectGlobal(CONFIG.RESET)
+}
 
-export const setClass = props => setClassname(props, css)
+export const setClass = (props, options = { emotion }) => setClassname(props, options.emotion.css)
 
 export { CONFIG }

package/.symbolsrc.json

@@ -1 +0,0 @@
-{"version":"0.0.1","COLOR":{"transparent":"rgba(0, 0, 0, 0)","black":"black","blue":"#0079FD","indigo":"#50E1FF","green":"#59AC56","red":"#FE5B47","yellow":"#EDCB38","orange":"#E2862F","brown":"#7D6755","pink":"#FD8ABF","purple":"#7345AF","white":"white"},"GRADIENT":{"gradient-dark":"linear-gradient(0deg,\n    rgba(0,0,0,0.06) 0%,\n    rgba(0,0,0,0.07) 100%\n  )","gradient-dark-active":"linear-gradient(0deg,\n    rgba(0,0,0,0.09) 0%,\n    rgba(0,0,0,0.1) 100%\n  )","gradient-light":"linear-gradient(\n    0deg,\n    rgba(255,255,255,0.05) 0%,\n    rgba(255,255,255,0.06) 100%\n  )","gradient-light-active":"linear-gradient(\n    0deg,\n    rgba(255,255,255,0.09) 0%,\n    rgba(255,255,255,0.10) 100%\n  )"},"THEME":{"document":{"variants":{"light":{"color":"black","background":"white"},"dark":{"color":"white","background":"black"}}},"primary":{"color":"white","background":"blue"},"secondary":{"variants":{"light":{"color":"white","background":"gradient-light"},"dark":{"color":"white","background":"gradient-dark-active"}}}},"FONT":{"Karla":[{"url":"https://symbols-fonts.s3.us-west-1.amazonaws.com/Karla/Karla-VariableFont_wght.ttf","fontWeight":"variable","fontStyle":"normal","fontDisplay":"swap","unicodeRange":"U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF"},{"url":"https://symbols-fonts.s3.us-west-1.amazonaws.com/Karla/Karla-VariableFont_wght.ttf","fontStyle":"normal","fontWeight":"variable","fontDisplay":"swap","unicodeRange":"U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD"}]},"FONT_FAMILY":{"StartWithKarla":{"default":true,"value":["\"Karla\""],"type":"serif"}}}