Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
close #67 (no longer fibers dependency)
  • Loading branch information
t2t2 committed May 23, 2020
1 parent fd75cff commit 05fac3f
Show file tree
Hide file tree
Showing 21 changed files with 4,835 additions and 5,863 deletions.
6 changes: 3 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const path = require('path') // eslint-disable-line import/no-extraneous-dependencies
const {buildConfig, preprocess} = require('xo/lib/options-manager')
const {buildConfig} = require('xo/lib/options-manager')

const xoConfig = buildConfig(preprocess({
const xoConfig = buildConfig({
semicolon: false,
extends: [
'plugin:vue/recommended'
Expand All @@ -18,7 +18,7 @@ const xoConfig = buildConfig(preprocess({
}
}
}
}))
})

module.exports = {
root: true,
Expand Down
22 changes: 19 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,27 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
with:
node-version: 14

- name: Cache node modules
uses: actions/cache@v1
env:
cache-name: cache-node-modules
with:
node-version: 12
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- run: npm ci

- run: npm run deploy:ci
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35 changes: 35 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Lint

on:
pull_request:
push:
branches-ignore:
- gh-pages

jobs:
lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2-beta
with:
node-version: 14

- name: Cache node modules
uses: actions/cache@v1
env:
cache-name: cache-node-modules
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- run: npm ci

- run: npm run lint
33 changes: 31 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,38 @@
// Place your settings in this file to overwrite default and user settings.
{
// ===
// Spacing
// ===
"editor.insertSpaces": false,
"editor.trimAutoWhitespace": true,
"files.trimTrailingWhitespace": true,
"files.eol": "\n",
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
// ===
// Files
// ===
"files.exclude": {
"**/dist": true
"**/*.log": true,
"**/*.log*": true,
"**/dist": true,
},
// ===
// Event Triggers
// ===
"editor.formatOnSave": true,
"vetur.format.enable": false,
// ===
// JS(ON)
// ===
"javascript.format.enable": false,
"json.format.enable": false,
// ===
// CSS
// ===
"css.validate": false,
"eslint.autoFixOnSave": true,
"[vue]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
},
"eslint.enable": true
}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# OBS Remote Tablet

OBS Remote UI optimised for tablets, but really it works with any
OBS Remote UI optimised for tablets, but really it works with any web browser.

## Building instructions

* Clone the repository
* Install dependencies `npm install`
* Build it! `npm run build -- --homepage /`
* Build it! `npm run build`

Note: By default the build script assumes deployment to the main URL. `--homepage <url>` lets you specifiy the base URL the assets will follow.
Built files will be in `dist/` directory, serve these with your favourite webserver, be it nginx, apache, one of those fancy one-liners or whatever.

## Developing

Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
presets: [
'@vue/app'
'@vue/cli-plugin-babel/preset'
]
}
Loading

0 comments on commit 05fac3f

Please sign in to comment.