Skip to content

Commit

Permalink
Merge pull request #80 from gielcobben/vernon/upgrade-caption-core
Browse files Browse the repository at this point in the history
Upgrade caption-core to 2.0.1
  • Loading branch information
vernondegoede authored Dec 18, 2017
2 parents 42b720d + aa14cb7 commit 2ee7cb1
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 32 deletions.
40 changes: 21 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 21 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,10 @@
"scripts": {
"start": "electron --inspect=5858 .",
"build": "npm run test && next build renderer && next export renderer",
"dist:mac":
"export CSC_IDENTITY_AUTO_DISCOVERY=\"true\"; node -r dotenv/config node_modules/.bin/build --mac -p always",
"dist:windows":
"export CSC_NAME=\"Defringe\"; export CSC_IDENTITY_AUTO_DISCOVERY=\"false\"; export CSC_LINK=\"~/Defringe.p12\"; node -r dotenv/config node_modules/.bin/build --windows -p always",
"dist:linux":
"node -r dotenv/config node_modules/.bin/build --linux -p always",
"dist":
"npm run build && npm run dist:mac && npm run dist:windows && npm run dist:linux",
"dist:mac": "export CSC_IDENTITY_AUTO_DISCOVERY=\"true\"; node -r dotenv/config node_modules/.bin/build --mac -p always",
"dist:windows": "export CSC_NAME=\"Defringe\"; export CSC_IDENTITY_AUTO_DISCOVERY=\"false\"; export CSC_LINK=\"~/Defringe.p12\"; node -r dotenv/config node_modules/.bin/build --windows -p always",
"dist:linux": "node -r dotenv/config node_modules/.bin/build --linux -p always",
"dist": "npm run build && npm run dist:mac && npm run dist:windows && npm run dist:linux",
"test": "jest",
"test:watch": "jest --watch",
"postinstall": "opencollective postinstall"
Expand All @@ -59,7 +55,7 @@
"addic7ed-api": "^1.3.2",
"app-root-path": "2.0.1",
"bluebird": "^3.5.1",
"caption-core": "^2.0.0",
"caption-core": "^2.0.1",
"electron-is-dev": "0.3.0",
"electron-lets-move": "0.0.5",
"electron-next": "3.1.1",
Expand All @@ -86,9 +82,17 @@
"repo": "Caption"
}
],
"files": ["**/*", "!.env", "!renderer", "renderer/out"],
"files": [
"**/*",
"!.env",
"!renderer",
"renderer/out"
],
"mac": {
"target": ["dmg", "zip"],
"target": [
"dmg",
"zip"
],
"icon": "./renderer/static/icon.icns",
"fileAssociations": [
{
Expand Down Expand Up @@ -325,11 +329,15 @@
]
},
"linux": {
"target": ["deb"],
"target": [
"deb"
],
"icon": "./renderer/static/icon.iconset/"
},
"win": {
"target": ["nsis"],
"target": [
"nsis"
],
"icon": "./renderer/static/icon.ico",
"publisherName": "Defringe"
}
Expand Down

0 comments on commit 2ee7cb1

Please sign in to comment.