From 9a4417e9e06358d0ce74fe1b1cd3cb324c10c5ef Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Thu, 16 May 2024 10:35:13 +0100 Subject: [PATCH] fix root-url for github pages --- .github/workflows/gh-pages.yml | 2 ++ README.md | 4 ++-- test-app/config/environment.js | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index bc89d780..305e702c 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -26,6 +26,8 @@ jobs: - name: Build run: pnpm run build working-directory: test-app + env: + GITHUB_PAGES: "true" - name: Deploy uses: peaceiris/actions-gh-pages@v4 if: github.ref == 'refs/heads/main' diff --git a/README.md b/README.md index aa2d3cdd..c4c69f60 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![npm version](https://badge.fury.io/js/ember-infinity.svg)](http://badge.fury.io/js/ember-infinity) [![Ember Observer Score](http://emberobserver.com/badges/ember-infinity.svg)](http://emberobserver.com/addons/ember-infinity) -Demo: [ember-adopted-addons.github.io/ember-infinity/](https://ember-adopted-addons.github.io/ember-infinity/) +Demo: [adopted-ember-addons.github.io/ember-infinity/](https://adopted-ember-addons.github.io/ember-infinity/) Simple, flexible infinite scrolling for Ember CLI Apps. Works out of the box with the [Kaminari Gem](https://github.com/amatsuda/kaminari.git). @@ -41,7 +41,7 @@ We test against `ember-source >= 3.28`. Try out `v2.0.0`. If it doesn't work or 2. **infinity-loader component** -3. **Route Mixin** (deprecated and removed as of 1.1). If you still want to upgrade, but keep your Route mixins, install `1.0.2`. See old docs (here)[https://github.com/ember-adopted-addons/ember-infinity/blob/2e0cb02e5845a97cad8783893cd7f4ddcf5dc5a7/README.md] +3. **Route Mixin** (deprecated and removed as of 1.1). If you still want to upgrade, but keep your Route mixins, install `1.0.2`. See old docs (here)[https://github.com/adopted-ember-addons/ember-infinity/blob/2e0cb02e5845a97cad8783893cd7f4ddcf5dc5a7/README.md] ### Service Component Approach diff --git a/test-app/config/environment.js b/test-app/config/environment.js index 113d30ae..e8f7c0c1 100644 --- a/test-app/config/environment.js +++ b/test-app/config/environment.js @@ -4,7 +4,7 @@ module.exports = function (environment) { const ENV = { modulePrefix: 'test-app', environment, - rootURL: '/', + rootURL: process.env.GITHUB_PAGES ? '/ember-infinity/' : '/', locationType: 'history', EmberENV: { EXTEND_PROTOTYPES: false,