@arcmantle/lit-jsx 1.0.7 → 1.0.8

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.
@@ -20,7 +20,7 @@
20
20
  * ```
21
21
  */
22
22
  import * as babel from '@babel/core';
23
- import { mergeAndConcat } from 'merge-anything';
23
+ import { deepmerge } from 'deepmerge-ts';
24
24
  import { litJsxBabelPlugin } from './babel-plugin.js';
25
25
  import { babelPlugins, debugMode } from './config.js';
26
26
  import { ImportDiscovery } from './import-discovery.js';
@@ -78,7 +78,7 @@ export const litJsx = (options = {}) => {
78
78
  plugins: babelPlugins,
79
79
  },
80
80
  };
81
- const opts = mergeAndConcat(babelUserOptions, babelOptions);
81
+ const opts = deepmerge(babelUserOptions, babelOptions);
82
82
  const result = await babel.transformAsync(source, opts);
83
83
  if (result?.code)
84
84
  return { code: result.code, map: result.map };
@@ -1 +1 @@
1
- {"version":3,"file":"vite-plugin.js","sourceRoot":"","sources":["../../src/compiler/vite-plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,KAAK,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,UAMnB,EAAE,EAAgB,EAAE;IACvB,IAAI,WAAmB,CAAC;IAExB,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAElC,OAAO;QACN,IAAI,EAAI,kBAAkB;QAC1B,MAAM,EAAE;YACP,KAAK,EAAE,KAAK;YACZ,OAAO,CAAC,UAAU,EAAE,GAAG;gBACtB,WAAW,GAAG,UAAU,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAChD,CAAC;SACD;QACD,SAAS,EAAE;YACV,MAAM,EAAE;gBACP,EAAE,EAAI,CAAE,UAAU,EAAE,UAAU,CAAE;gBAChC,IAAI,EAAE,CAAE,IAAI,EAAE,IAAI,CAAE;aACpB;YACD,KAAK,EAAE,KAAK;YACZ,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;gBACvB,uCAAuC;gBACvC,IAAI,gBAAgB,GAA2B,EAAE,CAAC;gBAElD,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;oBACnB,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;wBACzC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;wBAC/C,gBAAgB,GAAG,YAAY,YAAY,OAAO;4BACjD,CAAC,CAAC,MAAM,YAAY;4BACpB,CAAC,CAAC,YAAY,CAAC;oBACjB,CAAC;yBACI,CAAC;wBACL,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC;oBAClC,CAAC;gBACF,CAAC;gBAED,MAAM,YAAY,GAA2B;oBAC5C,IAAI,EAAY,WAAW;oBAC3B,QAAQ,EAAQ,EAAE;oBAClB,cAAc,EAAE,EAAE;oBAClB,OAAO,EAAS,CAAE,iBAAiB,EAAE,CAAE;oBACvC,GAAG,EAAa,KAAK;oBACrB,UAAU,EAAM,IAAI;oBACpB,UAAU,EAAM,KAAK;oBACrB,OAAO,EAAS,KAAK;oBACrB,UAAU,EAAM;wBACf,OAAO,EAAE,YAAY;qBACrB;iBACD,CAAC;gBAEF,MAAM,IAAI,GAAG,cAAc,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;gBAC5D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAExD,IAAI,MAAM,EAAE,IAAI;oBACf,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC;YAChD,CAAC;SACD;QACD,SAAS,CAAC,OAAO;YAChB,eAAe,CAAC,8BAA8B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9D,CAAC;KACD,CAAC;AACH,CAAC,CAAC"}
1
+ {"version":3,"file":"vite-plugin.js","sourceRoot":"","sources":["../../src/compiler/vite-plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,KAAK,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,UAMnB,EAAE,EAAgB,EAAE;IACvB,IAAI,WAAmB,CAAC;IAExB,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAElC,OAAO;QACN,IAAI,EAAI,kBAAkB;QAC1B,MAAM,EAAE;YACP,KAAK,EAAE,KAAK;YACZ,OAAO,CAAC,UAAU,EAAE,GAAG;gBACtB,WAAW,GAAG,UAAU,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAChD,CAAC;SACD;QACD,SAAS,EAAE;YACV,MAAM,EAAE;gBACP,EAAE,EAAI,CAAE,UAAU,EAAE,UAAU,CAAE;gBAChC,IAAI,EAAE,CAAE,IAAI,EAAE,IAAI,CAAE;aACpB;YACD,KAAK,EAAE,KAAK;YACZ,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;gBACvB,uCAAuC;gBACvC,IAAI,gBAAgB,GAA2B,EAAE,CAAC;gBAElD,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;oBACnB,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;wBACzC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;wBAC/C,gBAAgB,GAAG,YAAY,YAAY,OAAO;4BACjD,CAAC,CAAC,MAAM,YAAY;4BACpB,CAAC,CAAC,YAAY,CAAC;oBACjB,CAAC;yBACI,CAAC;wBACL,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC;oBAClC,CAAC;gBACF,CAAC;gBAED,MAAM,YAAY,GAA2B;oBAC5C,IAAI,EAAY,WAAW;oBAC3B,QAAQ,EAAQ,EAAE;oBAClB,cAAc,EAAE,EAAE;oBAClB,OAAO,EAAS,CAAE,iBAAiB,EAAE,CAAE;oBACvC,GAAG,EAAa,KAAK;oBACrB,UAAU,EAAM,IAAI;oBACpB,UAAU,EAAM,KAAK;oBACrB,OAAO,EAAS,KAAK;oBACrB,UAAU,EAAM;wBACf,OAAO,EAAE,YAAY;qBACrB;iBACD,CAAC;gBAEF,MAAM,IAAI,GAAG,SAAS,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;gBACvD,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAExD,IAAI,MAAM,EAAE,IAAI;oBACf,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC;YAChD,CAAC;SACD;QACD,SAAS,CAAC,OAAO;YAChB,eAAe,CAAC,8BAA8B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9D,CAAC;KACD,CAAC;AACH,CAAC,CAAC"}
package/package.json CHANGED
@@ -9,7 +9,7 @@
9
9
  "type": "git",
10
10
  "url": "git+https://github.com/arcmantle/lit-jsx.git"
11
11
  },
12
- "version": "1.0.7",
12
+ "version": "1.0.8",
13
13
  "files": [
14
14
  "dist",
15
15
  "src"
@@ -32,7 +32,7 @@
32
32
  "@types/babel__core": "^7.20.5",
33
33
  "@types/babel__traverse": "^7.20.7",
34
34
  "csstype": "^3.1.3",
35
- "merge-anything": "^6.0.6",
35
+ "deepmerge-ts": "^7.1.5",
36
36
  "oxc-resolver": "^11.5.0",
37
37
  "pino": "^9.7.0",
38
38
  "pino-pretty": "^13.0.0",
@@ -21,7 +21,7 @@
21
21
  */
22
22
 
23
23
  import * as babel from '@babel/core';
24
- import { mergeAndConcat } from 'merge-anything';
24
+ import { deepmerge } from 'deepmerge-ts';
25
25
  import type { PluginOption } from 'vite';
26
26
 
27
27
  import { litJsxBabelPlugin } from './babel-plugin.js';
@@ -94,7 +94,7 @@ export const litJsx = (options: {
94
94
  },
95
95
  };
96
96
 
97
- const opts = mergeAndConcat(babelUserOptions, babelOptions);
97
+ const opts = deepmerge(babelUserOptions, babelOptions);
98
98
  const result = await babel.transformAsync(source, opts);
99
99
 
100
100
  if (result?.code)