Skip to content

Commit

Permalink
Merge pull request #226 from ferferga/deyarn
Browse files Browse the repository at this point in the history
Switch to npm
  • Loading branch information
thornbill committed Mar 10, 2021
2 parents 8c972c3 + 243dc1a commit 6e2f798
Show file tree
Hide file tree
Showing 8 changed files with 26,897 additions and 16,450 deletions.
3 changes: 3 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
"settings": {
"react": {
"version": "detect"
},
"jest": {
"version": "detect"
}
},
"rules": {
Expand Down
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 2
updates:
# Fetch and update latest `github-actions` pkgs
- package-ecosystem: github-actions
directory: '/'
schedule:
interval: daily
time: '00:00'
open-pull-requests-limit: 10
commit-message:
prefix: actions
include: scope
20 changes: 14 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,23 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: 12
check-latest: true

- name: Cache dependencies
uses: actions/cache@v2
- name: Get npm cache directory path
id: npm-cache-dir-path
run: echo "::set-output name=dir::$(npm config get cache)"

- name: Cache node_modules
uses: actions/cache@v2.1.4
id: npm-cache
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
path: ${{ steps.npm-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-npm-
- name: Install Node.js dependencies
run: yarn install --frozen-lockfile
run: npm ci --no-audit

- name: Run eslint
run: yarn lint
run: npm run lint
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
uses: actions/cache@v2
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}

- name: Install Node.js dependencies
run: yarn install --frozen-lockfile
run: npm ci --no-audit

- name: Run jest
run: npx jest
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ Translations can be improved very easily from our [Weblate](https://translate.je
git clone https://github.com/jellyfin/jellyfin-expo.git
cd jellyfin-expo
```
2. Install build dependencies using yarn in the project directory.
2. Install build dependencies using **npm** in the project directory.
```sh
yarn install
npm install
```
3. Start the build tools.
```sh
yarn start
npm start
```
4. Follow the directions in the terminal or browser window to open on a device or emulator.

## FAQ

### What is the difference between this and other Jellyfin app projects?
* This app (Jellyfin Mobile) is a web wrapper based on Expo with some native enhancements. It is available on the [App Store](https://apps.apple.com/us/app/jellyfin-mobile/id1480192618?mt=8) for iPhone and iPad.
* [Jellyfin Player iOS](https://github.com/jellyfin/jellyfin-client-ios) is a newer effort to create a media playback app in native Swift. It is a work in progress and currently only supports media playback.
* [Jellyfin Player iOS](https://github.com/jellyfin/jellyfin-client-ios) is a newer effort to create a media playback app in native Swift. It is a work in progress and currently only supports media playback. This project has been archived as there was no interest for maintaining it.
* [Jellyfin React Client](https://github.com/jellyfin-archive/jellyfin-react-client) is an early project to create a single multiplatform app based on React Native. This project has been archived as we have changed direction to utilize native web wrappers on most platforms.

0 comments on commit 6e2f798

Please sign in to comment.