Merge branch 'master' into 3.1

fieg · web-flow · commit d9056d1f8795 · 2022-09-21T15:15:45.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ test/screenshots
 test/videos
 .build
 .idea
+.parcel-cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
 ## [3.1.0-beta.1]
 
 This version introduces upwards scroll support (fixes [#466](https://github.com/webcreate/infinite-ajax-scroll/issues/466)). See documentation on the [`prev`](docs/options.md#prev) option on how to enable this feature.
@@ -18,6 +19,10 @@ This version introduces upwards scroll support (fixes [#466](https://github.com/
 * Added [`prepend`](docs/events.md#prepend) event
 * Added [`prepended`](docs/events.md#prepended) event
 
+## [3.0.1]
+
+* Fixed prefill not filling past the scroll threshold
+
 ## [3.0.0]
 
 Changes since 3.0.0-rc.1:
@@ -119,7 +124,9 @@ See [LICENSE](LICENSE) for more details.
 * Extensible through events
 * Added an extensive test suite
 
-[3.1.0-beta.1]: https://github.com/webcreate/infinite-ajax-scroll/compare/3.0.0...3.1.0-beta.1
+
+[3.1.0-beta.1]: https://github.com/webcreate/infinite-ajax-scroll/compare/3.0.1...3.1.0-beta.1
+[3.0.1]: https://github.com/webcreate/infinite-ajax-scroll/compare/3.0.0...3.0.1
 [3.0.0]: https://github.com/webcreate/infinite-ajax-scroll/compare/3.0.0-rc.1...3.0.0
 [3.0.0-rc.1]: https://github.com/webcreate/infinite-ajax-scroll/compare/v2.3.1...3.0.0-rc.1
 [2.3.1]: https://github.com/webcreate/infinite-ajax-scroll/compare/v2.3.0...v2.3.1
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ More features, documentation and examples available at: https://docs.infiniteaja
 Get up and running in no time by linking directly to Infinite Ajax Scroll on [unpkg](https://unpkg.com).
 
 ```markup
-<script src="https://unpkg.com/@webcreate/infinite-ajax-scroll@^3.0.0/dist/infinite-ajax-scroll.min.js"></script>
+<script src="https://unpkg.com/@webcreate/infinite-ajax-scroll@^3/dist/infinite-ajax-scroll.min.js"></script>
 ```
 
 Place this code right before the `</body>` tag on each template or page that you want to use infinite scroll on.
diff --git a/examples/articles/.gitignore b/examples/articles/.gitignore
@@ -1,5 +1,5 @@
 node_modules
 dist
-.cache
+.parcel-cache
 package-lock.json
 .npmrc
diff --git a/examples/articles/index.html b/examples/articles/index.html
@@ -39,7 +39,7 @@ <h1>Infinite Scroll Example Blog</h1>
     </div>
 </div>
 
-<script src="./index.js"></script>
+<script type="module" src="./index.js"></script>
 
 <footer class="ias-foot">This <a href="https://infiniteajaxscroll.com/examples/articles/">infinite scroll for blog</a> example is powered by <a href="https://infiniteajaxscroll.com">Infinite Ajax Scroll</a></footer>
 </body>
diff --git a/examples/articles/package.json b/examples/articles/package.json
@@ -13,7 +13,7 @@
   "private": true,
   "scripts": {
     "build": "parcel build *.html --public-url ./",
-    "watch": "parcel watch * --public-url ./",
+    "watch": "parcel watch *.html --public-url ./",
     "link": "npm link ../../"
   },
   "keywords": [
@@ -32,6 +32,6 @@
     "@webcreate/infinite-ajax-scroll": "^3.1.0-beta.1"
   },
   "devDependencies": {
-    "parcel-bundler": "^1.12.4"
+    "parcel": "^2.0.0"
   }
 }
diff --git a/examples/articles/page2.html b/examples/articles/page2.html
@@ -40,7 +40,7 @@ <h1>Pellentesque habitant morbi senectus</h1>
     </div>
 </div>
 
-<script src="./index.js"></script>
+<script type="module" src="./index.js"></script>
 
 <footer class="ias-foot">This <a href="https://infiniteajaxscroll.com/examples/articles/">infinite scroll for blog</a> example is powered by <a href="https://infiniteajaxscroll.com">Infinite Ajax Scroll</a></footer>
 </body>
diff --git a/examples/articles/page3.html b/examples/articles/page3.html
@@ -38,7 +38,7 @@ <h1>Diam sollicitudin tempor id eu nisl</h1>
     </div>
 </div>
 
-<script src="./index.js"></script>
+<script type="module" src="./index.js"></script>
 
 <footer class="ias-foot">This <a href="https://infiniteajaxscroll.com/examples/articles/">infinite scroll for blog</a> example is powered by <a href="https://infiniteajaxscroll.com">Infinite Ajax Scroll</a></footer>
 </body>
diff --git a/examples/blocks/.gitignore b/examples/blocks/.gitignore
@@ -1,5 +1,5 @@
 node_modules
 dist
-.cache
+.parcel-cache
 package-lock.json
 .npmrc
diff --git a/examples/blocks/index.html b/examples/blocks/index.html
@@ -20,7 +20,7 @@
     <div class="loader"></div>
 </div>
 
-<script src="./index.js"></script>
+<script type="module" src="./index.js"></script>
 
 <footer class="ias-foot">This <a href="https://infiniteajaxscroll.com/examples/blocks/">infinite scroll</a> example is powered by <a href="https://infiniteajaxscroll.com">Infinite Ajax Scroll</a></footer>
 </body>
diff --git a/examples/blocks/package.json b/examples/blocks/package.json
@@ -13,7 +13,7 @@
   "private": true,
   "scripts": {
     "build": "parcel build *.html --public-url ./",
-    "watch": "parcel watch * --public-url ./",
+    "watch": "parcel watch *.html --public-url ./",
     "link": "npm link ../../"
   },
   "keywords": [
@@ -32,6 +32,6 @@
     "@webcreate/infinite-ajax-scroll": "^3.0.0"
   },
   "devDependencies": {
-    "parcel-bundler": "^1.12.4"
+    "parcel": "^2.0.0"
   }
 }
diff --git a/examples/button/index.html b/examples/button/index.html
@@ -21,7 +21,7 @@
     <button id="btn1" class="trigger">Load more</button>
 </div>
 
-<script src="./index.js"></script>
+<script type="module" src="./index.js"></script>
 
 <footer class="ias-foot">This <a href="https://infiniteajaxscroll.com/examples/button/">infinite scroll</a> example is powered by <a href="https://infiniteajaxscroll.com">Infinite Ajax Scroll</a></footer>
 </body>
diff --git a/examples/button/package.json b/examples/button/package.json
@@ -13,7 +13,7 @@
   "private": true,
   "scripts": {
     "build": "parcel build *.html --public-url ./",
-    "watch": "parcel watch * --public-url ./",
+    "watch": "parcel watch *.html --public-url ./",
     "link": "npm link ../../"
   },
   "keywords": [
@@ -32,6 +32,6 @@
     "@webcreate/infinite-ajax-scroll": "^3.0.0"
   },
   "devDependencies": {
-    "parcel-bundler": "^1.12.4"
+    "parcel": "^2.0.0"
   }
 }
diff --git a/examples/masonry/.gitignore b/examples/masonry/.gitignore
@@ -1,5 +1,5 @@
 node_modules
 dist
-.cache
+.parcel-cache
 package-lock.json
 .npmrc
diff --git a/examples/masonry/index.html b/examples/masonry/index.html
@@ -60,7 +60,7 @@
     <a href="index.html" class="pager__next">Next &rightarrow;</a>
 </div>
 
-<script src="./index.js"></script>
+<script type="module" src="./index.js"></script>
 
 <footer class="ias-foot">This <a href="https://infiniteajaxscroll.com/examples/masonry/">masonry infinite scroll</a> example is powered by <a href="https://infiniteajaxscroll.com">Infinite Ajax Scroll</a></footer>
 </body>
diff --git a/examples/masonry/package.json b/examples/masonry/package.json
@@ -13,7 +13,7 @@
   "private": true,
   "scripts": {
     "build": "parcel build *.html --public-url ./",
-    "watch": "parcel watch * --public-url ./",
+    "watch": "parcel watch *.html --public-url ./",
     "link": "npm link ../../"
   },
   "keywords": [
@@ -34,6 +34,6 @@
     "masonry-layout": "^4.2.2"
   },
   "devDependencies": {
-    "parcel-bundler": "^1.12.4"
+    "parcel": "^2.0.0"
   }
 }
diff --git a/examples/vuejs/App.vue b/examples/vuejs/App.vue
@@ -11,11 +11,10 @@
   </div>
 </template>
 
-<script lang="ts">
-import Vue from "vue";
+<script lang="js">
 import InfiniteAjaxScroll from '@webcreate/infinite-ajax-scroll';
 
-export default Vue.extend({
+export default {
   data() {
     return {
       isLast: false,
@@ -73,10 +72,10 @@ export default Vue.extend({
       })
     }
   }
-});
+};
 </script>
 
-<style lang="scss" scoped>
+<style lang="css" scoped>
   .container {
     margin-top: 48px;
   }
@@ -92,10 +91,9 @@ export default Vue.extend({
   .image {
     padding: 20px;
     border: 10px solid #666;
-
-    img {
-      width: 100%;
-    }
+  }
+  .image img {
+    width: 100%;
   }
 
   .last {
diff --git a/examples/vuejs/index.html b/examples/vuejs/index.html
@@ -11,6 +11,6 @@
 <body>
 <div id="app"></div>
 <footer class="ias-foot">This <a href="https://infiniteajaxscroll.com/examples/vuejs/">VueJS infinite scroll</a> example is powered by <a href="https://infiniteajaxscroll.com">Infinite Ajax Scroll</a></footer>
-<script src="./index.js"></script>
+<script type="module" src="./index.js"></script>
 </body>
 </html>
diff --git a/examples/vuejs/index.js b/examples/vuejs/index.js
@@ -1,4 +1,6 @@
-import Vue from 'vue';
+import { createApp } from "vue";
 import App from './App.vue';
 
-new Vue({ render: createElement => createElement(App) }).$mount('#app');
+const app = createApp(App)
+
+app.mount('#app')
diff --git a/examples/vuejs/package.json b/examples/vuejs/package.json
@@ -19,15 +19,9 @@
   },
   "dependencies": {
     "@webcreate/infinite-ajax-scroll": "^3.0.0",
-    "vue": "^2.6.14",
-    "vue-hot-reload-api": "^2.3.4"
+    "vue": "^3.2.37"
   },
   "devDependencies": {
-    "@vue/component-compiler-utils": "^3.2.2",
-    "parcel-bundler": "^1.12.5",
-    "pug": "^3.0.2",
-    "sass": "^1.35.2",
-    "typescript": "^4.3.5",
-    "vue-template-compiler": "^2.6.14"
+    "parcel": "^2.0.0"
   }
 }
diff --git a/package-lock.json b/package-lock.json
