fix: Add package-lock.json to git & disable protocol register for dev env (#815)

* Add package-lock.json to git & disable protocol register for dev env
Disable package-lock file for travis

* Disable package-lock.json just for travis
This commit is contained in:
Kiran Niranjan 2019-11-29 08:47:15 +05:30 committed by GitHub
parent c0fb4c6a9b
commit 0b9c5e200f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15245 additions and 4 deletions

3
.gitignore vendored
View File

@ -29,10 +29,9 @@ installer/win/Symphony-x64-cache
installer/win/Symphony-x64-SetupFiles installer/win/Symphony-x64-SetupFiles
installer/win/Symphony-x86-cache installer/win/Symphony-x86-cache
installer/win/Symphony-x86-SetupFiles installer/win/Symphony-x86-SetupFiles
package-lock.json
library library
*.log *.log
js/translation/*_missing.json js/translation/*_missing.json
out out
lib lib
build build

View File

@ -1,6 +1,7 @@
env: env:
global: global:
- ELECTRON_QA="true" - ELECTRON_QA="true"
- npm config set package-lock false
os: os:
- osx - osx
@ -20,10 +21,12 @@ addons:
before_install: before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
install:
- npm install
script: script:
- node --version - node --version
- npm --version - npm --version
- npm install
- npm test - npm test
cache: cache:

15237
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -50,7 +50,9 @@ handlePerformanceSettings();
setChromeFlags(); setChromeFlags();
// Electron sets the default protocol // Electron sets the default protocol
app.setAsDefaultProtocolClient('symphony'); if (!isDevEnv) {
app.setAsDefaultProtocolClient('symphony');
}
/** /**
* Main function that init the application * Main function that init the application