Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 35 additions & 28 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails }}.gemfile

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup ruby
uses: ruby/setup-ruby@v1
Expand All @@ -37,13 +37,15 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache-dependency-path: client-app/yarn.lock
node-version: 22

- name: Yarn install
- uses: pnpm/action-setup@v4
with:
package_json_file: ./client-app/package.json

- name: Pnpm install
working-directory: client-app
run: yarn install
run: pnpm install

- name: Build JS app
run: bash build_client_app.sh
Expand All @@ -58,27 +60,29 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache-dependency-path: client-app/yarn.lock
node-version: 22

- name: Yarn install
- uses: pnpm/action-setup@v4
with:
package_json_file: ./client-app/package.json

- name: Pnpm install
working-directory: client-app
run: yarn install
run: pnpm install

- name: JS tests
working-directory: client-app
run: yarn test:ember
run: pnpm test:ember

linting:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup ruby
uses: ruby/setup-ruby@v1
Expand All @@ -92,15 +96,16 @@ jobs:
- uses: actions/setup-node@v3
if: ${{ !cancelled() }}
with:
node-version: 18
cache: yarn
cache-dependency-path: client-app/yarn.lock
node-version: 22

- name: Yarn install
if: ${{ !cancelled() }}
working-directory: client-app
run: yarn install
- uses: pnpm/action-setup@v4
with:
package_json_file: ./client-app/package.json

- name: Pnpm install
working-directory: client-app
run: pnpm install

- name: Syntax Tree
if: ${{ !cancelled() }}
run: |
Expand All @@ -109,25 +114,27 @@ jobs:
- name: JS linting
if: ${{ !cancelled() }}
working-directory: client-app
run: yarn lint
run: pnpm lint

publish:
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
needs: [backend, frontend, linting]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache-dependency-path: client-app/yarn.lock
node-version: 22

- name: Yarn install
- uses: pnpm/action-setup@v4
with:
package_json_file: ./client-app/package.json

- name: Pnpm install
working-directory: client-app
run: yarn install
run: pnpm install

- name: Build JS app
run: bash build_client_app.sh
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Logster UI is built using [Ember.js](http://emberjs.com/)

1. Fork it ( https://github.com/discourse/logster/fork )
2. Create your feature branch (`git checkout -b my-new-feature`)
3. Run `cd client-app && yarn install`
3. Run `cd client-app && pnpm install`
4. Run `cd website && bundle install`
5. In the root directory, run `bundle exec rake client_dev` to start Sinatra server (port 9292) and Ember server (port 4200). Use Ember server for hot reload for client code.
6. Visit `http://localhost:4200/logs/` (with trailing slash) to test the application. Reload `http://localhost:4200/report_error` to add sample log data.
Expand Down
2 changes: 1 addition & 1 deletion build_client_app.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

(cd client-app && yarn && yarn ember build --environment=${1:-production})
(cd client-app && pnpm i && pnpm ember build --environment=${1:-production})

rm -f assets/javascript/*
rm -f assets/stylesheets/client-app.css
Expand Down
1 change: 0 additions & 1 deletion client-app/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
/coverage/
/libpeerconnection.log
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
Expand Down
8 changes: 4 additions & 4 deletions client-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ A short introduction of this app could easily go here.
You will need the following things properly installed on your computer.

* [Git](https://git-scm.com/)
* [Node.js](https://nodejs.org/) (with yarn)
* [Node.js](https://nodejs.org/) (with pnpm)
* [Ember CLI](https://ember-cli.com/)
* [Google Chrome](https://google.com/chrome/)

## Installation

* `git clone <repository-url>` this repository
* `cd client-app`
* `yarn install`
* `pnpm install`

## Running / Development

Expand All @@ -35,8 +35,8 @@ Make use of the many generators for code, try `ember help generate` for more det

### Linting

* `yarn lint`
* `yarn lint:fix`
* `pnpm lint`
* `pnpm lint:fix`

### Building

Expand Down
41 changes: 21 additions & 20 deletions client-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@
"test:ember": "ember test"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@fortawesome/ember-fontawesome": "^0.4.1",
"@fortawesome/free-brands-svg-icons": "^6.3.0",
"@fortawesome/free-regular-svg-icons": "^6.3.0",
"@fortawesome/free-solid-svg-icons": "^6.3.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@ember/optional-features": "^2.2.0",
"@ember/test-helpers": "^2.9.4",
"@fortawesome/ember-fontawesome": "^0.4.3",
"@fortawesome/free-brands-svg-icons": "^6.7.2",
"@fortawesome/free-regular-svg-icons": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.6.1",
"ember-auto-import": "^2.10.0",
"ember-classic-decorator": "^3.0.1",
"ember-cli": "^3.28.6",
"ember-cli-app-version": "^6.0.0",
"ember-cli-babel": "^7.26.10",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-htmlbars": "^6.2.0",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^7.26.11",
"ember-cli-dependency-checker": "^3.3.3",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
Expand All @@ -49,17 +49,18 @@
"ember-maybe-import-regenerator": "^1.0.0",
"ember-page-title": "^7.0.0",
"ember-qunit": "^6.2.0",
"ember-resolver": "^10.0.0",
"ember-sinon-qunit": "^7.0.0",
"ember-source": "^3.28.11",
"eslint-config-discourse": "^3.4.0",
"ember-resolver": "^8.0.0",
"ember-sinon-qunit": "^7.5.0",
"ember-source": "^3.28.12",
"eslint-config-discourse": "^3.6.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"qunit": "^2.17.2",
"qunit": "^2.24.1",
"qunit-dom": "^2.0.0",
"sinon": "^15.0.1",
"webpack": "^5.94.0"
"sinon": "^15.2.0",
"webpack": "^5.98.0"
},
"packageManager": "[email protected]",
"engines": {
"node": "12.* || 14.* || >= 16"
},
Expand Down
Loading
Loading