Tweak deepmerge

shipshapecode · Mar 8, 2024 · ff66f76 · ff66f76
1 parent 910f21d
commit ff66f76
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 19 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/shepherd.js/package.json b/shepherd.js/package.json
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@floating-ui/dom": "^1.5.3",
-    "deepmerge": "^4.3.1"
+    "deepmerge-ts": "^5.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.23.5",

diff --git a/shepherd.js/rollup.config.mjs b/shepherd.js/rollup.config.mjs
@@ -7,7 +7,6 @@ import cssnanoPlugin from 'cssnano';
 import { babel } from '@rollup/plugin-babel';
 import serve from 'rollup-plugin-serve';
 import livereload from 'rollup-plugin-livereload';
-import commonjs from '@rollup/plugin-commonjs';
 import filesize from 'rollup-plugin-filesize';
 import license from 'rollup-plugin-license';
 import postcss from 'rollup-plugin-postcss';
@@ -28,7 +27,6 @@ const plugins = [
     preprocess: sveltePreprocess({ typescript: true }),
     emitCss: true
   }),
-  commonjs(),
   nodeResolve({
     extensions: ['.js', '.json', '.svelte', '.ts'],
     modulesOnly: true

diff --git a/shepherd.js/src/step.ts b/shepherd.js/src/step.ts
@@ -1,4 +1,4 @@
-import merge from 'deepmerge';
+import { deepmerge } from 'deepmerge-ts';
 import { Evented } from './evented';
 import autoBind from './utils/auto-bind';
 import {
@@ -514,7 +514,7 @@ export class Step extends Evented {
     let tourOptions =
       this.tour && this.tour.options && this.tour.options.defaultStepOptions;
 
-    tourOptions = merge({}, tourOptions || {}) as StepOptions;
+    tourOptions = deepmerge({}, tourOptions || {});
 
     this.options = Object.assign(
       {

diff --git a/shepherd.js/src/utils/floating-ui.ts b/shepherd.js/src/utils/floating-ui.ts
@@ -1,4 +1,4 @@
-import merge from 'deepmerge';
+import { deepmerge } from 'deepmerge-ts';
 import { shouldCenterStep } from './general';
 import {
   autoUpdate,
@@ -65,7 +65,7 @@ export function mergeTooltipConfig(
   options: StepOptions
 ) {
   return {
-    floatingUIOptions: merge(
+    floatingUIOptions: deepmerge(
       tourOptions.floatingUIOptions || {},
       options.floatingUIOptions || {}
     )
@@ -197,7 +197,7 @@ export function getFloatingUIOptions(
     options.placement = attachToOptions.on;
   }
 
-  return merge(step.options.floatingUIOptions || {}, options);
+  return deepmerge(step.options.floatingUIOptions || {}, options);
 }
 
 function addArrow(step: Step) {

diff --git a/test/cypress/dummy/index.html b/test/cypress/dummy/index.html
@@ -124,10 +124,10 @@ <h3>Example</h3>
     </div>
 
     <!-- Shepherd -->
-    <script
-      type="module"
-      src="../node_modules/shepherd.js/dist/shepherd.js"
-    ></script>
+    <script type="module">
+      import Shepherd from '../node_modules/shepherd.js/dist/shepherd.js';
+      window.Shepherd = Shepherd;
+    </script>
 
     <!-- Welcome page -->
     <script src="js/prism.js"></script>

diff --git a/test/cypress/examples/destroying-elements.html b/test/cypress/examples/destroying-elements.html
@@ -4,10 +4,10 @@
       rel="stylesheet"
       href="../node_modules/shepherd.js/dist/css/shepherd.css"
     />
-    <script
-      type="module"
-      src="../node_modules/shepherd.js/dist/shepherd.js"
-    ></script>
+    <script type="module">
+      import Shepherd from '../node_modules/shepherd.js/dist/shepherd.js';
+      window.Shepherd = Shepherd;
+    </script>
   </head>
 
   <body>