Merge branch 'master' into unstable

taye · Feb 8, 2019 · e624c4d · e624c4d
2 parents 5ed4f19 + 7323974
commit e624c4d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/packages/actions/drop/index.ts b/packages/actions/drop/index.ts
@@ -126,9 +126,6 @@ function install (scope: Scope) {
     interaction.dropStatus.events = null
   })
 
-  interactions.signals.on('new', (interaction) => {
-  })
-
   interactions.signals.on('stop', ({ interaction: { dropStatus } }) => {
     dropStatus.cur.dropzone = dropStatus.cur.element =
       dropStatus.prev.dropzone = dropStatus.prev.element = null

diff --git a/packages/actions/index.ts b/packages/actions/index.ts
@@ -1,8 +1,8 @@
 import { Scope } from '@interactjs/core/scope'
-import drag from './drag'
+import drag, { DragEvent } from './drag'
 import drop from './drop'
-import gesture from './gesture'
-import resize from './resize'
+import gesture, { GestureEvent } from './gesture'
+import resize, { ResizeEvent } from './resize'
 
 function install (scope: Scope) {
   gesture.install(scope)
@@ -11,11 +11,13 @@ function install (scope: Scope) {
   drop.install(scope)
 }
 
-export * from './drag'
-export * from './resize'
-export * from './gesture'
-export * from './drop'
-
 export {
+  gesture,
+  GestureEvent,
+  resize,
+  ResizeEvent,
+  drag,
+  DragEvent,
+  drop,
   install,
 }
diff --git a/packages/actions/resize.ts b/packages/actions/resize.ts
@@ -22,6 +22,11 @@ declare module '@interactjs/core/Interaction' {
       previous: Interact.Rect
       delta: Interact.Rect
     }
+    resizeStartAspectRatio: number
+  }
+
+  interface ActionProps {
+    _linkedEdges?: { [key: string]: boolean }
   }
 }
 

diff --git a/packages/modifiers/restrict/edges.ts b/packages/modifiers/restrict/edges.ts
@@ -14,12 +14,6 @@ import extend from '@interactjs/utils/extend'
 import rectUtils from '@interactjs/utils/rect'
 import restrict from './pointer'
 
-declare module '@interactjs/core/Interaction' {
-  interface ActionProps {
-    linkedEdges?: { [key: string]: boolean }
-  }
-}
-
 const { getRestrictionRect } = restrict
 const noInner = { top: +Infinity, left: +Infinity, bottom: -Infinity, right: -Infinity }
 const noOuter = { top: -Infinity, left: -Infinity, bottom: +Infinity, right: +Infinity }
@@ -51,7 +45,7 @@ function set ({ coords, interaction, state }: {
   state: any
 }) {
   const { offset, options } = state
-  const edges = interaction.prepared.linkedEdges || interaction.prepared.edges
+  const edges = interaction.prepared._linkedEdges || interaction.prepared.edges
 
   if (!edges) {
     return

diff --git a/packages/utils/extend.ts b/packages/utils/extend.ts
@@ -1,6 +1,6 @@
 export default function extend<T, U extends Partial<T>> (dest: U, source: T) {
   for (const prop in source) {
-    dest[prop] = source[prop]
+    (dest as unknown as T)[prop] = source[prop]
   }
   return dest as T & U
 }
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -43,9 +43,12 @@ merge_to_release() {
 
   echo "checking out the '$RELEASE_BRANCH' branch"
   git checkout $RELEASE_BRANCH || exit $?
+  git pull --ff-only
 
   # delete generated .js and d.ts files
   npx tsc --build --clean $ROOT
+  # clear package links
+  git clean -fdX packages/*
   git merge --no-ff --no-edit $INITIAL_BRANCH || quit "failed to merge branches" $?
   npx lerna bootstrap || quit "bootstrapping failed" $?
 }