From a3b17aef020cfc0cb8344eb54fdc9a6a91e0a4f1 Mon Sep 17 00:00:00 2001 From: mhext Date: Mon, 17 Feb 2020 14:18:09 +0000 Subject: [PATCH 01/25] fix: [#167] - passive event listener --- src/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/index.js b/src/index.js index 0ffeb07e..cde6a719 100644 --- a/src/index.js +++ b/src/index.js @@ -126,8 +126,8 @@ function getHandlers(set, handlerProps) { const cleanUpMouse = () => { // safe to just call removeEventListener - document.removeEventListener(mouseMove, onMove) - document.removeEventListener(mouseUp, onUp) + document.removeEventListener(mouseMove, onMove, {passive: true}) + document.removeEventListener(mouseUp, onUp, {passive: true}) } const onUp = e => { @@ -139,7 +139,7 @@ function getHandlers(set, handlerProps) { if (el && el.addEventListener) { // attach touch event listeners and handlers const tls = [[touchStart, onStart], [touchMove, onMove], [touchEnd, onEnd]] - tls.forEach(([e, h]) => el.addEventListener(e, h)) + tls.forEach(([e, h]) => el.addEventListener(e, h, {passive: true})) // return properly scoped cleanup method for removing listeners return () => tls.forEach(([e, h]) => el.removeEventListener(e, h)) } From 3555f0962f124cffd6f09153818440740c7359d3 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Tue, 30 Jun 2020 23:55:47 +0300 Subject: [PATCH 02/25] add: postinstall script --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 73deb35b..e827800d 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,8 @@ "test": "npm run test:unit && npm run dtslint && npm run build && npm run size", "test:unit": "jest", "test:cover": "jest --coverage", - "dtslint": "dtslint types" + "dtslint": "dtslint types", + "postinstall": "npm run build" }, "size-limit": [ { From f86fefd5246b4e73f97813794f0ec89d1d5255e1 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Wed, 1 Jul 2020 14:25:48 +0300 Subject: [PATCH 03/25] fix: npm install script --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index e827800d..27d2c06e 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "test:unit": "jest", "test:cover": "jest --coverage", "dtslint": "dtslint types", + "install": "npm install", "postinstall": "npm run build" }, "size-limit": [ From da67d4ad256c0de1a60db81ee5f211e98641afc2 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Wed, 1 Jul 2020 14:46:41 +0300 Subject: [PATCH 04/25] fix: remove install script --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 27d2c06e..e827800d 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "test:unit": "jest", "test:cover": "jest --coverage", "dtslint": "dtslint types", - "install": "npm install", "postinstall": "npm run build" }, "size-limit": [ From 1be0e2de80487c653845c23e386a2c14a2502314 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Wed, 1 Jul 2020 17:30:09 +0300 Subject: [PATCH 05/25] fix: prevent inf install hook --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index e827800d..81fd0c12 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "test:unit": "jest", "test:cover": "jest --coverage", "dtslint": "dtslint types", + "install": "if [[ ! -f is-installed ]]; then touch is-installed && npm install; else echo 'Skipping installation hook.' && rm is-installed; fi", "postinstall": "npm run build" }, "size-limit": [ From 676f86ea1c7e242608ee7bb2430c2868d6b49653 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Wed, 1 Jul 2020 17:37:28 +0300 Subject: [PATCH 06/25] fix: building package in install hook --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 81fd0c12..2b9697ef 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,7 @@ "test:unit": "jest", "test:cover": "jest --coverage", "dtslint": "dtslint types", - "install": "if [[ ! -f is-installed ]]; then touch is-installed && npm install; else echo 'Skipping installation hook.' && rm is-installed; fi", - "postinstall": "npm run build" + "install": "if [[ ! -f is-installed ]]; then touch is-installed && npm install && npm run build; else echo 'Skipping installation hook.' && rm is-installed; fi" }, "size-limit": [ { From 644f1d9639f1a7cf6dce0cb8941aa1bdd79bfa90 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Wed, 1 Jul 2020 17:44:06 +0300 Subject: [PATCH 07/25] chore: update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 2b9697ef..063f8d5e 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,8 @@ "lib", "es", "src", - "types/index.d.ts" + "types/index.d.ts", + "rollup.config.js" ], "license": "MIT", "types": "types", From e8660ea3f9375b18674f6b6effc9c4772f0de6bc Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Wed, 1 Jul 2020 17:50:38 +0300 Subject: [PATCH 08/25] chore: remove files field from package.json --- package.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package.json b/package.json index 063f8d5e..8d21d587 100644 --- a/package.json +++ b/package.json @@ -58,13 +58,6 @@ "url": "https://github.com/FormidableLabs/react-swipeable/issues" }, "homepage": "https://github.com/FormidableLabs/react-swipeable", - "files": [ - "lib", - "es", - "src", - "types/index.d.ts", - "rollup.config.js" - ], "license": "MIT", "types": "types", "devDependencies": { From 310c81208e904f70609bbbf28f8b9e0885ef97b4 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Wed, 1 Jul 2020 18:01:12 +0300 Subject: [PATCH 09/25] chore: update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8d21d587..252b8f9e 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "test:unit": "jest", "test:cover": "jest --coverage", "dtslint": "dtslint types", - "install": "if [[ ! -f is-installed ]]; then touch is-installed && npm install && npm run build; else echo 'Skipping installation hook.' && rm is-installed; fi" + "install": "if [ ! -f is-installed ]; then touch is-installed && npm install && npm run build; else echo 'Skipping installation hook.' && rm is-installed; fi" }, "size-limit": [ { From 0e874b223715655f8a92e1b0f85f0769d1903e11 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Wed, 1 Jul 2020 18:11:27 +0300 Subject: [PATCH 10/25] refactor: linting --- src/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/index.js b/src/index.js index cde6a719..d9785d75 100644 --- a/src/index.js +++ b/src/index.js @@ -126,8 +126,8 @@ function getHandlers(set, handlerProps) { const cleanUpMouse = () => { // safe to just call removeEventListener - document.removeEventListener(mouseMove, onMove, {passive: true}) - document.removeEventListener(mouseUp, onUp, {passive: true}) + document.removeEventListener(mouseMove, onMove, { passive: true }) + document.removeEventListener(mouseUp, onUp, { passive: true }) } const onUp = e => { @@ -139,7 +139,7 @@ function getHandlers(set, handlerProps) { if (el && el.addEventListener) { // attach touch event listeners and handlers const tls = [[touchStart, onStart], [touchMove, onMove], [touchEnd, onEnd]] - tls.forEach(([e, h]) => el.addEventListener(e, h, {passive: true})) + tls.forEach(([e, h]) => el.addEventListener(e, h, { passive: true })) // return properly scoped cleanup method for removing listeners return () => tls.forEach(([e, h]) => el.removeEventListener(e, h)) } From bdca1045c17004137aef1e229f99dc236ef782f0 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Thu, 2 Jul 2020 16:10:21 +0300 Subject: [PATCH 11/25] fix: remove passive modifier from mouse event --- src/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index d9785d75..5feb84be 100644 --- a/src/index.js +++ b/src/index.js @@ -126,8 +126,8 @@ function getHandlers(set, handlerProps) { const cleanUpMouse = () => { // safe to just call removeEventListener - document.removeEventListener(mouseMove, onMove, { passive: true }) - document.removeEventListener(mouseUp, onUp, { passive: true }) + document.removeEventListener(mouseMove, onMove) + document.removeEventListener(mouseUp, onUp) } const onUp = e => { From ec86676739c0366955385e0b98a92b17dbbbdad7 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Fri, 3 Jul 2020 13:10:12 +0300 Subject: [PATCH 12/25] chore: move build stage to sh script --- build.sh | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 build.sh diff --git a/build.sh b/build.sh new file mode 100644 index 00000000..41f76fb9 --- /dev/null +++ b/build.sh @@ -0,0 +1,9 @@ +if [ -f is-installed ]; then + echo > is-installed + npm install + npm run build + rm -rf node_modules examples rollup.config.js +else + echo "Skipping installation hook." + rm -f is-installed +fi diff --git a/package.json b/package.json index 252b8f9e..04357256 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "test:unit": "jest", "test:cover": "jest --coverage", "dtslint": "dtslint types", - "install": "if [ ! -f is-installed ]; then touch is-installed && npm install && npm run build; else echo 'Skipping installation hook.' && rm is-installed; fi" + "install": "./build.sh" }, "size-limit": [ { From e2b91a2b40b2c020fd540e8787cccf35650c2d0a Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Fri, 3 Jul 2020 13:15:10 +0300 Subject: [PATCH 13/25] fix: chmod build.sh --- build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build.sh diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 From a7a673d0a8b83d63d7ecd619bf7f5eb987e91618 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Fri, 3 Jul 2020 13:15:35 +0300 Subject: [PATCH 14/25] add: build.sh shebang --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 41f76fb9..b4f15aaa 100755 --- a/build.sh +++ b/build.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env sh if [ -f is-installed ]; then echo > is-installed npm install From dbbde7c485a4ad283f4bd0e5839c6057dd205590 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Fri, 3 Jul 2020 13:36:57 +0300 Subject: [PATCH 15/25] fix: build.sh --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index b4f15aaa..f71cd7af 100755 --- a/build.sh +++ b/build.sh @@ -1,10 +1,10 @@ #!/usr/bin/env sh if [ -f is-installed ]; then + echo "Skipping installation hook." + rm -f is-installed +else echo > is-installed npm install npm run build rm -rf node_modules examples rollup.config.js -else - echo "Skipping installation hook." - rm -f is-installed fi From 375b8369d5e7243a7e0c590651d0538af90f2a1a Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Fri, 3 Jul 2020 14:03:03 +0300 Subject: [PATCH 16/25] fix: build.sh --- build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build.sh b/build.sh index f71cd7af..c76c4c08 100755 --- a/build.sh +++ b/build.sh @@ -6,5 +6,4 @@ else echo > is-installed npm install npm run build - rm -rf node_modules examples rollup.config.js fi From 73cdc2503606058e9792d118f959c0985b8a3e33 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Fri, 3 Jul 2020 18:42:09 +0300 Subject: [PATCH 17/25] fix: build script --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index c76c4c08..824998aa 100755 --- a/build.sh +++ b/build.sh @@ -6,4 +6,5 @@ else echo > is-installed npm install npm run build + rm -rf node_modules/ examples/ rollup.config.js fi From 61cd23444f2ee823a3684d6eb99cf885cf41afc4 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Fri, 3 Jul 2020 18:50:38 +0300 Subject: [PATCH 18/25] fix: build script --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 824998aa..8e38474d 100755 --- a/build.sh +++ b/build.sh @@ -6,5 +6,5 @@ else echo > is-installed npm install npm run build - rm -rf node_modules/ examples/ rollup.config.js + rm -rf package-lock.json node_modules/ examples/ rollup.config.js fi From 824ef6ee85cb73453ab3eba2ceee415b6fd8ad9f Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Fri, 3 Jul 2020 18:56:41 +0300 Subject: [PATCH 19/25] fix: postinstall script --- build.sh | 1 - package.json | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 8e38474d..c76c4c08 100755 --- a/build.sh +++ b/build.sh @@ -6,5 +6,4 @@ else echo > is-installed npm install npm run build - rm -rf package-lock.json node_modules/ examples/ rollup.config.js fi diff --git a/package.json b/package.json index 04357256..e13ae596 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "test:unit": "jest", "test:cover": "jest --coverage", "dtslint": "dtslint types", - "install": "./build.sh" + "install": "./build.sh", + "postinstall": "rm -rf package-lock.json node_modules/ examples/" }, "size-limit": [ { From d43d9841e2a1251df4b03801d462d8d4378871cf Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Fri, 3 Jul 2020 19:02:54 +0300 Subject: [PATCH 20/25] fix: postinstall script --- build.sh | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index c76c4c08..b52faabf 100755 --- a/build.sh +++ b/build.sh @@ -6,4 +6,5 @@ else echo > is-installed npm install npm run build + echo 'END INSTALL HOOK' fi diff --git a/package.json b/package.json index e13ae596..c2e4bcf3 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "test:cover": "jest --coverage", "dtslint": "dtslint types", "install": "./build.sh", - "postinstall": "rm -rf package-lock.json node_modules/ examples/" + "postinstall": "echo 'POSTINSTALL HOOK' && rm -rf package-lock.json node_modules/ examples/" }, "size-limit": [ { From 3f0b7ced995bf4384c25105d0401bdb717a4c947 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Fri, 3 Jul 2020 19:09:50 +0300 Subject: [PATCH 21/25] fix: postinstall script --- build.sh | 1 - package.json | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index b52faabf..c76c4c08 100755 --- a/build.sh +++ b/build.sh @@ -6,5 +6,4 @@ else echo > is-installed npm install npm run build - echo 'END INSTALL HOOK' fi diff --git a/package.json b/package.json index c2e4bcf3..65dd1f9e 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build": "rollup -c", "build:examples": "cd ./examples && npm install && npm run build", "build:publish:examples": "npm run build:examples && rimraf examples/node_modules && gh-pages -d examples", - "clean": "rimraf lib es", + "clean": "rm -rf lib es", "format": "prettier --write '{src,__{tests,mocks}__}/**/*.js'", "lint": "eslint .", "prebuild": "npm run clean", @@ -21,7 +21,7 @@ "test:cover": "jest --coverage", "dtslint": "dtslint types", "install": "./build.sh", - "postinstall": "echo 'POSTINSTALL HOOK' && rm -rf package-lock.json node_modules/ examples/" + "postinstall": "rm -rf package-lock.json node_modules/ examples/" }, "size-limit": [ { From cc769f0998b410e299faa788233b2efdf0a97dd9 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Fri, 3 Jul 2020 19:17:55 +0300 Subject: [PATCH 22/25] fix: npm scripts --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 65dd1f9e..9f34e075 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,7 @@ "test": "npm run test:unit && npm run dtslint && npm run build && npm run size", "test:unit": "jest", "test:cover": "jest --coverage", - "dtslint": "dtslint types", - "install": "./build.sh", - "postinstall": "rm -rf package-lock.json node_modules/ examples/" + "dtslint": "dtslint types" }, "size-limit": [ { From 499151c40b378e7d3f961ad66b182edcdbfd47be Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Fri, 3 Jul 2020 19:24:46 +0300 Subject: [PATCH 23/25] fix: npm scripts --- build.sh | 1 + package.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index c76c4c08..262e980f 100755 --- a/build.sh +++ b/build.sh @@ -6,4 +6,5 @@ else echo > is-installed npm install npm run build + rm -rf node_modules package-lock.json fi diff --git a/package.json b/package.json index 9f34e075..d63b8e2a 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,8 @@ "test": "npm run test:unit && npm run dtslint && npm run build && npm run size", "test:unit": "jest", "test:cover": "jest --coverage", - "dtslint": "dtslint types" + "dtslint": "dtslint types", + "postinstall": "./build.sh" }, "size-limit": [ { From 57edc58959d3a562c715594394e56208a7d753c0 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Fri, 3 Jul 2020 23:28:49 +0300 Subject: [PATCH 24/25] fix: npm scripts --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d63b8e2a..6ec53f06 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "test:unit": "jest", "test:cover": "jest --coverage", "dtslint": "dtslint types", - "postinstall": "./build.sh" + "install": "./build.sh" }, "size-limit": [ { From cb41ce53692778e49f6cd233d76386aa87c8cbc4 Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Sat, 4 Jul 2020 00:24:19 +0300 Subject: [PATCH 25/25] fix: npm scripts --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index 6ec53f06..5a2b18cc 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,6 @@ "clean": "rm -rf lib es", "format": "prettier --write '{src,__{tests,mocks}__}/**/*.js'", "lint": "eslint .", - "prebuild": "npm run clean", - "prepare": "npm run build", "pretest": "npm run lint", "size": "size-limit", "start:examples": "cd ./examples && npm install && npm run start:dev",