Skip to content

Commit dd5038e

Browse files
AkryumAkryum
committed
chore: fix build
1 parent 8622b67 commit dd5038e

File tree

7 files changed

+84
-36
lines changed

7 files changed

+84
-36
lines changed

‎packages/vue-virtual-scroller/build/rollup.config.base.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,12 @@ export default {
3333
babel({
3434
exclude: 'node_modules/**',
3535
}),
36-
cjs(),
36+
cjs({
37+
include: /node_modules/,
38+
}),
3739
replace({
3840
VERSION: JSON.stringify(config.version),
41+
preventAssignment: true,
3942
}),
4043
],
4144
watch: {

‎packages/vue-virtual-scroller/build/rollup.config.browser.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ const config = Object.assign({}, base, {
88
file: 'dist/vue-virtual-scroller.min.js',
99
format: 'iife',
1010
sourcemap: true,
11+
globals: {
12+
vue: 'Vue',
13+
},
1114
},
1215
})
1316

14-
config.plugins.push(terser({}))
17+
config.plugins.push(terser())
1518

1619
export default config

‎packages/vue-virtual-scroller/build/rollup.config.es.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const config = Object.assign({}, base, {
99
},
1010
external: [
1111
...base.external,
12-
'scrollparent',
12+
'mitt',
1313
'vue-observe-visibility',
1414
'vue-resize',
1515
],

‎packages/vue-virtual-scroller/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"homepage": "https://github.com/Akryum/vue-virtual-scroller#readme",
3535
"dependencies": {
3636
"mitt": "^2.1.0",
37-
"scrollparent": "^2.0.1",
3837
"vue-observe-visibility": "^2.0.0-alpha.1",
3938
"vue-resize": "^2.0.0-alpha.1"
4039
},
@@ -43,15 +42,15 @@
4342
},
4443
"devDependencies": {
4544
"@rollup/plugin-babel": "^5.3.0",
46-
"@rollup/plugin-commonjs": "^11.0.2",
47-
"@rollup/plugin-node-resolve": "^7.1.1",
45+
"@rollup/plugin-commonjs": "^18.0.0",
46+
"@rollup/plugin-node-resolve": "^11.2.1",
4847
"@rollup/plugin-replace": "^2.3.1",
4948
"@vue/compiler-sfc": "^3.0.11",
5049
"autoprefixer": "^9.7.5",
5150
"clean-css": "^4.1.8",
5251
"cross-env": "^7.0.2",
5352
"fs-extra": "^9.1.0",
54-
"rollup": "^2.2.0",
53+
"rollup": "^2.45.2",
5554
"rollup-plugin-css-only": "^2.0.0",
5655
"rollup-plugin-css-porter": "^1.0.2",
5756
"rollup-plugin-terser": "^5.3.0",

‎packages/vue-virtual-scroller/src/components/RecycleScroller.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import { shallowReactive, markRaw } from 'vue'
5858
import { ResizeObserver } from 'vue-resize'
5959
import { ObserveVisibility } from 'vue-observe-visibility'
60-
import ScrollParent from 'scrollparent'
60+
import { getScrollParent } from '../scrollparent'
6161
import config from '../config'
6262
import { props, simpleArray } from './common'
6363
import { supportsPassive } from '../utils'
@@ -496,7 +496,7 @@ export default {
496496
},
497497
498498
getListenerTarget () {
499-
let target = ScrollParent(this.$el)
499+
let target = getScrollParent(this.$el)
500500
// Fix global scroll target for Chrome and Safari
501501
if (window.document && (target === window.document.documentElement || target === window.document.body)) {
502502
target = window

‎packages/vue-virtual-scroller/src/scrollparent.js

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Fork of https://github.com/olahol/scrollparent.js to be able to build with Rollup
2+
3+
const regex = /(auto|scroll)/
4+
5+
function parents (node, ps) {
6+
if (node.parentNode === null) { return ps }
7+
8+
return parents(node.parentNode, ps.concat([node]))
9+
}
10+
11+
const style = function (node, prop) {
12+
return getComputedStyle(node, null).getPropertyValue(prop)
13+
}
14+
15+
const overflow = function (node) {
16+
return style(node, 'overflow') + style(node, 'overflow-y') + style(node, 'overflow-x')
17+
}
18+
19+
const scroll = function (node) {
20+
return regex.test(overflow(node))
21+
}
22+
23+
export function getScrollParent (node) {
24+
if (!(node instanceof HTMLElement || node instanceof SVGElement)) {
25+
return
26+
}
27+
28+
const ps = parents(node.parentNode, [])
29+
30+
for (let i = 0; i < ps.length; i += 1) {
31+
if (scroll(ps[i])) {
32+
return ps[i]
33+
}
34+
}
35+
36+
return document.scrollingElement || document.documentElement
37+
}

‎yarn.lock

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1860,29 +1860,30 @@
18601860
"@babel/helper-module-imports" "^7.10.4"
18611861
"@rollup/pluginutils" "^3.1.0"
18621862

1863-
"@rollup/plugin-commonjs@^11.0.2":
1864-
version "11.1.0"
1865-
resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-11.1.0.tgz#60636c7a722f54b41e419e1709df05c7234557ef"
1866-
integrity sha512-Ycr12N3ZPN96Fw2STurD21jMqzKwL9QuFhms3SD7KKRK7oaXUsBU9Zt0jL/rOPHiPYisI21/rXGO3jr9BnLHUA==
1863+
"@rollup/plugin-commonjs@^18.0.0":
1864+
version "18.0.0"
1865+
resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-18.0.0.tgz#50dc7518b5aa9e66a270e529ea85115d269825c4"
1866+
integrity sha512-fj92shhg8luw7XbA0HowAqz90oo7qtLGwqTKbyZ8pmOyH8ui5e+u0wPEgeHLH3djcVma6gUCUrjY6w5R2o1u6g==
18671867
dependencies:
1868-
"@rollup/pluginutils" "^3.0.8"
1868+
"@rollup/pluginutils" "^3.1.0"
18691869
commondir "^1.0.1"
1870-
estree-walker "^1.0.1"
1871-
glob "^7.1.2"
1872-
is-reference "^1.1.2"
1873-
magic-string "^0.25.2"
1874-
resolve "^1.11.0"
1870+
estree-walker "^2.0.1"
1871+
glob "^7.1.6"
1872+
is-reference "^1.2.1"
1873+
magic-string "^0.25.7"
1874+
resolve "^1.17.0"
18751875

1876-
"@rollup/plugin-node-resolve@^7.1.1":
1877-
version "7.1.3"
1878-
resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz#80de384edfbd7bfc9101164910f86078151a3eca"
1879-
integrity sha512-RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q==
1876+
"@rollup/plugin-node-resolve@^11.2.1":
1877+
version "11.2.1"
1878+
resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz#82aa59397a29cd4e13248b106e6a4a1880362a60"
1879+
integrity sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==
18801880
dependencies:
1881-
"@rollup/pluginutils" "^3.0.8"
1882-
"@types/resolve" "0.0.8"
1881+
"@rollup/pluginutils" "^3.1.0"
1882+
"@types/resolve" "1.17.1"
18831883
builtin-modules "^3.1.0"
1884+
deepmerge "^4.2.2"
18841885
is-module "^1.0.0"
1885-
resolve "^1.14.2"
1886+
resolve "^1.19.0"
18861887

18871888
"@rollup/plugin-replace@^2.3.1":
18881889
version "2.4.2"
@@ -1892,7 +1893,7 @@
18921893
"@rollup/pluginutils" "^3.1.0"
18931894
magic-string "^0.25.7"
18941895

1895-
"@rollup/pluginutils@^3.0.0", "@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0":
1896+
"@rollup/pluginutils@^3.0.0", "@rollup/pluginutils@^3.1.0":
18961897
version "3.1.0"
18971898
resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
18981899
integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
@@ -2110,10 +2111,10 @@
21102111
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
21112112
integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
21122113

2113-
"@types/resolve@0.0.8":
2114-
version "0.0.8"
2115-
resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
2116-
integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
2114+
"@types/resolve@1.17.1":
2115+
version "1.17.1"
2116+
resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
2117+
integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
21172118
dependencies:
21182119
"@types/node" "*"
21192120

@@ -5156,6 +5157,11 @@ deepmerge@^1.5.2:
51565157
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
51575158
integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==
51585159

5160+
deepmerge@^4.2.2:
5161+
version "4.2.2"
5162+
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
5163+
integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
5164+
51595165
default-gateway@^4.2.0:
51605166
version "4.2.0"
51615167
resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
@@ -6735,7 +6741,7 @@ glob-to-regexp@^0.4.1:
67356741
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
67366742
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
67376743

6738-
glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
6744+
glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
67396745
version "7.1.6"
67406746
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
67416747
integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -7823,7 +7829,7 @@ is-promise@^2.1.0:
78237829
resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
78247830
integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
78257831

7826-
is-reference@^1.1.2:
7832+
is-reference@^1.2.1:
78277833
version "1.2.1"
78287834
resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
78297835
integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
@@ -8547,7 +8553,7 @@ macos-release@^2.2.0:
85478553
resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.4.1.tgz#64033d0ec6a5e6375155a74b1a1eba8e509820ac"
85488554
integrity sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg==
85498555

8550-
magic-string@^0.25.2, magic-string@^0.25.7:
8556+
magic-string@^0.25.7:
85518557
version "0.25.7"
85528558
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
85538559
integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
@@ -11184,7 +11190,7 @@ resolve-url@^0.2.1:
1118411190
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
1118511191
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
1118611192

11187-
resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0:
11193+
resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0:
1118811194
version "1.20.0"
1118911195
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
1119011196
integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -11314,7 +11320,7 @@ rollup-pluginutils@^2.4.1, rollup-pluginutils@^2.8.2:
1131411320
dependencies:
1131511321
estree-walker "^0.6.1"
1131611322

11317-
rollup@^2.2.0:
11323+
rollup@^2.45.2:
1131811324
version "2.45.2"
1131911325
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.45.2.tgz#8fb85917c9f35605720e92328f3ccbfba6f78b48"
1132011326
integrity sha512-kRRU7wXzFHUzBIv0GfoFFIN3m9oteY4uAsKllIpQDId5cfnkWF2J130l+27dzDju0E6MScKiV0ZM5Bw8m4blYQ==

0 commit comments

Comments
 (0)