cordova: Fix build

- Make 'cordova' a regular (non-dev) dependency. Before this change,
  `cordova prepare` would result in the package getting removed.

- Try `cordova prepare` twice. It sometimes fails on the first attempt
  but works on the second.

Author: shesek

cordova/package.json

@@ -9,6 +9,7 @@
         "dist": "./build.sh"
     },
     "dependencies": {
+        "cordova": "^8.1.2",
         "cordova-android": "^7.1.4",
         "cordova-plugin-badge": "^0.8.8",
         "cordova-plugin-customurlscheme": "^5.0.2",
@@ -35,8 +36,5 @@
         "platforms": [
             "android"
         ]
-    },
-    "devDependencies": {
-        "cordova": "^8.1.2"
     }
-}
+}

scripts/builder.Dockerfile

@@ -55,7 +55,8 @@ COPY cordova/package.json cordova/npm-shrinkwrap.json cordova/config.xml ./
 COPY cordova/res ./res
 RUN npm install && cordova telemetry off
 # build a dummy cordova app to download required artifacts in docker build time
-RUN mkdir www && cordova prepare && cordova build && rm -r www platforms/android/app/build
+# `electron prepare` sometimes fails on the first attempt but works on the second. this appears related to  https://github.com/apache/cordova-plugin-screen-orientation/issues/55
+RUN mkdir www && (cordova prepare || cordova prepare) && cordova build && rm -r www platforms/android/app/build
 
 # Spark client
 WORKDIR /opt/spark/client