@tamagui/web 1.130.4 → 1.130.6

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.
Files changed (94) hide show
  1. package/dist/cjs/Tamagui.cjs +3 -3
  2. package/dist/cjs/_withStableStyle.cjs +1 -1
  3. package/dist/cjs/config.cjs +4 -1
  4. package/dist/cjs/config.js +4 -1
  5. package/dist/cjs/config.js.map +1 -1
  6. package/dist/cjs/config.native.js +4 -1
  7. package/dist/cjs/config.native.js.map +2 -2
  8. package/dist/cjs/contexts/ComponentContext.cjs +1 -1
  9. package/dist/cjs/createComponent.cjs +21 -21
  10. package/dist/cjs/createTamagui.cjs +14 -14
  11. package/dist/cjs/createTamagui.js +5 -9
  12. package/dist/cjs/createTamagui.js.map +1 -1
  13. package/dist/cjs/createTamagui.native.js +5 -7
  14. package/dist/cjs/createTamagui.native.js.map +2 -2
  15. package/dist/cjs/createTokens.cjs +1 -1
  16. package/dist/cjs/createVariable.cjs +1 -1
  17. package/dist/cjs/createVariables.cjs +1 -1
  18. package/dist/cjs/helpers/createMediaStyle.cjs +3 -3
  19. package/dist/cjs/helpers/createStyledContext.cjs +1 -1
  20. package/dist/cjs/helpers/expandStyle.cjs +2 -2
  21. package/dist/cjs/helpers/expandStyles.cjs +1 -1
  22. package/dist/cjs/helpers/getCSSStylesAtomic.cjs +7 -7
  23. package/dist/cjs/helpers/getExpandedShorthands.cjs +1 -1
  24. package/dist/cjs/helpers/getGroupPropParts.cjs +1 -1
  25. package/dist/cjs/helpers/getShorthandValue.cjs +1 -1
  26. package/dist/cjs/helpers/getSplitStyles.cjs +20 -20
  27. package/dist/cjs/helpers/getThemeCSSRules.cjs +5 -5
  28. package/dist/cjs/helpers/getVariantExtras.cjs +1 -1
  29. package/dist/cjs/helpers/insertStyleRule.cjs +1 -1
  30. package/dist/cjs/helpers/isTamaguiElement.cjs +1 -1
  31. package/dist/cjs/helpers/log.cjs +1 -1
  32. package/dist/cjs/helpers/mergeProps.cjs +2 -2
  33. package/dist/cjs/helpers/normalizeShadow.cjs +2 -2
  34. package/dist/cjs/helpers/normalizeStyle.cjs +5 -5
  35. package/dist/cjs/helpers/propMapper.cjs +8 -8
  36. package/dist/cjs/helpers/registerCSSVariable.cjs +1 -1
  37. package/dist/cjs/helpers/setElementProps.cjs +1 -1
  38. package/dist/cjs/helpers/skipProps.cjs +1 -1
  39. package/dist/cjs/helpers/subscribeToContextGroup.cjs +1 -1
  40. package/dist/cjs/helpers/themeable.cjs +1 -1
  41. package/dist/cjs/helpers/themes.cjs +1 -1
  42. package/dist/cjs/helpers/transformsToString.cjs +1 -1
  43. package/dist/cjs/hooks/getThemeProxied.cjs +4 -4
  44. package/dist/cjs/hooks/useComponentState.cjs +3 -3
  45. package/dist/cjs/hooks/useConfiguration.cjs +1 -1
  46. package/dist/cjs/hooks/useDisableSSR.cjs +1 -1
  47. package/dist/cjs/hooks/useMedia.cjs +3 -3
  48. package/dist/cjs/hooks/useProps.cjs +9 -9
  49. package/dist/cjs/hooks/useTheme.cjs +2 -2
  50. package/dist/cjs/hooks/useThemeName.cjs +1 -1
  51. package/dist/cjs/hooks/useThemeState.cjs +2 -2
  52. package/dist/cjs/index.cjs +63 -63
  53. package/dist/cjs/insertFont.cjs +5 -5
  54. package/dist/cjs/loadDuplicatedConfig.cjs +31 -0
  55. package/dist/cjs/loadDuplicatedConfig.js +28 -0
  56. package/dist/cjs/loadDuplicatedConfig.js.map +6 -0
  57. package/dist/cjs/loadDuplicatedConfig.native.js +31 -0
  58. package/dist/cjs/loadDuplicatedConfig.native.js.map +6 -0
  59. package/dist/cjs/styled.cjs +3 -3
  60. package/dist/cjs/types.cjs +2 -2
  61. package/dist/cjs/views/Configuration.cjs +1 -1
  62. package/dist/cjs/views/Stack.cjs +2 -2
  63. package/dist/cjs/views/TamaguiProvider.cjs +5 -5
  64. package/dist/cjs/views/Text.cjs +1 -1
  65. package/dist/cjs/views/Theme.cjs +5 -5
  66. package/dist/cjs/views/ThemeDebug.cjs +1 -1
  67. package/dist/cjs/views/ThemeProvider.cjs +3 -3
  68. package/dist/cjs/views/View.cjs +2 -2
  69. package/dist/esm/config.js +4 -0
  70. package/dist/esm/config.js.map +1 -1
  71. package/dist/esm/config.mjs +3 -0
  72. package/dist/esm/config.mjs.map +1 -1
  73. package/dist/esm/config.native.js +3 -0
  74. package/dist/esm/config.native.js.map +1 -1
  75. package/dist/esm/createTamagui.js +5 -8
  76. package/dist/esm/createTamagui.js.map +1 -1
  77. package/dist/esm/createTamagui.mjs +4 -4
  78. package/dist/esm/createTamagui.mjs.map +1 -1
  79. package/dist/esm/createTamagui.native.js +5 -5
  80. package/dist/esm/createTamagui.native.js.map +1 -1
  81. package/dist/esm/loadDuplicatedConfig.js +12 -0
  82. package/dist/esm/loadDuplicatedConfig.js.map +6 -0
  83. package/dist/esm/loadDuplicatedConfig.mjs +8 -0
  84. package/dist/esm/loadDuplicatedConfig.mjs.map +1 -0
  85. package/dist/esm/loadDuplicatedConfig.native.js +8 -0
  86. package/dist/esm/loadDuplicatedConfig.native.js.map +1 -0
  87. package/package.json +12 -12
  88. package/src/config.ts +5 -0
  89. package/src/createTamagui.ts +5 -15
  90. package/src/loadDuplicatedConfig.ts +20 -0
  91. package/types/config.d.ts.map +1 -1
  92. package/types/createTamagui.d.ts.map +1 -1
  93. package/types/loadDuplicatedConfig.d.ts +3 -0
  94. package/types/loadDuplicatedConfig.d.ts.map +1 -0
