Skip to content

Commit

Permalink
Yarn switch
Browse files Browse the repository at this point in the history
Credits goes to @ozkanpakdil
  • Loading branch information
team-pct committed Nov 27, 2018
1 parent 547b34f commit 0812762
Show file tree
Hide file tree
Showing 14 changed files with 11,751 additions and 10,933 deletions.
32 changes: 32 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
skip_commits:
files:
- .travis.yml

environment:
matrix:
- nodejs_version: STABLE

cache:
- node_modules -> package.json

build_script:
- yarn config set yarn-offline-mirror ./node_modules/
- yarn install --ignore-engines --ignore-scripts
- yarn build

after_build:
- yarn gulp compress

artifacts:
- path: build\*.zip
name: PopcornTime

deploy:
description: 'Windows Release'
provider: GitHub
auth_token:
secure: wKYGmYxyZoGANT1qraz3HzsUN9tiYx9pvF3KpILJZ/UQtC+EC5XHsnxKNtCjDUhb # your encrypted token from GitHub
artifact: /build/.*\.zip/
on:
branch: master
appveyor_repo_tag: false
32 changes: 27 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,32 @@
os:
- linux
- osx

language: node_js
node_js:
- "4"
- stable
cache:
yarn: true
directories:
- node_modules
before_install:
- if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
- npm install -g gulp-cli
after_success : gulp build
- yarn config set yarn-offline-mirror ./node_modules/
- yarn install --ignore-engines
- yarn build
install:
- yarn gulp compress
after_success:
- ls -ltr ./build/
deploy:
provider: releases
file_glob: true
file: build/Popcorn-Time*.zip
name: Build $(date +'%d.%m.%Y %R')
skip_cleanup: true
on:
branch: development
tags: false
api-key:
secure: "IxNjbYB5ptBG6yvdTVV5otXxOYUO6L31VRxHAL/3A939MukMM6GUBlr0jcJ2mWzxvhHoo90r3RWT/81qCPH0Mf7oDCWthwuAsX1RtOVC7LinbEeLEX4Lp/To0kC2gn0dBwXSJhakkQZ4alZywRxLzV+TxiF/HYlOLuF+6ZZ5mtv6vNIylxkmaQy/KHV43LYLw7weEHafj3TSpLsKFZw0/Rqw/rKKWCMzMY750HmN0rNb54Hbu9+5zVdNpnfa4ovmdTiB7aOjrr2/Z8LVYdw9+MTipwpYq4Kb2syYjkZiduUshI+ttsyw6T5Hgg0hrAnW3pVZ+HLnxQUw75BnUOoF3rFFEdLA3tGQ1BGf2zRoN10JQae/hBAvagY5Y+55m02IUE1qnOCJ6vrAfMb2a1i4Eu+JUCViMw/ITKEYnGkHWyvZ1uhT3M8WqEUAZWCnNlRz2+UjZD4dXOwQwvYzBG5smDW2H1/Z0XRUJjCGU+G5Gvol4qa7Dsb97d6ezQvtqs//DI80Af0IgQawiBVwMboLlgqUCra6+1WqlwzVk22OznkBR3zJDTqJwNkBrXhzmpy6/y2MiqcsctgMsJHClHHy4CD3PK4LplO1IHs0Ix/QZEN6gBUN3vsJsgZjhUuiPD8p0rsnxeCC8XF7GnhJOnnh6RpzF7ZOs1FjcQ+iEixgMGY="
notifications:
email: false
irc: "chat.freenode.net#butterdev"
3 changes: 3 additions & 0 deletions .vscode/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"git.ignoreLimitWarning": true
}
17 changes: 17 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"configurations": [
{
"name": "GulpTester",
"type": "node",
"request": "launch",
"program": "${workspaceRoot}/node_modules/gulp/bin/gulp.js",
"stopOnEntry": false,
"args": ["build"],
"cwd": "${workspaceRoot}",
"runtimeArgs": [
"--nolazy"
],
"console": "internalConsole",
}
]
}
15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
[![Build Status](https://travis-ci.org/popcorn-official/popcorn-desktop.svg?branch=master)](https://travis-ci.org/popcorn-official/popcorn-desktop)
[![Dependency Status](https://david-dm.org/popcorn-official/popcorn-desktop.svg)](https://david-dm.org/popcorn-official/popcorn-desktop)
[![devDependency Status](https://david-dm.org/popcorn-official/popcorn-desktop/dev-status.svg)](https://david-dm.org/popcorn-official/popcorn-desktop#info=devDependencies)
[![Build status](https://ci.appveyor.com/api/projects/status/sjq58hpqqj73vhx1?svg=true)](https://ci.appveyor.com/project/ozkanpakdil/popcorn-desktop)

Allow any user to easily watch movies through torrent streaming, without any prerequisites.

Expand All @@ -12,7 +13,7 @@ Visit the project's website at <https://popcorntime.sh>.

## Getting Involved

Do you want to report a bug, request a feature, contribute to or translate Popcorn Time? Check out our in-depth guide to [Contributing to Popcorn Time](CONTRIBUTING.md#contributing-to-popcorn-time). We need all the help we can get! You can also join our [community](README.md#community) to keep up-to-date and meet other developers.
Want to report a bug, request a feature, contribute to or translate Popcorn Time? Check out our in-depth guide to [Contributing to Popcorn Time](CONTRIBUTING.md#contributing-to-popcorn-time). We need all the help we can get! You can also join our [community](README.md#community) to keep up-to-date and meet other developers.

## Getting Started

Expand All @@ -24,16 +25,14 @@ The [master](https://github.com/popcorn-official/popcorn-desktop) branch which c

#### Quickstart:

1. `gulp run`
1. `yarn gulp run`

If you encounter trouble with the above method, you can try:

1. `npm install -g bower gulp` (Linux: you may need to run with `sudo`)

2. `npm install`
3. `bower install`
4. `gulp build`
5. `gulp run`
1. `yarn config set yarn-offline-mirror ./node_modules/`
2. `yarn install --ignore-engines`
3. `yarn build`
5. `yarn gulp run`

Optionally, you may simply run `./make_popcorn.sh` if you are on a linux or mac based operating system.

Expand Down
26 changes: 0 additions & 26 deletions bower.json

This file was deleted.

120 changes: 120 additions & 0 deletions dist/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
{
"name": "Popcorn-Time",
"companyName": "Popcorn Time",
"installIcon": "./src/app/images/popcorntime.ico",
"unInstallIcon": "./src/app/images/butter_uninstall.ico",
"homepage": "http://popcorntime.sh/",
"bugs": "https://github.com/popcorn-official/popcorn-desktop/issues",
"repository": {
"type": "git",
"url": "https://github.com/popcorn-official/popcorn-desktop.git"
},
"license": "GPL-3.0",
"main": "src/app/index.html",
"version": "0.3.10",
"releaseName": "Popcorn is Love",
"scripts": {
"gulp": "gulp",
"postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'src/app/vendor', 'junction') } catch (e) { }\"",
"postupdate": "node_modules/.bin/bower update --config.interactive=false",
"start": "gulp run",
"build": "gulp build",
"test": "gulp test"
},
"chromium-args": "--enable-node-worker",
"engines": {
"npm": ">=3.0.0",
"node": ">=4.4.0",
"yarn": ">= 1.0.0"
},
"window": {
"title": "Popcorn Time",
"icon": "src/app/images/icon.png",
"frame": false,
"min_width": 960,
"min_height": 520,
"resizable": true,
"show": false,
"position": "center"
},
"dependencies": {
"@bower_components/backbone": "jashkenas/backbone#>=0.9.9 <=1.3.x",
"@bower_components/backbone.babysitter": "marionettejs/backbone.babysitter#^0.1.0",
"@bower_components/backbone.wreqr": "marionettejs/backbone.wreqr#^1.0.0",
"@bower_components/bootstrap": "twbs/bootstrap#~3.3.7",
"@bower_components/font-awesome": "FortAwesome/Font-Awesome#~4.6.3",
"@bower_components/jquery": "jquery/jquery-dist#1.9.1 - 3",
"@bower_components/marionette": "marionettejs/backbone.marionette#~2.x.x",
"@bower_components/mousetrap": "ccampbell/mousetrap#~1.6.0",
"@bower_components/underscore": "jashkenas/underscore#1.4.4 - 1.8.3",
"@bower_components/video.js": "videojs/video.js#4.11.4",
"@bower_components/videojs-youtube": "eXon/videojs-youtube#1.2.10",
"adm-zip": "0.4.7",
"airplayer": "2.0.0",
"async": "2.1.2",
"butter-provider": "0.6.0",
"butter-provider-anime": "1.0.0",
"butter-provider-movies": "1.0.3",
"butter-provider-tvapi": "git+https://github.com/team-pct/butter-provider-tvapi.git",
"butter-provider-vodo": "git+https://github.com/butterproviders/butter-provider-vodo.git",
"butter-settings-popcorntime.io": "git+https://github.com/popcorn-official/butter-settings-popcorn.git",
"chromecasts": "1.9.0",
"defer-request": "0.0.2",
"dlnacasts": "0.1.0",
"gitlab": "1.4.1",
"i18n": "0.x.x",
"iconv-lite": "^0.4.19",
"jschardet": "1.4.1",
"json-rpc2": "1.0.2",
"markdown": "0.5.x",
"memoizee": "^0.4.12",
"mkdirp": "*",
"moment": "^2.21.0",
"mv": "2.x.x",
"nedb": "1.8.0",
"node-captions": "0.4.6",
"node-webkit-fdialogs": "latest",
"opensubtitles-api": "4.0.0",
"os-name": "2.0.1",
"popcorn-txt-api": "git+https://github.com/hackhackhack/popcorn-txt-api.git",
"q": "2.0.3",
"readdirp": "*",
"request": "^2.85.0",
"rimraf": "^2.6.2",
"sanitizer": "0.x.x",
"semver": "^5.5.0",
"send": "0.14.x",
"tar": "2.2.1",
"temp": "0.x.x",
"trakt.tv": "2.x.x",
"trakt.tv-images": "1.x.x",
"trakt.tv-matcher": "1.x.x",
"trakt.tv-ondeck": "0.x.x",
"underscore": "1.x.x",
"urijs": "1.18.3",
"webtorrent": "^0.98.24",
"webtorrent-health": "^1.1.2"
},
"devDependencies": {
"bower": "^1.8.2",
"del": "^2.2.0",
"git-rev": "^0.2.1",
"gulp": "^3.9.1",
"gulp-filter": "^4.0.0",
"gulp-gzip": "^1.4.2",
"gulp-jsbeautifier": "^2.1.2",
"gulp-jshint": "^2.1.0",
"gulp-load-plugins": "^1.2.0",
"gulp-stylus": "^2.7.0",
"gulp-tar": "^1.8.0",
"gulp-yarn": "^1.0.1",
"guppy-pre-commit": "^0.4.0",
"jshint": "^2.9.1",
"jshint-stylish": "^2.1.0",
"nib": "^1.1.0",
"nw-builder": "^3.5.1",
"run-sequence": "^1.1.5",
"stylus": "^0.54.2",
"yargs": "^6.4.0"
}
}
Loading

0 comments on commit 0812762

Please sign in to comment.