Skip to content

Commit

Permalink
Fix bugs in the build pipeline introduced by npm cli options
Browse files Browse the repository at this point in the history
  • Loading branch information
zCoCo committed Jun 5, 2020
1 parent 177cede commit ca2ebbf
Show file tree
Hide file tree
Showing 220 changed files with 207 additions and 12,908 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file modified Apps/.DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions Apps/FrontendSoftware/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Builds
dist_electron

# Logs
logs
*.log
Expand Down
Binary file added Apps/FrontendSoftware/build/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Apps/FrontendSoftware/build/icon.ico
Binary file not shown.
Binary file added Apps/FrontendSoftware/build/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Apps/FrontendSoftware/build/iris_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
24 changes: 24 additions & 0 deletions Apps/FrontendSoftware/dist_electron/builder-effective-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,28 @@ files:
- filter:
- '**'
extends: null
appId: com.iris.terminal
copyright: 'Copyright © 2020 ${author}'
mac:
target: dmg
icon: build/icon.png
dmg:
title: '${productName} ${version}'
background: build/background.png
icon: build/icon.png
contents:
- x: 320
'y': 320
- x: 240
'y': 150
type: link
path: /Applications
win:
target: nsis
icon: build/icon.png
legalTrademarks: 'Copyright © 2020 ${author}'
linux:
target:
- AppImage
- deb
electronVersion: 3.1.13
2 changes: 1 addition & 1 deletion Apps/FrontendSoftware/dist_electron/bundled/background.js

Large diffs are not rendered by default.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion Apps/FrontendSoftware/dist_electron/bundled/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=app://./favicon.ico><title>CubeRover Ground Terminal</title><link href=app://./css/app.74203646.css rel=preload as=style><link href=app://./css/chunk-vendors.5491f47e.css rel=preload as=style><link href=app://./js/app.3632a3d2.js rel=modulepreload as=script><link href=app://./js/chunk-vendors.9b0fa4b3.js rel=modulepreload as=script><link href=app://./css/chunk-vendors.5491f47e.css rel=stylesheet><link href=app://./css/app.74203646.css rel=stylesheet></head><body><noscript><strong>We're sorry but vuestate doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=module src=app://./js/chunk-vendors.9b0fa4b3.js></script><script type=module src=app://./js/app.3632a3d2.js></script><script>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()},!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=app://./favicon.ico><title>Iris Rover Ground Terminal</title><link href=app://./css/app.4bddde41.css rel=preload as=style><link href=app://./css/chunk-vendors.5491f47e.css rel=preload as=style><link href=app://./js/app.4a7a3f4b.js rel=modulepreload as=script><link href=app://./js/chunk-vendors.39dc98a2.js rel=modulepreload as=script><link href=app://./css/chunk-vendors.5491f47e.css rel=stylesheet><link href=app://./css/app.4bddde41.css rel=stylesheet></head><body><noscript><strong>We're sorry but vuestate doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=module src=app://./js/chunk-vendors.39dc98a2.js></script><script type=module src=app://./js/app.4a7a3f4b.js></script><script>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()},!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script></body></html>

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion Apps/FrontendSoftware/dist_electron/bundled/package.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"name":"CubeRover-Ground-Terminal","productName":"CubeRover Ground Terminal","version":"0.4.0","author":"CubeRover & CMU","private":true,"scripts":{"serve":"vue-cli-service serve","build":"vue-cli-service build","lint":"vue-cli-service lint","electron:build":"vue-cli-service electron:build","electron:serve":"vue-cli-service electron:serve","postinstall":"electron-builder install-app-deps"},"dependencies":{"node-sass":"^4.12.0"},"devDependencies":{"vue-devtools":"^5.1.3","vue-svg-inline-loader":"^1.3.2"},"main":"background.js"}
{"name":"irisrover-ground-terminal-amazing-armstrong","productName":"Iris Terminal 0.5.0","version":"0.5.0","author":"Iris Rover Project & CMU","private":true,"scripts":{"serve":"vue-cli-service serve","build":"vue-cli-service build","lint":"vue-cli-service lint","electron:build":"vue-cli-service electron:build","electron:serve":"vue-cli-service electron:serve","postinstall":"electron-builder install-app-deps"},"dependencies":{"electron-unhandled":"^3.0.2","neat-csv":"^5.2.0","node-sass":"^4.13.1"},"devDependencies":{"vue-devtools":"^5.1.3","vue-svg-inline-loader":"^1.4.5"},"main":"background.js"}
27 changes: 19 additions & 8 deletions Apps/FrontendSoftware/dist_electron/index.js

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions Apps/FrontendSoftware/dist_electron/latest-mac.yml

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Loading

0 comments on commit ca2ebbf

Please sign in to comment.