Sfoglia il codice sorgente

Version bump of rom-comm. build process complete

Andrew Chalkley 8 anni fa
parent
commit
d2faa0d35f
2 ha cambiato i file con 18 aggiunte e 8 eliminazioni
  1. 8 5
      package.json
  2. 10 3
      scripts/fix-index.js

+ 8 - 5
package.json

@@ -10,6 +10,7 @@
     "postinstall": "cd ui && yarn",
 
     "build-ui": "cd ui && npm run build && cd .. && npm run copy-ui && npm run fix-index",
+    
     "copy-ui": "ncp ui/build front-end/",
     "fix-index": "node ./scripts/fix-index.js",
 
@@ -17,6 +18,8 @@
     "rebuild": "cd node_modules/serialport && node-gyp rebuild --target=1.4.8 --arch=x64 --dist-url=https://atom.io/download/atom-shell",
     "rebuild-32": "cd node_modules/serialport && node-gyp rebuild --target=1.4.8 --arch=ia32 --dist-url=https://atom.io/download/atom-shell",
     
+    "common-build":"npm run pre-rebuild && npm run rebuild && npm run build-ui",
+    "common-build-32":"npm run pre-rebuild && npm run rebuild-32 && npm run build-ui",
     
     "pack-windows": "electron-packager . --asar --asar-unpack=protocol-link.html --overwrite --platform=win32 --arch=x64 --icon=resources/icon.ico --prune=true --out=out --version-string.CompanyName=ThingsSDK --version-string.FileDescription=Flasher.js --version-string.ProductName=Flasher.js --ignore=ui/",
     "pack-windows-32": "electron-packager . --asar --asar-unpack=protocol-link.html --overwrite --platform=win32 --arch=ia32 --icon=resources/icon.ico --prune=true --out=out --version-string.CompanyName=ThingsSDK --version-string.FileDescription=Flasher.js --version-string.ProductName=Flasher.js --ignore=ui/",
@@ -33,10 +36,10 @@
     "installer-mac": "electron-installer-dmg --overwrite --out=out/ out/Flasher.js-darwin-x64/Flasher.js.app Flasher.js --icon=resources/icon.icns --background=resources/drag_to_install.png",
     "installer-linux": "electron-installer-debian --src out/flasher.js-linux-x64/ --arch amd64 --config linux-config.json",
     
-    "dist-windows": "npm run pre-rebuild && npm run rebuild && npm run pack-windows && npm run sign-windows && npm run installer-windows && npm run sign-installer-windows",
-    "dist-windows-32": "npm run pre-rebuild && npm run rebuild-32 && npm run pack-windows-32 && npm run sign-windows-32 && npm run installer-windows-32 && npm run sign-installer-windows",
-    "dist-linux": "npm run pre-rebuild && npm run rebuild && npm run pack-linux && npm run installer-linux",
-    "dist-mac": "npm run pre-rebuild && npm run rebuild && npm run pack-mac && npm run sign-mac && npm run installer-mac"
+    "dist-windows": "npm run common-build && npm run pack-windows && npm run sign-windows && npm run installer-windows && npm run sign-installer-windows",
+    "dist-windows-32": "npm run common-build-32 && npm run pack-windows-32 && npm run sign-windows-32 && npm run installer-windows-32 && npm run sign-installer-windows",
+    "dist-linux": "npm run common-build && npm run pack-linux && npm run installer-linux",
+    "dist-mac": "npm run common-build && npm run pack-mac && npm run sign-mac && npm run installer-mac"
   },
   "repository": {
     "type": "git",
@@ -71,7 +74,7 @@
     "node-fetch": "^1.6.3",
     "request": "^2.79.0",
     "rimraf": "^2.5.4",
-    "rom-comm": "^1.0.1",
+    "rom-comm": "^1.1.0",
     "serialport": "^4.0.7"
   },
   "devDependencies": {

+ 10 - 3
scripts/fix-index.js

@@ -1,3 +1,10 @@
-const path = require('path');
-
-const rootPath = path.join(__dirname, '..');
+const fs = require('fs');
+const path = require('path');
+const { openAndFix } = require('./helpers');
+const rootPath = path.join(__dirname, '..');
+const pathToIndex = path.join(rootPath, 'front-end', 'index.html');
+
+console.log('Fixing UI...');
+const fileContents = openAndFix(pathToIndex, 'utf8');
+fs.writeFileSync(pathToIndex, fileContents);
+console.log('...fixed');