diff --git a/package.json b/package.json index fbcefc08..4b91b3a6 100644 --- a/package.json +++ b/package.json @@ -33,15 +33,15 @@ ], "devDependencies": { "@daybrush/jsdoc": "^0.3.12", - "@egjs/release-helper": "^0.2.3", + "@egjs/release-helper": "^0.2.8", + "@types/react": "^17.0.45", + "@types/react-dom": "^17.0.2", "egjs-jsdoc-template": "^1.4.4", "jsdoc-to-mdx": "^1.1.0", "lerna": "^4.0.0", - "typescript": "~4.1", - "@types/react": "^17.0.45", - "@types/react-dom": "^17.0.2", "react": "^17.0.2", - "react-dom": "^17.0.2" + "react-dom": "^17.0.2", + "typescript": "~4.1" }, "overrides": { "@daybrush/utils": "^1.7.0", @@ -49,7 +49,7 @@ "@types/react-dom": "^17.0.2", "react": "^17.0.2", "react-dom": "^17.0.2", - "@cfcs/core": "~0.0.4" + "@cfcs/core": "~0.0.12" }, "workspaces": { "packages": [ diff --git a/packages/conveyer/package.json b/packages/conveyer/package.json index d5099fd9..c6733028 100644 --- a/packages/conveyer/package.json +++ b/packages/conveyer/package.json @@ -36,7 +36,7 @@ "dist/*" ], "dependencies": { - "@cfcs/core": "~0.0.4", + "@cfcs/core": "~0.0.12", "@egjs/axes": "^3.8.3", "@egjs/component": "^3.0.1" }, diff --git a/packages/conveyer/src/Conveyer.ts b/packages/conveyer/src/Conveyer.ts index e28a5336..655025bd 100644 --- a/packages/conveyer/src/Conveyer.ts +++ b/packages/conveyer/src/Conveyer.ts @@ -455,7 +455,10 @@ class Conveyer extends Component { this._axes?.destroy(); this.unsubscribe(); this._scrollAreaElement?.removeEventListener("scroll", this._onScroll); - window.removeEventListener("resize", this.update); + + if (typeof window !== "undefined") { + window.removeEventListener("resize", this.update); + } this.off(); this._axes = null; } diff --git a/packages/conveyer/src/reactive.ts b/packages/conveyer/src/reactive.ts index 5d558616..9ff716c6 100644 --- a/packages/conveyer/src/reactive.ts +++ b/packages/conveyer/src/reactive.ts @@ -28,7 +28,7 @@ export const REACTIVE_CONVEYER: ReactiveAdapter< }, init(instance, data) { if (data.props.autoInit !== false) { - instance.init(); + instance!.init(); } }, on(instance, name, callback) { diff --git a/packages/ngx-conveyer/projects/ngx-conveyer/package.json b/packages/ngx-conveyer/projects/ngx-conveyer/package.json index c9c84df8..605ccb63 100644 --- a/packages/ngx-conveyer/projects/ngx-conveyer/package.json +++ b/packages/ngx-conveyer/projects/ngx-conveyer/package.json @@ -28,7 +28,7 @@ "@angular/core": "^13.0.0" }, "dependencies": { - "@cfcs/angular": "~0.0.4", + "@cfcs/angular": "~0.0.12", "@egjs/conveyer": "~1.4.6", "tslib": "^2.3.0" } diff --git a/packages/react-conveyer/package.json b/packages/react-conveyer/package.json index b62e75c3..35a7a1c4 100644 --- a/packages/react-conveyer/package.json +++ b/packages/react-conveyer/package.json @@ -28,7 +28,7 @@ "dist/*" ], "dependencies": { - "@cfcs/react": "~0.0.4", + "@cfcs/react": "~0.0.12", "@egjs/conveyer": "~1.4.6" }, "devDependencies": { diff --git a/packages/svelte-conveyer/package.json b/packages/svelte-conveyer/package.json index d2cd3f25..229f20d1 100644 --- a/packages/svelte-conveyer/package.json +++ b/packages/svelte-conveyer/package.json @@ -5,6 +5,7 @@ "sideEffects": false, "types": "declaration/index.d.ts", "module": "dist/conveyer.esm.js", + "svelte": "dist/conveyer.esm.js", "main": "dist/conveyer.cjs.js", "repository": { "type": "git", @@ -69,7 +70,7 @@ "typescript": "^4.1.6" }, "dependencies": { - "@cfcs/svelte": "~0.0.4", + "@cfcs/svelte": "~0.0.12", "@egjs/conveyer": "~1.4.6" } } diff --git a/packages/svelte-conveyer/src/svelte-conveyer/useConveyer.ts b/packages/svelte-conveyer/src/svelte-conveyer/useConveyer.ts index cc61b4e5..0f1b17ba 100644 --- a/packages/svelte-conveyer/src/svelte-conveyer/useConveyer.ts +++ b/packages/svelte-conveyer/src/svelte-conveyer/useConveyer.ts @@ -3,7 +3,7 @@ import { ConveyerOptions, REACTIVE_CONVEYER } from "@egjs/conveyer"; import { useReactive, useRef } from "@cfcs/svelte"; -function useConveyer(props: ConveyerOptions = { horizontal: false }): SvelteConveyerResult { +function useConveyer(props: ConveyerOptions = {}): SvelteConveyerResult { const elementRef = useRef(); const result = useReactive({ data() { diff --git a/packages/vue-conveyer/package.json b/packages/vue-conveyer/package.json index 80dd83ec..0520b1be 100644 --- a/packages/vue-conveyer/package.json +++ b/packages/vue-conveyer/package.json @@ -39,7 +39,7 @@ "dist/*" ], "dependencies": { - "@cfcs/vue3": "~0.0.4", + "@cfcs/vue3": "~0.0.12", "@egjs/conveyer": "~1.4.6" }, "devDependencies": { diff --git a/packages/vue2-conveyer/package.json b/packages/vue2-conveyer/package.json index bfae76b5..3d6be435 100644 --- a/packages/vue2-conveyer/package.json +++ b/packages/vue2-conveyer/package.json @@ -63,7 +63,7 @@ "vue": "^2.0.0" }, "dependencies": { - "@cfcs/vue2": "~0.0.4", + "@cfcs/vue2": "~0.0.12", "@egjs/conveyer": "~1.4.6" } } diff --git a/yarn.lock b/yarn.lock index c3007ac2..54981d6e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1668,48 +1668,55 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cfcs/angular@~0.0.4": - version "0.0.4" - resolved "https://registry.yarnpkg.com/@cfcs/angular/-/angular-0.0.4.tgz#df681e3ac4f198941958e8703001b2c19ba25189" - integrity sha512-j2r/Q6ooHi5Ee1le9n735qb2xQGoy253zUF2xirr1IAzT67AAEuG/kTq++UwMkmPe1j008S6s7AzkEYcKu3lvw== +"@cfcs/angular@~0.0.12": + version "0.0.12" + resolved "https://registry.npmjs.org/@cfcs/angular/-/angular-0.0.12.tgz#b49272f8763e64ba8755872258dc513703880a06" + integrity sha512-OTtw7RcBj5JB0wEzCRXDVUB9bgry54T3S+sKOCTFjjqpGfNj8zLQFN6eQHkDd0Vpn1UvfsCfe0CDc+VfnOS2/g== dependencies: - "@cfcs/core" "~0.0.4" + "@cfcs/core" "~0.0.12" tslib "^2.3.0" -"@cfcs/core@^0.0.4", "@cfcs/core@~0.0.4": +"@cfcs/core@^0.0.4": version "0.0.4" resolved "https://registry.yarnpkg.com/@cfcs/core/-/core-0.0.4.tgz#5c1e89c2c170dfa9ba69450376ed0d894e19e2a1" integrity sha512-Y/BD2l+XpGtx2LT/ehdqUyvJ6OpI3F6yAQMNKj1t57WhzQX1AS6uEQRLmgPWd75fzsyV7u4Aia/+5KeCqgHuNg== dependencies: "@egjs/component" "^3.0.2" -"@cfcs/react@~0.0.4": - version "0.0.4" - resolved "https://registry.yarnpkg.com/@cfcs/react/-/react-0.0.4.tgz#aa22e4bfbd4851c00240ef1f6a1353151facde27" - integrity sha512-0ETIzD8dxURPCBq59hjxm8P9TwPDeEqlSTlUng9q4L8IPDBcuQzyQRtmQQKxWVTP2zfA8ov/B85Yw3Qdp2xC9g== +"@cfcs/core@~0.0.12": + version "0.0.12" + resolved "https://registry.npmjs.org/@cfcs/core/-/core-0.0.12.tgz#b06ad9b95d4a5316cd756b3b3128ad3e8c48d3ba" + integrity sha512-DqFagZYApByyx5xcQfG5dApxjAZzhr53biM8eB5sTXsZbTaIZ6E+MyocoeTAChg4GArM9qsRT0QWEtdbIDsJdA== dependencies: - "@cfcs/core" "~0.0.4" + "@egjs/component" "^3.0.3" -"@cfcs/svelte@~0.0.4": - version "0.0.4" - resolved "https://registry.yarnpkg.com/@cfcs/svelte/-/svelte-0.0.4.tgz#130afa25805847be0991d7824d31ec576e0f28d0" - integrity sha512-HkYn8qGY1IyX70H0r9DvwM/PhnkYew6oqRmewzF4z0RuR6M6xu7dGfAYHiVbEXMDIunY5CFUIAlieK2TY1mmWg== +"@cfcs/react@~0.0.12": + version "0.0.12" + resolved "https://registry.npmjs.org/@cfcs/react/-/react-0.0.12.tgz#9270e11d989dde8f40d74d2e23b8ae386d49842e" + integrity sha512-sAU8aXS1krIbLhW34AZWMY64t2UnXdwNX/39dHW6Y98A/P8XiOEWBa1bcD9M2PPrgM3lhiW35Bor9xcf3FO1hQ== dependencies: - "@cfcs/core" "~0.0.4" + "@cfcs/core" "~0.0.12" -"@cfcs/vue2@~0.0.4": - version "0.0.4" - resolved "https://registry.yarnpkg.com/@cfcs/vue2/-/vue2-0.0.4.tgz#5e27dbcb3dd6b7516f75fc2943fec6037587cf9c" - integrity sha512-tFAdAbsYA/Q2kVM+j/KHhXmTrnm+NzfvHTtfgZP2rR4RyMSFkVfUIcUhtOuSTPcdGG052G/6MEVzJJ/tMeL3UA== +"@cfcs/svelte@~0.0.12": + version "0.0.12" + resolved "https://registry.npmjs.org/@cfcs/svelte/-/svelte-0.0.12.tgz#a60f3e05159c15af6fd48ca6787250e677202441" + integrity sha512-W6r8s56uR8mhajtzWTqSWnXzdZCH/Vg0hNl/YhCY4eRMjB6ErdvOgTr8P/4r2xbzOsq3QNhq2X7CK/ba6W/xFw== dependencies: - "@cfcs/core" "~0.0.4" + "@cfcs/core" "~0.0.12" -"@cfcs/vue3@~0.0.4": - version "0.0.4" - resolved "https://registry.yarnpkg.com/@cfcs/vue3/-/vue3-0.0.4.tgz#aff1e3d1a823f303cd0d2414e1b415834b8e8062" - integrity sha512-r+6svTEA71diI3UFCL0y4usAkPQ0HSmCy8PUyLtoQS1/fr5mOubt18Klz8noeqpcghkVhkTYjf6QSAjloDzGZw== +"@cfcs/vue2@~0.0.12": + version "0.0.12" + resolved "https://registry.npmjs.org/@cfcs/vue2/-/vue2-0.0.12.tgz#3088d46fbad61857c75e26b77eca2f07e85dde9c" + integrity sha512-7eodpA1zuMiOQrOEQY0Bh6U3sK/fwlPzkjZxlKSxV6bS87AmyPpaMUsbEZYDOyvhj7TStSqGlazVPTHfoaFtNw== dependencies: - "@cfcs/core" "~0.0.4" + "@cfcs/core" "~0.0.12" + +"@cfcs/vue3@~0.0.12": + version "0.0.12" + resolved "https://registry.npmjs.org/@cfcs/vue3/-/vue3-0.0.12.tgz#d420522512e6958ca1e11914ee2e09c277e905d3" + integrity sha512-fJes14jQh97WT9iC79RxvymAJCEQbzjQnL8aiOWx8RUJt94VnIa70/EtreTk/48PcaAt7l6MNtBBXUd7ylCgYA== + dependencies: + "@cfcs/core" "~0.0.12" "@cnakazawa/watch@^1.0.3": version "1.0.4" @@ -2312,6 +2319,11 @@ resolved "https://registry.yarnpkg.com/@egjs/component/-/component-3.0.2.tgz#c56794fcf1b2cb2768d09b021444779e54d0de1b" integrity sha512-Mze3mwEE19+dERrimg0JVLtpOHG4AC+LOuKqvF4qGZjn0k23ZbNI7b/gy1LFR63LigC2b8k70aDjy8xoT+WNPA== +"@egjs/component@^3.0.3": + version "3.0.3" + resolved "https://registry.npmjs.org/@egjs/component/-/component-3.0.3.tgz#805dee17d299513abfde8a68a4cd932bb7d4bca9" + integrity sha512-Pnwxw9mDTvz+j4md6ZlRTpM7jgYoOKlcmjfDgE9okhaAGTqTH0Rl2vIXHOHok5yqYVFR5QXbO31t4x93gavOPQ== + "@egjs/flicking-plugins@^4.2.1": version "4.4.0" resolved "https://registry.yarnpkg.com/@egjs/flicking-plugins/-/flicking-plugins-4.4.0.tgz#05405b6536efefaa1dd09de5cb12ecc9c69e96d2" @@ -2381,10 +2393,10 @@ dependencies: "@egjs/infinitegrid" "~4.5.0" -"@egjs/release-helper@^0.2.3": - version "0.2.7" - resolved "https://registry.yarnpkg.com/@egjs/release-helper/-/release-helper-0.2.7.tgz#7138b9b6e79d663e57b0cc9ceb372b3195e94d38" - integrity sha512-p58Y50qqn+wgEdLusmUhTFvWO4WSBX5fExgaLvNk5SKMcLBaDqS+f2Xct1MQJlAcOyq6GZq12O3AYK9vueJn6g== +"@egjs/release-helper@^0.2.8": + version "0.2.8" + resolved "https://registry.npmjs.org/@egjs/release-helper/-/release-helper-0.2.8.tgz#1b6cccd5994bd5027d616b7aa84eec2620630958" + integrity sha512-BNeh0K7ah2dcisD7gkQTcreLTunHRIaqAOyi2CBMPXVHLEyry3xPDzixKngRLnJAUNjjfGMt92rXsC4e1i62rw== dependencies: chalk "^2.4.2" commander "^9.2.0"