@@ -1,4 +1,4 @@
1
- import { isWeb, IS_REACT_19 } from '@tamagui/constants'
1
+ import { isWeb } from '@tamagui/constants'
2
2
  import { configListeners, setConfig, setTokens } from './config'
3
3
  import type { Variable } from './createVariable'
4
4
  import type { DeepVariableObject } from './createVariables'
@@ -10,6 +10,7 @@ import { registerCSSVariable, variableToCSS } from './helpers/registerCSSVariabl
10
10
  import { ensureThemeVariable } from './helpers/themes'
11
11
  import { configureMedia } from './hooks/useMedia'
12
12
  import { parseFont, registerFontVariables } from './insertFont'
13
+ import { loadDuplicatedConfig } from './loadDuplicatedConfig'
13
14
  import { Tamagui } from './Tamagui'
14
15
  import type {
15
16
  CreateTamaguiProps,
@@ -25,9 +26,6 @@ import type {
25
26
  TokensParsed,
26
27
  } from './types'
27
28
 
28
- // config is re-run by @tamagui/static, dont double validate
29
- const createdConfigs = new WeakMap<any, boolean>()
30
-
31
29
  /**
32
30
  * Determines if a token category should have px units added.
33
31
  * Following the principle: only add px to predefined categories that need them.
@@ -46,15 +44,9 @@ function shouldTokenCategoryHaveUnits(category: string): boolean {
46
44
  export function createTamagui<Conf extends CreateTamaguiProps>(
47
45
  configIn: Conf
48
46
  ): InferTamaguiConfig<Conf> {
49
- if (process.env.NODE_ENV === 'test' && globalThis.__tamaguiConfig) {
50
- console.warn(
51
- `Warning: You somehow have duplicate Tamagui dependencies, this can cause issues. Tamagui is working around this by loading a previously loaded config in test mode. `
52
- )
53
- return globalThis.__tamaguiConfig
54
- }
55
-
56
- if (createdConfigs.has(configIn)) {
57
- return configIn as any
47
+ const dup = loadDuplicatedConfig()
48
+ if (dup) {
49
+ return dup as any
58
50
  }
59
51
 
60
52
  // ensure variables
@@ -317,8 +309,6 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
317
309
  setConfig(config)
318
310
  configureMedia(config)
319
311
 
320
- createdConfigs.set(config, true)
321
-
322
312
  if (process.env.NODE_ENV === 'test') {
323
313
  globalThis.__tamaguiConfig = config
324
314
  }
@@ -0,0 +1,20 @@
1
+ import type { GenericTamaguiConfig, TamaguiInternalConfig } from './types'
2
+
3
+ let hasLogged = false
4
+
5
+ export function loadDuplicatedConfig(): TamaguiInternalConfig | null {
6
+ if (process.env.NODE_ENV !== 'production') {
7
+ if (globalThis.__tamaguiConfig) {
8
+ hasLogged = true
9
+ if (!hasLogged) {
10
+ console.warn(
11
+ `Warning: You have duplicate Tamagui dependencies which can cause major, confusing issues.
12
+ In dev/test, we're working around this by loading a previously loaded config.
13
+ In production, this will error.`
14
+ )
15
+ }
16
+ return globalThis.__tamaguiConfig
17
+ }
18
+ }
19
+ return null
20
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,qBAAqB,EACrB,KAAK,EACL,MAAM,EACN,YAAY,EACb,MAAM,SAAS,CAAA;AAYhB,eAAO,MAAM,UAAU,GAAI,GAAG,SAAS,MAAM,sBAAsB,EACjE,KAAK,GAAG,KACP,sBAAsB,CAAC,GAAG,CAS5B,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,qBAAqB,SAEpD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,MAAM,GAAG,EAAE,YAAY,GAAG,SAMrE,CAAA;AAED,eAAO,MAAM,SAAS,6BASrB,CAAA;AAED,eAAO,MAAM,cAAc,oCAE1B,CAAA;AAGD,wBAAgB,SAAS,CAAC,CAAC,EAAE,YAAY,QAExC;AAED,eAAO,MAAM,SAAS,GAAI,gBAEvB;IACD;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACd,KAAG,YAQR,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,OAAO,KAAK,EAAE,QAAQ,MAAM,MAAM,6CAShE,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,OAAO,KAAK,EAAE,QAAQ,MAAM,MAAM,EAAE,qBAAmB,QAG/E,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,OAAO,KAAK,GAAG,OAAO,GAAG,MAAM,EAAE,QAAQ,MAAM,MAAM,QAGlF,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,mBAvCnB;IACD;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,KAAQ,YAkCyB,CAAA;AAElC,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;CAAqB,CAAA;AAE3C,eAAO,MAAM,eAAe,qBAA4B,CAAA;AAExD,eAAO,MAAM,gBAAgB,GAAI,IAAI,cAAc,SAMlD,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,KAAK,MAAM,EAAE,OAAO,GAAG,SAGnD,CAAA;AAGD,eAAO,MAAM,OAAO,GAAI,MAAM,MAAM,4DAQnC,CAAA;AAED,KAAK,SAAS,GAAG;IACf,UAAU,CAAC,EACP,OAAO,GACP;QACE,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CAAA;CACN,CAAA;AAED,eAAO,IAAI,SAAS,EAAE,SAAS,GAAG,SAAS,CAAA;AAE3C,wBAAgB,QAAQ,CAAC,IAAI,EAAE,SAAS,QAIvC"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,qBAAqB,EACrB,KAAK,EACL,MAAM,EACN,YAAY,EACb,MAAM,SAAS,CAAA;AAahB,eAAO,MAAM,UAAU,GAAI,GAAG,SAAS,MAAM,sBAAsB,EACjE,KAAK,GAAG,KACP,sBAAsB,CAAC,GAAG,CAS5B,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,qBAAqB,SAEpD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,MAAM,GAAG,EAAE,YAAY,GAAG,SAMrE,CAAA;AAED,eAAO,MAAM,SAAS,6BAarB,CAAA;AAED,eAAO,MAAM,cAAc,oCAE1B,CAAA;AAGD,wBAAgB,SAAS,CAAC,CAAC,EAAE,YAAY,QAExC;AAED,eAAO,MAAM,SAAS,GAAI,gBAEvB;IACD;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACd,KAAG,YAQR,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,OAAO,KAAK,EAAE,QAAQ,MAAM,MAAM,6CAShE,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,OAAO,KAAK,EAAE,QAAQ,MAAM,MAAM,EAAE,qBAAmB,QAG/E,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,OAAO,KAAK,GAAG,OAAO,GAAG,MAAM,EAAE,QAAQ,MAAM,MAAM,QAGlF,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,mBAvCnB;IACD;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,KAAQ,YAkCyB,CAAA;AAElC,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;CAAqB,CAAA;AAE3C,eAAO,MAAM,eAAe,qBAA4B,CAAA;AAExD,eAAO,MAAM,gBAAgB,GAAI,IAAI,cAAc,SAMlD,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,KAAK,MAAM,EAAE,OAAO,GAAG,SAGnD,CAAA;AAGD,eAAO,MAAM,OAAO,GAAI,MAAM,MAAM,4DAQnC,CAAA;AAED,KAAK,SAAS,GAAG;IACf,UAAU,CAAC,EACP,OAAO,GACP;QACE,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CAAA;CACN,CAAA;AAED,eAAO,IAAI,SAAS,EAAE,SAAS,GAAG,SAAS,CAAA;AAE3C,wBAAgB,QAAQ,CAAC,IAAI,EAAE,SAAS,QAIvC"}
@@ -1 +1 @@
1
- {"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,kBAAkB,EAKlB,kBAAkB,EAMnB,MAAM,SAAS,CAAA;AAoBhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CAqS1B"}
1
+ {"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,kBAAkB,EAKlB,kBAAkB,EAMnB,MAAM,SAAS,CAAA;AAiBhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CA6R1B"}
@@ -0,0 +1,3 @@
1
+ import type { TamaguiInternalConfig } from './types';
2
+ export declare function loadDuplicatedConfig(): TamaguiInternalConfig | null;
3
+ //# sourceMappingURL=loadDuplicatedConfig.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"loadDuplicatedConfig.d.ts","sourceRoot":"","sources":["../src/loadDuplicatedConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAwB,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAI1E,wBAAgB,oBAAoB,IAAI,qBAAqB,GAAG,IAAI,CAenE"}