@tamagui/metro-plugin 1.120.2 → 1.121.0

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/dist/cjs/index.js CHANGED
@@ -25,23 +25,23 @@ __export(src_exports, {
25
25
  withTamagui: () => withTamagui
26
26
  });
27
27
  module.exports = __toCommonJS(src_exports);
28
- var import_static = require("@tamagui/static"), import_metro = require("react-native-css-interop/metro");
28
+ var import_static = require("@tamagui/static");
29
29
  function withTamagui(metroConfig, optionsIn) {
30
30
  const options = {
31
31
  ...optionsIn,
32
32
  ...(0, import_static.loadTamaguiBuildConfigSync)(optionsIn)
33
33
  }, extractor = (0, import_static.createExtractor)();
34
- options.disable || extractor.loadTamagui(options), options.enableCSSInterop ? metroConfig = (0, import_metro.withCssInterop)(metroConfig, {
35
- ignorePropertyWarningRegex: ["^--"]
36
- // grouping: ['^group(/.*)?'],
37
- }) : metroConfig.resolver = {
34
+ options.disable || extractor.loadTamagui(options), metroConfig.resolver = {
38
35
  ...metroConfig.resolver,
39
- sourceExts: [...metroConfig.resolver.sourceExts, "css"]
36
+ sourceExts: [...metroConfig.resolver?.sourceExts || [], "css"]
40
37
  };
41
38
  const ogTransformPath = metroConfig.transformerPath;
42
39
  return metroConfig.transformerPath = require.resolve("./transformer"), metroConfig.transformer = {
43
40
  ...metroConfig.transformer,
44
- ogTransformPath,
41
+ ...ogTransformPath && {
42
+ ogTransformPath
43
+ },
44
+ // @ts-ignore
45
45
  tamagui: {
46
46
  ...options,
47
47
  disableInitialBuild: !0
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/index.ts"],
4
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAIO,4BACP,eAGO;AAEA,SAAS,YACd,aACA,WAGA;AACA,QAAM,UAAU;AAAA,IACd,GAAG;AAAA,IACH,OAAG,0CAA2B,SAAS;AAAA,EACzC,GAGM,gBAAY,+BAAgB;AAGlC,EAAK,QAAQ,WACN,UAAU,YAAY,OAAO,GAGhC,QAAQ,mBACV,kBAAc,6BAAe,aAAa;AAAA,IACxC,4BAA4B,CAAC,KAAK;AAAA;AAAA,EAEpC,CAAC,IAGD,YAAY,WAAW;AAAA,IACrB,GAAG,YAAY;AAAA,IACf,YAAY,CAAC,GAAG,YAAY,SAAS,YAAY,KAAK;AAAA,EACxD;AAGF,QAAM,kBAAkB,YAAY;AACpC,qBAAY,kBAAkB,gBAAgB,eAAe,GAC7D,YAAY,cAAc;AAAA,IACxB,GAAG,YAAY;AAAA,IACf;AAAA,IACA,SAAS;AAAA,MACP,GAAG;AAAA,MACH,qBAAqB;AAAA,IACvB;AAAA,EACF,GAEO;AACT;",
4
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAIO;AAGA,SAAS,YACd,aACA,WAGA;AACA,QAAM,UAAU;AAAA,IACd,GAAG;AAAA,IACH,OAAG,0CAA2B,SAAS;AAAA,EACzC,GAGM,gBAAY,+BAAgB;AAGlC,EAAK,QAAQ,WACN,UAAU,YAAY,OAAO,GAIpC,YAAY,WAAW;AAAA,IACrB,GAAI,YAAY;AAAA,IAChB,YAAY,CAAC,GAAI,YAAY,UAAU,cAAc,CAAC,GAAI,KAAK;AAAA,EACjE;AAEA,QAAM,kBAAkB,YAAY;AACpC,qBAAY,kBAAkB,gBAAgB,eAAe,GAC7D,YAAY,cAAc;AAAA,IACxB,GAAG,YAAY;AAAA,IACf,GAAI,mBAAmB;AAAA,MACrB;AAAA,IACF;AAAA;AAAA,IAEA,SAAS;AAAA,MACP,GAAG;AAAA,MACH,qBAAqB;AAAA,IACvB;AAAA,EACF,GAEO;AACT;",
5
5
  "names": []
6
6
  }
@@ -26,27 +26,26 @@ __export(src_exports, {
26
26
  withTamagui: () => withTamagui
27
27
  });
28
28
  module.exports = __toCommonJS(src_exports);
29
- var import_static = require("@tamagui/static"), import_metro = require("react-native-css-interop/metro");
29
+ var import_static = require("@tamagui/static");
30
30
  function withTamagui(metroConfig, optionsIn) {
31
- var options = {
31
+ var _metroConfig_resolver, options = {
32
32
  ...optionsIn,
33
33
  ...(0, import_static.loadTamaguiBuildConfigSync)(optionsIn)
34
34
  }, extractor = (0, import_static.createExtractor)();
35
- options.disable || extractor.loadTamagui(options), options.enableCSSInterop ? metroConfig = (0, import_metro.withCssInterop)(metroConfig, {
36
- ignorePropertyWarningRegex: [
37
- "^--"
38
- ]
39
- }) : metroConfig.resolver = {
35
+ options.disable || extractor.loadTamagui(options), metroConfig.resolver = {
40
36
  ...metroConfig.resolver,
41
37
  sourceExts: [
42
- ...metroConfig.resolver.sourceExts,
38
+ ...((_metroConfig_resolver = metroConfig.resolver) === null || _metroConfig_resolver === void 0 ? void 0 : _metroConfig_resolver.sourceExts) || [],
43
39
  "css"
44
40
  ]
45
41
  };
46
42
  var ogTransformPath = metroConfig.transformerPath;
47
43
  return metroConfig.transformerPath = require.resolve("./transformer"), metroConfig.transformer = {
48
44
  ...metroConfig.transformer,
49
- ogTransformPath,
45
+ ...ogTransformPath && {
46
+ ogTransformPath
47
+ },
48
+ // @ts-ignore
50
49
  tamagui: {
51
50
  ...options,
52
51
  disableInitialBuild: !0
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Users/n8/tamagui/code/compiler/metro-plugin/src/index.ts"],
4
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;oBAIO,4BACP,eAGO;AAEA,SAASA,YACdC,aACAC,WAEC;AAED,MAAMC,UAAU;IACd,GAAGD;IACH,OAAGE,0CAA2BF,SAAAA;EAChC,GAGMG,gBAAYC,+BAAAA;AAGlB,EAAKH,QAAQI,WACNF,UAAUG,YAAYL,OAAAA,GAGzBA,QAAQM,mBACVR,kBAAcS,6BAAeT,aAAa;IACxCU,4BAA4B;MAAC;;EAE/B,CAAA,IAGAV,YAAYW,WAAW;IACrB,GAAGX,YAAYW;IACfC,YAAY;SAAIZ,YAAYW,SAASC;MAAY;;EACnD;AAGF,MAAMC,kBAAkBb,YAAYc;AACpCd,qBAAYc,kBAAkBC,gBAAgB,eAAA,GAC9Cf,YAAYgB,cAAc;IACxB,GAAGhB,YAAYgB;IACfH;IACAI,SAAS;MACP,GAAGf;MACHgB,qBAAqB;IACvB;EACF,GAEOlB;AACT;",
5
- "names": ["withTamagui", "metroConfig", "optionsIn", "options", "loadTamaguiBuildConfigSync", "extractor", "createExtractor", "disable", "loadTamagui", "enableCSSInterop", "withCssInterop", "ignorePropertyWarningRegex", "resolver", "sourceExts", "ogTransformPath", "transformerPath", "require", "transformer", "tamagui", "disableInitialBuild"]
4
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;oBAIO;AAGA,SAASA,YACdC,aACAC,WAEC;MAkBkBD,uBAhBbE,UAAU;IACd,GAAGD;IACH,OAAGE,0CAA2BF,SAAAA;EAChC,GAGMG,gBAAYC,+BAAAA;AAGlB,EAAKH,QAAQI,WACNF,UAAUG,YAAYL,OAAAA,GAI7BF,YAAYQ,WAAW;IACrB,GAAIR,YAAYQ;IAChBC,YAAY;WAAKT,wBAAAA,YAAYQ,cAAQ,QAApBR,0BAAAA,SAAAA,SAAAA,sBAAsBS,eAAc,CAAA;MAAK;;EAC5D;AAEA,MAAMC,kBAAkBV,YAAYW;AACpCX,qBAAYW,kBAAkBC,gBAAgB,eAAA,GAC9CZ,YAAYa,cAAc;IACxB,GAAGb,YAAYa;IACf,GAAIH,mBAAmB;MACrBA;IACF;;IAEAI,SAAS;MACP,GAAGZ;MACHa,qBAAqB;IACvB;EACF,GAEOf;AACT;",
5
+ "names": ["withTamagui", "metroConfig", "optionsIn", "options", "loadTamaguiBuildConfigSync", "extractor", "createExtractor", "disable", "loadTamagui", "resolver", "sourceExts", "ogTransformPath", "transformerPath", "require", "transformer", "tamagui", "disableInitialBuild"]
6
6
  }
package/dist/esm/index.js CHANGED
@@ -2,25 +2,22 @@ import {
2
2
  createExtractor,
3
3
  loadTamaguiBuildConfigSync
4
4
  } from "@tamagui/static";
5
- import {
6
- withCssInterop
7
- } from "react-native-css-interop/metro";
8
5
  function withTamagui(metroConfig, optionsIn) {
9
6
  const options = {
10
7
  ...optionsIn,
11
8
  ...loadTamaguiBuildConfigSync(optionsIn)
12
9
  }, extractor = createExtractor();
13
- options.disable || extractor.loadTamagui(options), options.enableCSSInterop ? metroConfig = withCssInterop(metroConfig, {
14
- ignorePropertyWarningRegex: ["^--"]
15
- // grouping: ['^group(/.*)?'],
16
- }) : metroConfig.resolver = {
10
+ options.disable || extractor.loadTamagui(options), metroConfig.resolver = {
17
11
  ...metroConfig.resolver,
18
- sourceExts: [...metroConfig.resolver.sourceExts, "css"]
12
+ sourceExts: [...metroConfig.resolver?.sourceExts || [], "css"]
19
13
  };
20
14
  const ogTransformPath = metroConfig.transformerPath;
21
15
  return metroConfig.transformerPath = require.resolve("./transformer"), metroConfig.transformer = {
22
16
  ...metroConfig.transformer,
23
- ogTransformPath,
17
+ ...ogTransformPath && {
18
+ ogTransformPath
19
+ },
20
+ // @ts-ignore
24
21
  tamagui: {
25
22
  ...options,
26
23
  disableInitialBuild: !0
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/index.ts"],
4
- "mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,OAEK;AACP;AAAA,EACE;AAAA,OAEK;AAEA,SAAS,YACd,aACA,WAGA;AACA,QAAM,UAAU;AAAA,IACd,GAAG;AAAA,IACH,GAAG,2BAA2B,SAAS;AAAA,EACzC,GAGM,YAAY,gBAAgB;AAGlC,EAAK,QAAQ,WACN,UAAU,YAAY,OAAO,GAGhC,QAAQ,mBACV,cAAc,eAAe,aAAa;AAAA,IACxC,4BAA4B,CAAC,KAAK;AAAA;AAAA,EAEpC,CAAC,IAGD,YAAY,WAAW;AAAA,IACrB,GAAG,YAAY;AAAA,IACf,YAAY,CAAC,GAAG,YAAY,SAAS,YAAY,KAAK;AAAA,EACxD;AAGF,QAAM,kBAAkB,YAAY;AACpC,qBAAY,kBAAkB,gBAAgB,eAAe,GAC7D,YAAY,cAAc;AAAA,IACxB,GAAG,YAAY;AAAA,IACf;AAAA,IACA,SAAS;AAAA,MACP,GAAG;AAAA,MACH,qBAAqB;AAAA,IACvB;AAAA,EACF,GAEO;AACT;",
4
+ "mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,OAEK;AAGA,SAAS,YACd,aACA,WAGA;AACA,QAAM,UAAU;AAAA,IACd,GAAG;AAAA,IACH,GAAG,2BAA2B,SAAS;AAAA,EACzC,GAGM,YAAY,gBAAgB;AAGlC,EAAK,QAAQ,WACN,UAAU,YAAY,OAAO,GAIpC,YAAY,WAAW;AAAA,IACrB,GAAI,YAAY;AAAA,IAChB,YAAY,CAAC,GAAI,YAAY,UAAU,cAAc,CAAC,GAAI,KAAK;AAAA,EACjE;AAEA,QAAM,kBAAkB,YAAY;AACpC,qBAAY,kBAAkB,gBAAgB,eAAe,GAC7D,YAAY,cAAc;AAAA,IACxB,GAAG,YAAY;AAAA,IACf,GAAI,mBAAmB;AAAA,MACrB;AAAA,IACF;AAAA;AAAA,IAEA,SAAS;AAAA,MACP,GAAG;AAAA,MACH,qBAAqB;AAAA,IACvB;AAAA,EACF,GAEO;AACT;",
5
5
  "names": []
6
6
  }
@@ -1,22 +1,21 @@
1
1
  import { createExtractor, loadTamaguiBuildConfigSync } from "@tamagui/static";
2
- import { withCssInterop } from "react-native-css-interop/metro";
3
2
  function withTamagui(metroConfig, optionsIn) {
4
3
  const options = {
5
4
  ...optionsIn,
6
5
  ...loadTamaguiBuildConfigSync(optionsIn)
7
6
  },
8
7
  extractor = createExtractor();
9
- options.disable || extractor.loadTamagui(options), options.enableCSSInterop ? metroConfig = withCssInterop(metroConfig, {
10
- ignorePropertyWarningRegex: ["^--"]
11
- // grouping: ['^group(/.*)?'],
12
- }) : metroConfig.resolver = {
8
+ options.disable || extractor.loadTamagui(options), metroConfig.resolver = {
13
9
  ...metroConfig.resolver,
14
- sourceExts: [...metroConfig.resolver.sourceExts, "css"]
10
+ sourceExts: [...(metroConfig.resolver?.sourceExts || []), "css"]
15
11
  };
16
12
  const ogTransformPath = metroConfig.transformerPath;
17
13
  return metroConfig.transformerPath = require.resolve("./transformer"), metroConfig.transformer = {
18
14
  ...metroConfig.transformer,
19
- ogTransformPath,
15
+ ...(ogTransformPath && {
16
+ ogTransformPath
17
+ }),
18
+ // @ts-ignore
20
19
  tamagui: {
21
20
  ...options,
22
21
  disableInitialBuild: !0
@@ -1 +1 @@
1
- {"version":3,"names":["createExtractor","loadTamaguiBuildConfigSync","withCssInterop","withTamagui","metroConfig","optionsIn","options","extractor","disable","loadTamagui","enableCSSInterop","ignorePropertyWarningRegex","resolver","sourceExts","ogTransformPath","transformerPath","require","resolve","transformer","tamagui","disableInitialBuild"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SACEA,eAAA,EACAC,0BAAA,QAEK;AACP,SACEC,cAAA,QAEK;AAEA,SAASC,YACdC,WAAA,EACAC,SAAA,EAGA;EACA,MAAMC,OAAA,GAAU;MACd,GAAGD,SAAA;MACH,GAAGJ,0BAAA,CAA2BI,SAAS;IACzC;IAGME,SAAA,GAAYP,eAAA,CAAgB;EAG7BM,OAAA,CAAQE,OAAA,IACND,SAAA,CAAUE,WAAA,CAAYH,OAAO,GAGhCA,OAAA,CAAQI,gBAAA,GACVN,WAAA,GAAcF,cAAA,CAAeE,WAAA,EAAa;IACxCO,0BAAA,EAA4B,CAAC,KAAK;IAAA;EAEpC,CAAC,IAGDP,WAAA,CAAYQ,QAAA,GAAW;IACrB,GAAGR,WAAA,CAAYQ,QAAA;IACfC,UAAA,EAAY,CAAC,GAAGT,WAAA,CAAYQ,QAAA,CAASC,UAAA,EAAY,KAAK;EACxD;EAGF,MAAMC,eAAA,GAAkBV,WAAA,CAAYW,eAAA;EACpC,OAAAX,WAAA,CAAYW,eAAA,GAAkBC,OAAA,CAAAC,OAAA,CAAgB,eAAe,GAC7Db,WAAA,CAAYc,WAAA,GAAc;IACxB,GAAGd,WAAA,CAAYc,WAAA;IACfJ,eAAA;IACAK,OAAA,EAAS;MACP,GAAGb,OAAA;MACHc,mBAAA,EAAqB;IACvB;EACF,GAEOhB,WAAA;AACT","ignoreList":[]}
1
+ {"version":3,"names":["createExtractor","loadTamaguiBuildConfigSync","withTamagui","metroConfig","optionsIn","options","extractor","disable","loadTamagui","resolver","sourceExts","ogTransformPath","transformerPath","require","resolve","transformer","tamagui","disableInitialBuild"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SACEA,eAAA,EACAC,0BAAA,QAEK;AAGA,SAASC,YACdC,WAAA,EACAC,SAAA,EAGA;EACA,MAAMC,OAAA,GAAU;MACd,GAAGD,SAAA;MACH,GAAGH,0BAAA,CAA2BG,SAAS;IACzC;IAGME,SAAA,GAAYN,eAAA,CAAgB;EAG7BK,OAAA,CAAQE,OAAA,IACND,SAAA,CAAUE,WAAA,CAAYH,OAAO,GAIpCF,WAAA,CAAYM,QAAA,GAAW;IACrB,GAAIN,WAAA,CAAYM,QAAA;IAChBC,UAAA,EAAY,CAAC,IAAIP,WAAA,CAAYM,QAAA,EAAUC,UAAA,IAAc,EAAC,GAAI,KAAK;EACjE;EAEA,MAAMC,eAAA,GAAkBR,WAAA,CAAYS,eAAA;EACpC,OAAAT,WAAA,CAAYS,eAAA,GAAkBC,OAAA,CAAAC,OAAA,CAAgB,eAAe,GAC7DX,WAAA,CAAYY,WAAA,GAAc;IACxB,GAAGZ,WAAA,CAAYY,WAAA;IACf,IAAIJ,eAAA,IAAmB;MACrBA;IACF;IAAA;IAEAK,OAAA,EAAS;MACP,GAAGX,OAAA;MACHY,mBAAA,EAAqB;IACvB;EACF,GAEOd,WAAA;AACT","ignoreList":[]}
@@ -1,25 +1,23 @@
1
1
  import { createExtractor, loadTamaguiBuildConfigSync } from "@tamagui/static";
2
- import { withCssInterop } from "react-native-css-interop/metro";
3
2
  function withTamagui(metroConfig, optionsIn) {
4
- var options = {
3
+ var _metroConfig_resolver, options = {
5
4
  ...optionsIn,
6
5
  ...loadTamaguiBuildConfigSync(optionsIn)
7
6
  }, extractor = createExtractor();
8
- options.disable || extractor.loadTamagui(options), options.enableCSSInterop ? metroConfig = withCssInterop(metroConfig, {
9
- ignorePropertyWarningRegex: [
10
- "^--"
11
- ]
12
- }) : metroConfig.resolver = {
7
+ options.disable || extractor.loadTamagui(options), metroConfig.resolver = {
13
8
  ...metroConfig.resolver,
14
9
  sourceExts: [
15
- ...metroConfig.resolver.sourceExts,
10
+ ...((_metroConfig_resolver = metroConfig.resolver) === null || _metroConfig_resolver === void 0 ? void 0 : _metroConfig_resolver.sourceExts) || [],
16
11
  "css"
17
12
  ]
18
13
  };
19
14
  var ogTransformPath = metroConfig.transformerPath;
20
15
  return metroConfig.transformerPath = require.resolve("./transformer"), metroConfig.transformer = {
21
16
  ...metroConfig.transformer,
22
- ogTransformPath,
17
+ ...ogTransformPath && {
18
+ ogTransformPath
19
+ },
20
+ // @ts-ignore
23
21
  tamagui: {
24
22
  ...options,
25
23
  disableInitialBuild: !0
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Users/n8/tamagui/code/compiler/metro-plugin/src/index.ts"],
4
- "mappings": "AAAA,SACEA,iBACAC,kCAEK;AACP,SACEC,sBAEK;AAEA,SAASC,YACdC,aACAC,WAEC;AAED,MAAMC,UAAU;IACd,GAAGD;IACH,GAAGJ,2BAA2BI,SAAAA;EAChC,GAGME,YAAYP,gBAAAA;AAGlB,EAAKM,QAAQE,WACND,UAAUE,YAAYH,OAAAA,GAGzBA,QAAQI,mBACVN,cAAcF,eAAeE,aAAa;IACxCO,4BAA4B;MAAC;;EAE/B,CAAA,IAGAP,YAAYQ,WAAW;IACrB,GAAGR,YAAYQ;IACfC,YAAY;SAAIT,YAAYQ,SAASC;MAAY;;EACnD;AAGF,MAAMC,kBAAkBV,YAAYW;AACpCX,qBAAYW,kBAAkBC,gBAAgB,eAAA,GAC9CZ,YAAYa,cAAc;IACxB,GAAGb,YAAYa;IACfH;IACAI,SAAS;MACP,GAAGZ;MACHa,qBAAqB;IACvB;EACF,GAEOf;AACT;",
5
- "names": ["createExtractor", "loadTamaguiBuildConfigSync", "withCssInterop", "withTamagui", "metroConfig", "optionsIn", "options", "extractor", "disable", "loadTamagui", "enableCSSInterop", "ignorePropertyWarningRegex", "resolver", "sourceExts", "ogTransformPath", "transformerPath", "require", "transformer", "tamagui", "disableInitialBuild"]
4
+ "mappings": "AAAA,SACEA,iBACAC,kCAEK;AAGA,SAASC,YACdC,aACAC,WAEC;MAkBkBD,uBAhBbE,UAAU;IACd,GAAGD;IACH,GAAGH,2BAA2BG,SAAAA;EAChC,GAGME,YAAYN,gBAAAA;AAGlB,EAAKK,QAAQE,WACND,UAAUE,YAAYH,OAAAA,GAI7BF,YAAYM,WAAW;IACrB,GAAIN,YAAYM;IAChBC,YAAY;WAAKP,wBAAAA,YAAYM,cAAQ,QAApBN,0BAAAA,SAAAA,SAAAA,sBAAsBO,eAAc,CAAA;MAAK;;EAC5D;AAEA,MAAMC,kBAAkBR,YAAYS;AACpCT,qBAAYS,kBAAkBC,gBAAgB,eAAA,GAC9CV,YAAYW,cAAc;IACxB,GAAGX,YAAYW;IACf,GAAIH,mBAAmB;MACrBA;IACF;;IAEAI,SAAS;MACP,GAAGV;MACHW,qBAAqB;IACvB;EACF,GAEOb;AACT;",
5
+ "names": ["createExtractor", "loadTamaguiBuildConfigSync", "withTamagui", "metroConfig", "optionsIn", "options", "extractor", "disable", "loadTamagui", "resolver", "sourceExts", "ogTransformPath", "transformerPath", "require", "transformer", "tamagui", "disableInitialBuild"]
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/metro-plugin",
3
- "version": "1.120.2",
3
+ "version": "1.121.0",
4
4
  "source": "src/index.ts",
5
5
  "types": "./types/index.d.ts",
6
6
  "main": "dist/cjs/index.js",
@@ -23,13 +23,13 @@
23
23
  "clean:build": "tamagui-build clean:build"
24
24
  },
25
25
  "dependencies": {
26
- "@tamagui/static": "1.120.2",
26
+ "@tamagui/static": "1.121.0",
27
27
  "fs-extra": "^11.2.0",
28
28
  "metro-config": "^0.80.4",
29
29
  "metro-transform-worker": "^0.80.4",
30
30
  "react-native-css-interop": "^0.1.22"
31
31
  },
32
32
  "devDependencies": {
33
- "@tamagui/build": "1.120.2"
33
+ "@tamagui/build": "1.121.0"
34
34
  }
35
35
  }
package/src/index.ts CHANGED
@@ -3,13 +3,10 @@ import {
3
3
  loadTamaguiBuildConfigSync,
4
4
  type TamaguiOptions,
5
5
  } from '@tamagui/static'
6
- import {
7
- withCssInterop,
8
- type ComposableIntermediateConfigT,
9
- } from 'react-native-css-interop/metro'
6
+ import type { IntermediateConfigT } from 'metro-config'
10
7
 
11
8
  export function withTamagui(
12
- metroConfig: ComposableIntermediateConfigT,
9
+ metroConfig: Partial<IntermediateConfigT>,
13
10
  optionsIn?: TamaguiOptions & {
14
11
  enableCSSInterop?: boolean
15
12
  }
@@ -27,24 +24,20 @@ export function withTamagui(
27
24
  void extractor.loadTamagui(options)
28
25
  }
29
26
 
30
- if (options.enableCSSInterop) {
31
- metroConfig = withCssInterop(metroConfig, {
32
- ignorePropertyWarningRegex: ['^--'],
33
- // grouping: ['^group(/.*)?'],
34
- })
35
- } else {
36
- // done in css interop
37
- metroConfig.resolver = {
38
- ...metroConfig.resolver,
39
- sourceExts: [...metroConfig.resolver.sourceExts, 'css'],
40
- }
27
+ // done in css interop
28
+ metroConfig.resolver = {
29
+ ...(metroConfig.resolver as any),
30
+ sourceExts: [...(metroConfig.resolver?.sourceExts || []), 'css'],
41
31
  }
42
32
 
43
33
  const ogTransformPath = metroConfig.transformerPath
44
34
  metroConfig.transformerPath = require.resolve('./transformer')
45
35
  metroConfig.transformer = {
46
36
  ...metroConfig.transformer,
47
- ogTransformPath,
37
+ ...(ogTransformPath && {
38
+ ogTransformPath,
39
+ }),
40
+ // @ts-ignore
48
41
  tamagui: {
49
42
  ...options,
50
43
  disableInitialBuild: true,
package/types/index.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { type TamaguiOptions } from '@tamagui/static';
2
- import { type ComposableIntermediateConfigT } from 'react-native-css-interop/metro';
3
- export declare function withTamagui(metroConfig: ComposableIntermediateConfigT, optionsIn?: TamaguiOptions & {
2
+ import type { IntermediateConfigT } from 'metro-config';
3
+ export declare function withTamagui(metroConfig: Partial<IntermediateConfigT>, optionsIn?: TamaguiOptions & {
4
4
  enableCSSInterop?: boolean;
5
- }): ComposableIntermediateConfigT;
5
+ }): Partial<IntermediateConfigT>;
6
6
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAEL,KAAK,6BAA6B,EACnC,MAAM,gCAAgC,CAAA;AAEvC,wBAAgB,WAAW,CACzB,WAAW,EAAE,6BAA6B,EAC1C,SAAS,CAAC,EAAE,cAAc,GAAG;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,iCAwCF"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAEvD,wBAAgB,WAAW,CACzB,WAAW,EAAE,OAAO,CAAC,mBAAmB,CAAC,EACzC,SAAS,CAAC,EAAE,cAAc,GAAG;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,gCAoCF"}