Skip to content

Commit

Permalink
v1.5.0 (#607)
Browse files Browse the repository at this point in the history
* infra updates, bump deps latest semver

* fix TheMovieDbMetadataProvider and PctTorrentProvider

* fix color of loading indicator when using light theme

* temporarily edisable ci e2e tests

* complete trending implementation (#605)

* fix tarvis linux ci config

* fix travis ci config

* Squashed commit of the following:

commit a1b359b
Author: Amila Welihinda <[email protected]>
Date:   Thu Apr 16 16:31:57 2020 -0700

    misc

commit 78a864c
Author: Amila Welihinda <[email protected]>
Date:   Tue Apr 14 18:52:50 2020 -0700

    initial typescript migration

* fix all linter errors, initial API refactor

* finish refactoring

* refactor routing

* migrate to PlayerAdapter architecture

* fix more typescript errors

* misc refactors

* rewrite caching implementation

* fix routing bugs

* fix show page itemView bug

* add settings page, allow changing theme from settings modal

* refactor Config

* migrate all flags to Settings flags

* use native bootstrap spacing classes, deprecate row-margin

* fix all linter errors

* fix: remove duplicate call to startPlayback

* fix: fix all linter errors

* fix: upgrade deps to work around plyr bug

* fix: fix carousel wrapAround issue

* fix: fix CI by upgrading to node@12

* fix: fix deprecate targets lacking autoupdate support

* fix: deps update

* fix: fix watchlist and favorites buttons

* fix: fix theme change bugs, fix all linter errors

* fix: fix theme related ts errors

* infra: migrate to github actions

* infra: migrate from node-sass to sass

* fix: normalize left carriage on windows

* fix: remove duplicate react types dependencies

* hack: temporarily disable eslint in ci

* hack: bump electron-builder to get ci to pass

* fix: only publish assets on push to fix socket hangup

* fix: separate ci into publish and test workflows
  • Loading branch information
amilajack authored Mar 20, 2021
1 parent 9db0e48 commit 2633fdf
Show file tree
Hide file tree
Showing 198 changed files with 16,500 additions and 16,683 deletions.
7 changes: 3 additions & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ app/node_modules
# OSX
.DS_Store

# flow-typed
flow-typed/npm/*
!flow-typed/npm/module_vx.x.x.js

# App packaged
app/main.prod.js
app/main.prod.js.map
Expand All @@ -46,3 +42,6 @@ resources
.idea
npm-debug.log.*
__snapshots__
*.css.d.ts
*.sass.d.ts
*.scss.d.ts
28 changes: 28 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
module.exports = {
extends: "erb",
rules: {
// A temporary hack related to IDE not resolving correct package.json
"import/no-extraneous-dependencies": "off",
"@typescript-eslint/camelcase": "off",
"react/jsx-props-no-spreading": "off",
},
parserOptions: {
ecmaVersion: 2020,
sourceType: "module",
project: "./tsconfig.json",
tsconfigRootDir: __dirname,
createDefaultProgram: true,
},
settings: {
"import/resolver": {
// See https://github.com/benmosher/eslint-plugin-import/issues/1396#issuecomment-575727774 for line below
node: {},
webpack: {
config: require.resolve("./configs/webpack.config.eslint.js"),
},
},
"import/parsers": {
"@typescript-eslint/parser": [".ts", ".tsx"],
},
},
};
28 changes: 0 additions & 28 deletions .flowconfig

This file was deleted.

8 changes: 7 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
* text=auto
* text eol=lf
*.exe binary
*.png binary
*.jpg binary
*.jpeg binary
*.ico binary
*.icns binary
33 changes: 33 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Publish

on:
push:
branches:
- master

jobs:
publish:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [macos-latest]

steps:
- name: Checkout git repo
uses: actions/checkout@v1

- name: Install Node, NPM and Yarn
uses: actions/setup-node@v1
with:
node-version: 15

- name: Install dependencies
run: |
yarn install
- name: Publish releases
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
yarn build && yarn electron-builder --publish always --win --mac --linux
34 changes: 34 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Test

on: [push, pull_request]

jobs:
release:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]

steps:
- name: Check out Git repository
uses: actions/checkout@v1

- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v1
with:
node-version: 15

- name: yarn install
run: |
yarn install --frozen-lockfile --network-timeout 300000
- name: yarn test
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
yarn package
# yarn lint
# yarn tsc
# yarn test
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ app/node_modules
# OSX
.DS_Store

# flow-typed
flow-typed/npm/*
!flow-typed/npm/module_vx.x.x.js

# App packaged
release
app/main.prod.js
Expand All @@ -51,3 +47,7 @@ npm-debug.log.*

# Project specific
.env

*.css.d.ts
*.sass.d.ts
*.scss.d.ts
6 changes: 0 additions & 6 deletions .stylelintrc

This file was deleted.

80 changes: 0 additions & 80 deletions .travis.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["dbaeumer.vscode-eslint", "EditorConfig.EditorConfig"]
}
12 changes: 1 addition & 11 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,10 @@
"files.associations": {
".stylelintrc": "jsonc",
".testcafe-electron-rc": "jsonc",

".env": "ignore",
".env.example": "ignore",
".eslintignore": "ignore",
".flowconfig": "ignore"
".eslintignore": "ignore"
},

"javascript.validate.enable": false,
"javascript.format.enable": false,
"typescript.validate.enable": false,
"typescript.format.enable": false,

"flow.useNPMPackagedFlow": true,
"search.exclude": {
".git": true,
".eslintcache": true,
Expand All @@ -23,7 +14,6 @@
"app/main.prod.js.map": true,
"bower_components": true,
"dll": true,
"flow-typed": true,
"release": true,
"node_modules": true,
"npm-debug.log.*": true,
Expand Down
13 changes: 2 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,8 @@ The branch to be PR'd against depends on what the feature is. If the PR is addin
This project has **VERY** strict eslint rules. Adding eslint support to your text-editor will make contributing a lot easier.

## Editor Configuration
### Atom
Recommended Development Packages:
```bash
apm install editorconfig es6-javascript javascript-snippets linter linter-eslint language-babel autocomplete-flow
```

### Sublime
* https://github.com/sindresorhus/editorconfig-sublime#readme
* https://github.com/SublimeLinter/SublimeLinter3
* https://github.com/roadhump/SublimeLinter-eslint
* https://github.com/babel/babel-sublime

See the [electron-react-boilerplate docs](https://electron-react-boilerplate.js.org/docs/editor-configuration/)

## FAQ
* `CALL_AND_RETRY_LAST Allocation failed`: If your node process's heap runs out of memory (`CALL_AND_RETRY_LAST Allocation failed - JavaScript heap out of memory`), kill close the electron app and restart the electron process. A proper solution hasn't been found for this yet.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

- 🎞 **Subtitles**: Subtitle integration for movies

## Getting started:
## Installation:

- **I am a tester:** Download the latest build from the [releases](https://github.com/amilajack/popcorn-time-desktop/releases) section.

Expand All @@ -50,7 +50,7 @@
- For packaging, see [packaging requirements](https://github.com/amilajack/popcorn-time-desktop/wiki/Packaging-Requirements)
- For casting support, you will need to [satisfy mdns's requirements](https://github.com/agnat/node_mdns#installation)

## Installation:
## Local Setup:

```bash
git clone https://github.com/amilajack/popcorn-time-desktop.git
Expand Down
11 changes: 11 additions & 0 deletions __mocks__/electron.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module.exports = {
require: jest.fn(),
match: jest.fn(),
app: jest.fn(),
remote: {
app: {
getVersion: () => "v1.3.0",
},
},
dialog: jest.fn(),
};
46 changes: 0 additions & 46 deletions app/actions/homePageActions.js

This file was deleted.

Loading

0 comments on commit 2633fdf

Please sign in to comment.