From cc63707a7c4e664911a0390c088e88e3f8594f3f Mon Sep 17 00:00:00 2001
From: Taye Adeyemi <dev@taye.me>
Date: Sun, 10 Jul 2022 00:07:50 +0200
Subject: [PATCH 1/6] fix(interact): remove types dependency

---
 packages/@interactjs/interact/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/@interactjs/interact/package.json b/packages/@interactjs/interact/package.json
index 1517fcf77..858c44df3 100644
--- a/packages/@interactjs/interact/package.json
+++ b/packages/@interactjs/interact/package.json
@@ -11,7 +11,6 @@
   },
   "dependencies": {
     "@interactjs/core": "1.10.17",
-    "@interactjs/types": "1.10.17",
     "@interactjs/utils": "1.10.17"
   },
   "publishConfig": {

From 9c280e4e6557ff3732678d1c387250a3801d6e05 Mon Sep 17 00:00:00 2001
From: Taye Adeyemi <dev@taye.me>
Date: Sun, 10 Jul 2022 02:36:44 +0200
Subject: [PATCH 2/6] fix: set  "type": "module" for scoped packages

# Conflicts:
#	packages/@interactjs/arrange/package.json
#	packages/@interactjs/clone/package.json
#	packages/@interactjs/feedback/package.json
#	packages/@interactjs/iframes/package.json
#	packages/@interactjs/multi-target/package.json
#	packages/@interactjs/react/package.json
#	packages/@interactjs/rebound/package.json
#	packages/@interactjs/symbol-tree/package.json
#	packages/@interactjs/vue/package.json
---
 packages/@interactjs/actions/package.json        | 1 +
 packages/@interactjs/auto-scroll/package.json    | 1 +
 packages/@interactjs/auto-start/package.json     | 1 +
 packages/@interactjs/core/package.json           | 1 +
 packages/@interactjs/dev-tools/package.json      | 1 +
 packages/@interactjs/inertia/package.json        | 1 +
 packages/@interactjs/interact/package.json       | 2 +-
 packages/@interactjs/interactjs/package.json     | 1 +
 packages/@interactjs/modifiers/package.json      | 1 +
 packages/@interactjs/offset/package.json         | 1 +
 packages/@interactjs/pointer-events/package.json | 1 +
 packages/@interactjs/reflow/package.json         | 1 +
 packages/@interactjs/snappers/package.json       | 1 +
 packages/@interactjs/types/package.json          | 1 +
 packages/@interactjs/utils/package.json          | 1 +
 15 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/@interactjs/actions/package.json b/packages/@interactjs/actions/package.json
index 932e2fe5e..464e55c5b 100644
--- a/packages/@interactjs/actions/package.json
+++ b/packages/@interactjs/actions/package.json
@@ -3,6 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",
diff --git a/packages/@interactjs/auto-scroll/package.json b/packages/@interactjs/auto-scroll/package.json
index 89e72f13c..31f979bfc 100644
--- a/packages/@interactjs/auto-scroll/package.json
+++ b/packages/@interactjs/auto-scroll/package.json
@@ -3,6 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",
diff --git a/packages/@interactjs/auto-start/package.json b/packages/@interactjs/auto-start/package.json
index 97030bfa9..feb96c3df 100644
--- a/packages/@interactjs/auto-start/package.json
+++ b/packages/@interactjs/auto-start/package.json
@@ -3,6 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",
diff --git a/packages/@interactjs/core/package.json b/packages/@interactjs/core/package.json
index 2cbde9e05..2fbcfc44d 100644
--- a/packages/@interactjs/core/package.json
+++ b/packages/@interactjs/core/package.json
@@ -3,6 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",
diff --git a/packages/@interactjs/dev-tools/package.json b/packages/@interactjs/dev-tools/package.json
index a7a3554c3..b29c05fd6 100644
--- a/packages/@interactjs/dev-tools/package.json
+++ b/packages/@interactjs/dev-tools/package.json
@@ -3,6 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",
diff --git a/packages/@interactjs/inertia/package.json b/packages/@interactjs/inertia/package.json
index d94b8c734..d04cc6bfb 100644
--- a/packages/@interactjs/inertia/package.json
+++ b/packages/@interactjs/inertia/package.json
@@ -3,6 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",
diff --git a/packages/@interactjs/interact/package.json b/packages/@interactjs/interact/package.json
index 858c44df3..7d4cd9721 100644
--- a/packages/@interactjs/interact/package.json
+++ b/packages/@interactjs/interact/package.json
@@ -3,7 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
-  "_typings": "typings.d.ts",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",
diff --git a/packages/@interactjs/interactjs/package.json b/packages/@interactjs/interactjs/package.json
index 5f300ec6d..5c697d7dd 100644
--- a/packages/@interactjs/interactjs/package.json
+++ b/packages/@interactjs/interactjs/package.json
@@ -3,6 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git"
diff --git a/packages/@interactjs/modifiers/package.json b/packages/@interactjs/modifiers/package.json
index 80cccdce2..0b6edbf4d 100644
--- a/packages/@interactjs/modifiers/package.json
+++ b/packages/@interactjs/modifiers/package.json
@@ -3,6 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",
diff --git a/packages/@interactjs/offset/package.json b/packages/@interactjs/offset/package.json
index b12b6d6ff..508eee0d8 100644
--- a/packages/@interactjs/offset/package.json
+++ b/packages/@interactjs/offset/package.json
@@ -3,6 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",
diff --git a/packages/@interactjs/pointer-events/package.json b/packages/@interactjs/pointer-events/package.json
index dd79625da..1ccf9d4bd 100644
--- a/packages/@interactjs/pointer-events/package.json
+++ b/packages/@interactjs/pointer-events/package.json
@@ -3,6 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",
diff --git a/packages/@interactjs/reflow/package.json b/packages/@interactjs/reflow/package.json
index 666ec1500..c3019a5be 100644
--- a/packages/@interactjs/reflow/package.json
+++ b/packages/@interactjs/reflow/package.json
@@ -3,6 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",
diff --git a/packages/@interactjs/snappers/package.json b/packages/@interactjs/snappers/package.json
index 8dafcafd0..68cda3673 100644
--- a/packages/@interactjs/snappers/package.json
+++ b/packages/@interactjs/snappers/package.json
@@ -3,6 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",
diff --git a/packages/@interactjs/types/package.json b/packages/@interactjs/types/package.json
index fc511235c..2ce3475ee 100644
--- a/packages/@interactjs/types/package.json
+++ b/packages/@interactjs/types/package.json
@@ -3,6 +3,7 @@
   "version": "1.10.17",
   "main": "index",
   "module": "index",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",
diff --git a/packages/@interactjs/utils/package.json b/packages/@interactjs/utils/package.json
index 0eaf62740..04289a150 100644
--- a/packages/@interactjs/utils/package.json
+++ b/packages/@interactjs/utils/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@interactjs/utils",
   "version": "1.10.17",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/taye/interact.js.git",

From 5e779010d06c0e867cfd13d5019bd5615a0ecb09 Mon Sep 17 00:00:00 2001
From: Taye Adeyemi <dev@taye.me>
Date: Mon, 26 Dec 2022 00:38:42 +0100
Subject: [PATCH 3/6] fix(modifiers): allow toggling aspectRatio modifier
 during interaction

Close #984 #879
---
 .../@interactjs/modifiers/Modification.ts     | 24 ++++++++++++-----
 packages/@interactjs/modifiers/aspectRatio.ts | 26 +++++++++++--------
 packages/@interactjs/modifiers/base.ts        | 23 +++++++++++++---
 3 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/packages/@interactjs/modifiers/Modification.ts b/packages/@interactjs/modifiers/Modification.ts
index acf914a1e..d19e773e1 100644
--- a/packages/@interactjs/modifiers/Modification.ts
+++ b/packages/@interactjs/modifiers/Modification.ts
@@ -31,12 +31,19 @@ export default class Modification {
   startDelta!: Point
   result!: ModificationResult
   endResult!: Point
-  edges!: EdgeOptions
+  startEdges!: EdgeOptions
+  edges: EdgeOptions
   readonly interaction: Readonly<Interaction>
 
   constructor (interaction: Interaction) {
     this.interaction = interaction
     this.result = createResult()
+    this.edges = {
+      left: false,
+      right: false,
+      top: false,
+      bottom: false,
+    }
   }
 
   start ({ phase }: { phase: EventPhase }, pageCoords: Point) {
@@ -44,7 +51,8 @@ export default class Modification {
     const modifierList = getModifierList(interaction)
     this.prepareStates(modifierList)
 
-    this.edges = extend({}, interaction.edges)
+    this.startEdges = extend({}, interaction.edges)
+    this.edges = extend({}, this.startEdges)
     this.startOffset = getRectOffset(interaction.rect, pageCoords)
     this.startDelta = { x: 0, y: 0 }
 
@@ -68,8 +76,8 @@ export default class Modification {
     arg.interaction = interaction
     arg.interactable = interaction.interactable
     arg.element = interaction.element
-    arg.rect = arg.rect || interaction.rect
-    arg.edges = this.edges
+    arg.rect ||= interaction.rect
+    arg.edges ||= this.startEdges
     arg.startOffset = this.startOffset
 
     return arg as ModifierArg
@@ -85,10 +93,11 @@ export default class Modification {
   }
 
   setAll (arg: MethodArg & Partial<ModifierArg>): ModificationResult {
-    const { phase, preEnd, skipModifiers, rect: unmodifiedRect } = arg
+    const { phase, preEnd, skipModifiers, rect: unmodifiedRect, edges: unmodifiedEdges } = arg
 
     arg.coords = extend({}, arg.pageCoords)
     arg.rect = extend({}, unmodifiedRect)
+    arg.edges = extend({}, unmodifiedEdges)
 
     const states = skipModifiers ? this.states.slice(skipModifiers) : this.states
 
@@ -103,7 +112,7 @@ export default class Modification {
         arg.state = state
         returnValue = state.methods.set(arg as ModifierArg<never>)
 
-        rectUtils.addEdges(this.interaction.edges, arg.rect, {
+        rectUtils.addEdges(arg.edges, arg.rect, {
           x: arg.coords.x - lastModifierCoords.x,
           y: arg.coords.y - lastModifierCoords.y,
         })
@@ -112,6 +121,8 @@ export default class Modification {
       newResult.eventProps.push(returnValue)
     }
 
+    extend(this.edges, arg.edges)
+
     newResult.delta.x = arg.coords.x - arg.pageCoords.x
     newResult.delta.y = arg.coords.y - arg.pageCoords.y
 
@@ -341,6 +352,7 @@ export default class Modification {
   copyFrom (other: Modification) {
     this.startOffset = other.startOffset
     this.startDelta = other.startDelta
+    this.startEdges = other.startEdges
     this.edges = other.edges
     this.states = other.states.map((s) => clone(s) as ModifierState)
     this.result = createResult(extend({}, other.result.coords), extend({}, other.result.rect))
diff --git a/packages/@interactjs/modifiers/aspectRatio.ts b/packages/@interactjs/modifiers/aspectRatio.ts
index 1c18336e3..4f61936d1 100644
--- a/packages/@interactjs/modifiers/aspectRatio.ts
+++ b/packages/@interactjs/modifiers/aspectRatio.ts
@@ -50,8 +50,8 @@ AspectRatioOptions,
 
 const aspectRatio: ModifierModule<AspectRatioOptions, AspectRatioState> = {
   start (arg) {
-    const { state, rect, edges: originalEdges, pageCoords: coords } = arg
-    let { ratio } = state.options
+    const { state, rect, edges, pageCoords: coords } = arg
+    let { ratio, enabled } = state.options
     const { equalDelta, modifiers } = state.options
 
     if (ratio === 'preserve') {
@@ -64,13 +64,13 @@ const aspectRatio: ModifierModule<AspectRatioOptions, AspectRatioState> = {
     state.equalDelta = equalDelta
 
     const linkedEdges = (state.linkedEdges = {
-      top: originalEdges.top || (originalEdges.left && !originalEdges.bottom),
-      left: originalEdges.left || (originalEdges.top && !originalEdges.right),
-      bottom: originalEdges.bottom || (originalEdges.right && !originalEdges.top),
-      right: originalEdges.right || (originalEdges.bottom && !originalEdges.left),
+      top: edges.top || (edges.left && !edges.bottom),
+      left: edges.left || (edges.top && !edges.right),
+      bottom: edges.bottom || (edges.right && !edges.top),
+      right: edges.right || (edges.bottom && !edges.left),
     })
 
-    state.xIsPrimaryAxis = !!(originalEdges.left || originalEdges.right)
+    state.xIsPrimaryAxis = !!(edges.left || edges.right)
 
     if (state.equalDelta) {
       const sign = (linkedEdges.left ? 1 : -1) * (linkedEdges.top ? 1 : -1)
@@ -85,9 +85,11 @@ const aspectRatio: ModifierModule<AspectRatioOptions, AspectRatioState> = {
       }
     }
 
-    extend(arg.edges, linkedEdges)
+    if (enabled !== false) {
+      extend(edges, linkedEdges)
+    }
 
-    if (!modifiers || !modifiers.length) return
+    if (!modifiers?.length) return
 
     const subModification = new Modification(arg.interaction)
 
@@ -100,9 +102,11 @@ const aspectRatio: ModifierModule<AspectRatioOptions, AspectRatioState> = {
 
   set (arg) {
     const { state, rect, coords } = arg
+    const { linkedEdges } = state
     const initialCoords = extend({}, coords)
     const aspectMethod = state.equalDelta ? setEqualDelta : setRatio
 
+    extend(arg.edges, linkedEdges)
     aspectMethod(state, state.xIsPrimaryAxis, coords, rect)
 
     if (!state.subModification) {
@@ -111,7 +115,7 @@ const aspectRatio: ModifierModule<AspectRatioOptions, AspectRatioState> = {
 
     const correctedRect = extend({}, rect)
 
-    addEdges(state.linkedEdges, correctedRect, {
+    addEdges(linkedEdges, correctedRect, {
       x: coords.x - initialCoords.x,
       y: coords.y - initialCoords.y,
     })
@@ -119,7 +123,7 @@ const aspectRatio: ModifierModule<AspectRatioOptions, AspectRatioState> = {
     const result = state.subModification.setAll({
       ...arg,
       rect: correctedRect,
-      edges: state.linkedEdges,
+      edges: linkedEdges,
       pageCoords: coords,
       prevCoords: coords,
       prevRect: correctedRect,
diff --git a/packages/@interactjs/modifiers/base.ts b/packages/@interactjs/modifiers/base.ts
index ab1c16703..25fb36c58 100644
--- a/packages/@interactjs/modifiers/base.ts
+++ b/packages/@interactjs/modifiers/base.ts
@@ -104,16 +104,31 @@ const modifiersBase: Plugin = {
     },
 
     'interactions:before-action-start': (arg) => {
+      const { interaction } = arg
       const modification = arg.interaction.modification!
 
-      modification.start(arg, arg.interaction.coords.start.page)
-      arg.interaction.edges = modification.edges
+      modification.start(arg, interaction.coords.start.page)
+      interaction.edges = modification.edges
       modification.applyToInteraction(arg)
     },
 
-    'interactions:before-action-move': (arg) => arg.interaction.modification.setAndApply(arg),
+    'interactions:before-action-move': (arg) => {
+      const { interaction } = arg
+      const { modification } = interaction
+      const ret = modification.setAndApply(arg)
+      interaction.edges = modification.edges
 
-    'interactions:before-action-end': (arg) => arg.interaction.modification.beforeEnd(arg),
+      return ret
+    },
+
+    'interactions:before-action-end': (arg) => {
+      const { interaction } = arg
+      const { modification } = interaction
+      const ret = modification.beforeEnd(arg)
+      interaction.edges = modification.startEdges
+
+      return ret
+    },
 
     'interactions:action-start': addEventModifiers,
     'interactions:action-move': addEventModifiers,

From 8888cfe7befebcfb6e74e864b14f485e7ad1efee Mon Sep 17 00:00:00 2001
From: Taye Adeyemi <dev@taye.me>
Date: Mon, 26 Dec 2022 01:53:57 +0100
Subject: [PATCH 4/6] fix(types): import plugins for module augmentations

Re: #933
---
 packages/@interactjs/actions/plugin.ts   | 7 +++++++
 packages/@interactjs/dev-tools/plugin.ts | 5 ++++-
 scripts/addPluginIndexes.js              | 8 +++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/@interactjs/actions/plugin.ts b/packages/@interactjs/actions/plugin.ts
index 2db78dbfa..f629535a9 100644
--- a/packages/@interactjs/actions/plugin.ts
+++ b/packages/@interactjs/actions/plugin.ts
@@ -1,9 +1,16 @@
 import type { Scope } from '@interactjs/core/scope'
 
+/* eslint-disable import/no-duplicates */
+import './drag/plugin'
+import './drop/plugin'
+import './gesture/plugin'
+import './resize/plugin'
+
 import drag from './drag/plugin'
 import drop from './drop/plugin'
 import gesture from './gesture/plugin'
 import resize from './resize/plugin'
+/* eslint-enable import/no-duplicates */
 
 export default {
   id: 'actions',
diff --git a/packages/@interactjs/dev-tools/plugin.ts b/packages/@interactjs/dev-tools/plugin.ts
index 5bd8d71b8..b426b4e1d 100644
--- a/packages/@interactjs/dev-tools/plugin.ts
+++ b/packages/@interactjs/dev-tools/plugin.ts
@@ -1,7 +1,10 @@
+// eslint-disable-next-line import/no-extraneous-dependencies, import/no-duplicates
+import '@interactjs/dev-tools/visualizer/plugin'
+
 import type Interaction from '@interactjs/core/Interaction'
 import type { Scope, Plugin } from '@interactjs/core/scope'
 import type { Element, OptionMethod } from '@interactjs/core/types'
-// eslint-disable-next-line import/no-extraneous-dependencies
+// eslint-disable-next-line import/no-extraneous-dependencies, import/no-duplicates
 import visualizer from '@interactjs/dev-tools/visualizer/plugin'
 import domObjects from '@interactjs/utils/domObjects'
 import { parentNode } from '@interactjs/utils/domUtils'
diff --git a/scripts/addPluginIndexes.js b/scripts/addPluginIndexes.js
index b10875946..44e57f18e 100644
--- a/scripts/addPluginIndexes.js
+++ b/scripts/addPluginIndexes.js
@@ -12,15 +12,17 @@ module.exports = (plugins) => {
       const dest = path.join(packagePath, path.dirname(path.relative(packagePath, pluginPath)), 'index.ts')
       const destDir = path.dirname(dest)
 
+      const pluginSpecifier = pluginPath.replace(/^packages./, '')
+
       await mkdirp(destDir)
 
       await fs.writeFile(
         dest,
         [
-          '/* eslint-disable import/order, no-console, eol-last */',
+          '/* eslint-disable no-console, eol-last, import/no-duplicates,  import/no-extraneous-dependencies, import/order */',
+          `import '${pluginSpecifier}'`,
           "import interact from '@interactjs/interact/index'",
-          '// eslint-disable-next-line import/no-extraneous-dependencies',
-          `import plugin from '${pluginPath.replace(/^packages./, '')}'`,
+          `import plugin from '${pluginSpecifier}'`,
           'interact.use(plugin)',
         ].join('\n'),
       )

From 297b8c46c5a2dcd272f99bcbc8eb27c33e568a1b Mon Sep 17 00:00:00 2001
From: Taye Adeyemi <dev@taye.me>
Date: Sun, 30 Jul 2023 23:26:22 +0200
Subject: [PATCH 5/6] fix(interactjs): don't assign module.exports in esm
 package

---
 packages/@interactjs/interactjs/index.stub.ts | 7 -------
 packages/@interactjs/interactjs/index.ts      | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/packages/@interactjs/interactjs/index.stub.ts b/packages/@interactjs/interactjs/index.stub.ts
index 814033cb9..380c4e5fd 100644
--- a/packages/@interactjs/interactjs/index.stub.ts
+++ b/packages/@interactjs/interactjs/index.stub.ts
@@ -41,13 +41,6 @@ if (process.env.NODE_ENV !== 'production') {
 }
 
 export default interact
-
-if (typeof module === 'object' && !!module) {
-  try {
-    module.exports = interact
-  } catch {}
-}
-
 ;(interact as any).default = interact
 
 const _ = {
diff --git a/packages/@interactjs/interactjs/index.ts b/packages/@interactjs/interactjs/index.ts
index 814033cb9..380c4e5fd 100644
--- a/packages/@interactjs/interactjs/index.ts
+++ b/packages/@interactjs/interactjs/index.ts
@@ -41,13 +41,6 @@ if (process.env.NODE_ENV !== 'production') {
 }
 
 export default interact
-
-if (typeof module === 'object' && !!module) {
-  try {
-    module.exports = interact
-  } catch {}
-}
-
 ;(interact as any).default = interact
 
 const _ = {

From 99aa76a221c3cf9cd028507a456bb1c834329a4b Mon Sep 17 00:00:00 2001
From: Taye Adeyemi <dev@taye.me>
Date: Mon, 31 Jul 2023 00:26:05 +0200
Subject: [PATCH 6/6] chore: v1.10.18

# Conflicts:
#	packages/@interactjs/arrange/package.json
#	packages/@interactjs/clone/package.json
#	packages/@interactjs/feedback/package.json
#	packages/@interactjs/iframes/package.json
#	packages/@interactjs/multi-target/package.json
#	packages/@interactjs/react/package.json
#	packages/@interactjs/rebound/package.json
#	packages/@interactjs/symbol-tree/package.json
#	packages/@interactjs/vue/package.json
---
 CHANGELOG.md                                  |  8 ++++
 package.json                                  |  2 +-
 packages/@interactjs/actions/package.json     |  8 ++--
 packages/@interactjs/auto-scroll/package.json |  6 +--
 packages/@interactjs/auto-start/package.json  |  8 ++--
 packages/@interactjs/core/package.json        |  4 +-
 packages/@interactjs/dev-tools/package.json   |  8 ++--
 packages/@interactjs/inertia/package.json     | 12 +++---
 packages/@interactjs/interact/package.json    |  6 +--
 packages/@interactjs/interactjs/package.json  | 42 +++++++++----------
 packages/@interactjs/modifiers/package.json   | 12 +++---
 packages/@interactjs/offset/package.json      |  8 ++--
 .../@interactjs/pointer-events/package.json   |  8 ++--
 packages/@interactjs/reflow/package.json      |  8 ++--
 packages/@interactjs/snappers/package.json    |  6 +--
 packages/@interactjs/types/package.json       | 30 ++++++-------
 packages/@interactjs/utils/package.json       |  6 +--
 packages/interactjs/package.json              |  4 +-
 18 files changed, 97 insertions(+), 89 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13da89991..27ab7a04c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## v1.10.18
+
+- fix(interact): remove types dependency
+- fix: set "type": "module" for scoped packages
+- fix(modifiers): allow toggling aspectRatio modifier during interaction
+- fix(types): import plugins for module augmentations
+- fix(interactjs): don't assign module.exports in esm package
+
 ## v1.10.17
 
 - fixed missing typings when only the `@interactjs/interactjs` package is
diff --git a/package.json b/package.json
index f5c428b2d..59de33909 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/_dev",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "private": true,
   "directories": {
     "bin": "./bin"
diff --git a/packages/@interactjs/actions/package.json b/packages/@interactjs/actions/package.json
index 464e55c5b..40bbe5470 100644
--- a/packages/@interactjs/actions/package.json
+++ b/packages/@interactjs/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/actions",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -10,11 +10,11 @@
     "directory": "packages/@interactjs/actions"
   },
   "peerDependencies": {
-    "@interactjs/core": "1.10.17",
-    "@interactjs/utils": "1.10.17"
+    "@interactjs/core": "1.10.18",
+    "@interactjs/utils": "1.10.18"
   },
   "optionalDependencies": {
-    "@interactjs/interact": "1.10.17"
+    "@interactjs/interact": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@interactjs/auto-scroll/package.json b/packages/@interactjs/auto-scroll/package.json
index 31f979bfc..a340d07fb 100644
--- a/packages/@interactjs/auto-scroll/package.json
+++ b/packages/@interactjs/auto-scroll/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/auto-scroll",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -10,10 +10,10 @@
     "directory": "packages/@interactjs/auto-scroll"
   },
   "peerDependencies": {
-    "@interactjs/utils": "1.10.17"
+    "@interactjs/utils": "1.10.18"
   },
   "optionalDependencies": {
-    "@interactjs/interact": "1.10.17"
+    "@interactjs/interact": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@interactjs/auto-start/package.json b/packages/@interactjs/auto-start/package.json
index feb96c3df..4b4c7fdb5 100644
--- a/packages/@interactjs/auto-start/package.json
+++ b/packages/@interactjs/auto-start/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/auto-start",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -10,11 +10,11 @@
     "directory": "packages/@interactjs/auto-start"
   },
   "peerDependencies": {
-    "@interactjs/core": "1.10.17",
-    "@interactjs/utils": "1.10.17"
+    "@interactjs/core": "1.10.18",
+    "@interactjs/utils": "1.10.18"
   },
   "optionalDependencies": {
-    "@interactjs/interact": "1.10.17"
+    "@interactjs/interact": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@interactjs/core/package.json b/packages/@interactjs/core/package.json
index 2fbcfc44d..8c5490918 100644
--- a/packages/@interactjs/core/package.json
+++ b/packages/@interactjs/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/core",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -10,7 +10,7 @@
     "directory": "packages/@interactjs/core"
   },
   "peerDependencies": {
-    "@interactjs/utils": "1.10.17"
+    "@interactjs/utils": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@interactjs/dev-tools/package.json b/packages/@interactjs/dev-tools/package.json
index b29c05fd6..c9b28b8df 100644
--- a/packages/@interactjs/dev-tools/package.json
+++ b/packages/@interactjs/dev-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/dev-tools",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -10,11 +10,11 @@
     "directory": "packages/@interactjs/dev-tools"
   },
   "peerDependencies": {
-    "@interactjs/modifiers": "1.10.17",
-    "@interactjs/utils": "1.10.17"
+    "@interactjs/modifiers": "1.10.18",
+    "@interactjs/utils": "1.10.18"
   },
   "optionalDependencies": {
-    "@interactjs/interact": "1.10.17"
+    "@interactjs/interact": "1.10.18"
   },
   "devDependencies": {
     "vue": "next"
diff --git a/packages/@interactjs/inertia/package.json b/packages/@interactjs/inertia/package.json
index d04cc6bfb..fde33d7a9 100644
--- a/packages/@interactjs/inertia/package.json
+++ b/packages/@interactjs/inertia/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/inertia",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -10,15 +10,15 @@
     "directory": "packages/@interactjs/inertia"
   },
   "dependencies": {
-    "@interactjs/offset": "1.10.17"
+    "@interactjs/offset": "1.10.18"
   },
   "peerDependencies": {
-    "@interactjs/core": "1.10.17",
-    "@interactjs/modifiers": "1.10.17",
-    "@interactjs/utils": "1.10.17"
+    "@interactjs/core": "1.10.18",
+    "@interactjs/modifiers": "1.10.18",
+    "@interactjs/utils": "1.10.18"
   },
   "optionalDependencies": {
-    "@interactjs/interact": "1.10.17"
+    "@interactjs/interact": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@interactjs/interact/package.json b/packages/@interactjs/interact/package.json
index 7d4cd9721..99131e99a 100644
--- a/packages/@interactjs/interact/package.json
+++ b/packages/@interactjs/interact/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/interact",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -10,8 +10,8 @@
     "directory": "packages/@interactjs/interact"
   },
   "dependencies": {
-    "@interactjs/core": "1.10.17",
-    "@interactjs/utils": "1.10.17"
+    "@interactjs/core": "1.10.18",
+    "@interactjs/utils": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@interactjs/interactjs/package.json b/packages/@interactjs/interactjs/package.json
index 5c697d7dd..14a9a3d78 100644
--- a/packages/@interactjs/interactjs/package.json
+++ b/packages/@interactjs/interactjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/interactjs",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -9,26 +9,26 @@
     "url": "https://github.com/taye/interact.js.git"
   },
   "dependencies": {
-    "@interactjs/actions": "1.10.17",
-    "@interactjs/arrange": "1.10.17",
-    "@interactjs/auto-scroll": "1.10.17",
-    "@interactjs/auto-start": "1.10.17",
-    "@interactjs/clone": "1.10.17",
-    "@interactjs/core": "1.10.17",
-    "@interactjs/dev-tools": "1.10.17",
-    "@interactjs/feedback": "1.10.17",
-    "@interactjs/inertia": "1.10.17",
-    "@interactjs/interact": "1.10.17",
-    "@interactjs/modifiers": "1.10.17",
-    "@interactjs/multi-target": "1.10.17",
-    "@interactjs/offset": "1.10.17",
-    "@interactjs/pointer-events": "1.10.17",
-    "@interactjs/react": "1.10.17",
-    "@interactjs/rebound": "1.10.17",
-    "@interactjs/symbol-tree": "1.10.17",
-    "@interactjs/reflow": "1.10.17",
-    "@interactjs/utils": "1.10.17",
-    "@interactjs/vue": "1.10.17"
+    "@interactjs/actions": "1.10.18",
+    "@interactjs/arrange": "1.10.18",
+    "@interactjs/auto-scroll": "1.10.18",
+    "@interactjs/auto-start": "1.10.18",
+    "@interactjs/clone": "1.10.18",
+    "@interactjs/core": "1.10.18",
+    "@interactjs/dev-tools": "1.10.18",
+    "@interactjs/feedback": "1.10.18",
+    "@interactjs/inertia": "1.10.18",
+    "@interactjs/interact": "1.10.18",
+    "@interactjs/modifiers": "1.10.18",
+    "@interactjs/multi-target": "1.10.18",
+    "@interactjs/offset": "1.10.18",
+    "@interactjs/pointer-events": "1.10.18",
+    "@interactjs/react": "1.10.18",
+    "@interactjs/rebound": "1.10.18",
+    "@interactjs/symbol-tree": "1.10.18",
+    "@interactjs/reflow": "1.10.18",
+    "@interactjs/utils": "1.10.18",
+    "@interactjs/vue": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@interactjs/modifiers/package.json b/packages/@interactjs/modifiers/package.json
index 0b6edbf4d..052c75076 100644
--- a/packages/@interactjs/modifiers/package.json
+++ b/packages/@interactjs/modifiers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/modifiers",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -10,15 +10,15 @@
     "directory": "packages/@interactjs/modifiers"
   },
   "dependencies": {
-    "@interactjs/snappers": "1.10.17"
+    "@interactjs/snappers": "1.10.18"
   },
   "peerDependencies": {
-    "@interactjs/core": "1.10.17",
-    "@interactjs/rebound": "1.10.17",
-    "@interactjs/utils": "1.10.17"
+    "@interactjs/core": "1.10.18",
+    "@interactjs/rebound": "1.10.18",
+    "@interactjs/utils": "1.10.18"
   },
   "optionalDependencies": {
-    "@interactjs/interact": "1.10.17"
+    "@interactjs/interact": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@interactjs/offset/package.json b/packages/@interactjs/offset/package.json
index 508eee0d8..104d407ef 100644
--- a/packages/@interactjs/offset/package.json
+++ b/packages/@interactjs/offset/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/offset",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -10,11 +10,11 @@
     "directory": "packages/@interactjs/offset"
   },
   "peerDependencies": {
-    "@interactjs/core": "1.10.17",
-    "@interactjs/utils": "1.10.17"
+    "@interactjs/core": "1.10.18",
+    "@interactjs/utils": "1.10.18"
   },
   "optionalDependencies": {
-    "@interactjs/interact": "1.10.17"
+    "@interactjs/interact": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@interactjs/pointer-events/package.json b/packages/@interactjs/pointer-events/package.json
index 1ccf9d4bd..b522e7888 100644
--- a/packages/@interactjs/pointer-events/package.json
+++ b/packages/@interactjs/pointer-events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/pointer-events",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -10,11 +10,11 @@
     "directory": "packages/@interactjs/pointer-events"
   },
   "peerDependencies": {
-    "@interactjs/core": "1.10.17",
-    "@interactjs/utils": "1.10.17"
+    "@interactjs/core": "1.10.18",
+    "@interactjs/utils": "1.10.18"
   },
   "optionalDependencies": {
-    "@interactjs/interact": "1.10.17"
+    "@interactjs/interact": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@interactjs/reflow/package.json b/packages/@interactjs/reflow/package.json
index c3019a5be..cc97dfdf6 100644
--- a/packages/@interactjs/reflow/package.json
+++ b/packages/@interactjs/reflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/reflow",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -10,11 +10,11 @@
     "directory": "packages/@interactjs/reflow"
   },
   "peerDependencies": {
-    "@interactjs/core": "1.10.17",
-    "@interactjs/utils": "1.10.17"
+    "@interactjs/core": "1.10.18",
+    "@interactjs/utils": "1.10.18"
   },
   "optionalDependencies": {
-    "@interactjs/interact": "1.10.17"
+    "@interactjs/interact": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@interactjs/snappers/package.json b/packages/@interactjs/snappers/package.json
index 68cda3673..319c96d7c 100644
--- a/packages/@interactjs/snappers/package.json
+++ b/packages/@interactjs/snappers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/snappers",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -10,10 +10,10 @@
     "directory": "packages/@interactjs/snappers"
   },
   "peerDependencies": {
-    "@interactjs/utils": "1.10.17"
+    "@interactjs/utils": "1.10.18"
   },
   "optionalDependencies": {
-    "@interactjs/interact": "1.10.17"
+    "@interactjs/interact": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@interactjs/types/package.json b/packages/@interactjs/types/package.json
index 2ce3475ee..a3d877789 100644
--- a/packages/@interactjs/types/package.json
+++ b/packages/@interactjs/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/types",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "index",
   "module": "index",
   "type": "module",
@@ -11,20 +11,20 @@
   },
   "typings": "typings.d.ts",
   "devDependencies": {
-    "@interactjs/actions": "1.10.17",
-    "@interactjs/arrange": "1.10.17",
-    "@interactjs/auto-scroll": "1.10.17",
-    "@interactjs/auto-start": "1.10.17",
-    "@interactjs/core": "1.10.17",
-    "@interactjs/dev-tools": "1.10.17",
-    "@interactjs/inertia": "1.10.17",
-    "@interactjs/interact": "1.10.17",
-    "@interactjs/interactjs": "1.10.17",
-    "@interactjs/modifiers": "1.10.17",
-    "@interactjs/pointer-events": "1.10.17",
-    "@interactjs/reflow": "1.10.17",
-    "@interactjs/snappers": "1.10.17",
-    "@interactjs/utils": "1.10.17"
+    "@interactjs/actions": "1.10.18",
+    "@interactjs/arrange": "1.10.18",
+    "@interactjs/auto-scroll": "1.10.18",
+    "@interactjs/auto-start": "1.10.18",
+    "@interactjs/core": "1.10.18",
+    "@interactjs/dev-tools": "1.10.18",
+    "@interactjs/inertia": "1.10.18",
+    "@interactjs/interact": "1.10.18",
+    "@interactjs/interactjs": "1.10.18",
+    "@interactjs/modifiers": "1.10.18",
+    "@interactjs/pointer-events": "1.10.18",
+    "@interactjs/reflow": "1.10.18",
+    "@interactjs/snappers": "1.10.18",
+    "@interactjs/utils": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@interactjs/utils/package.json b/packages/@interactjs/utils/package.json
index 04289a150..920271b7c 100644
--- a/packages/@interactjs/utils/package.json
+++ b/packages/@interactjs/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interactjs/utils",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "type": "module",
   "repository": {
     "type": "git",
@@ -8,8 +8,8 @@
     "directory": "packages/@interactjs/utils"
   },
   "peerDependencies": {
-    "@interactjs/feedback": "1.10.17",
-    "@interactjs/symbol-tree": "1.10.17"
+    "@interactjs/feedback": "1.10.18",
+    "@interactjs/symbol-tree": "1.10.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/interactjs/package.json b/packages/interactjs/package.json
index 982e4be3b..64ae0b965 100644
--- a/packages/interactjs/package.json
+++ b/packages/interactjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "interactjs",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "main": "dist/interact.min.js",
   "typings": "index.d.ts",
   "description": "Drag and drop, resizing and multi-touch gestures with inertia and snapping for modern browsers (and also IE9+)",
@@ -38,7 +38,7 @@
     "test": "cd ../; npm test"
   },
   "dependencies": {
-    "@interactjs/types": "1.10.17"
+    "@interactjs/types": "1.10.18"
   },
   "sideEffects": [
     "**/index.js",