Merge pull request #1015 from e-mission/framework_migration_prep

🚀 Framework migration prep has just been submitted to production

.gitignore

@@ -13,8 +13,10 @@ app-settings.json
 *.apk
 *.app.zip
 *.ipa
+www/dist/
 www/js/control/collect-settings.js
+www/templates/control/main-collect-settings.html
 www/js/control/sync-settings.js
-www/js/control/transition-notify-settings.js
+www/templates/control/main-sync-settings.html
 config.xml
 package.json

bin/download_settings_controls.js

@@ -31,15 +31,3 @@ download("https://raw.githubusercontent.com/e-mission/cordova-server-sync/master
 download("https://raw.githubusercontent.com/e-mission/cordova-server-sync/master/www/ui/ionic/templates/main-sync-settings.html", "www/templates/control/main-sync-settings.html", function(message) {
     console.log("Sync collection settings template updated");
 });
-
-download("https://raw.githubusercontent.com/e-mission/e-mission-transition-notify/master/www/ui/ionic/js/transition-notify-settings.js", "www/js/control/transition-notify-settings.js", function(message) {
-    console.log("Transition notify settings updated");
-});
-
-download("https://raw.githubusercontent.com/e-mission/e-mission-transition-notify/master/www/ui/ionic/templates/transition-notify-display-detail.html", "www/templates/control/transition-notify-display-detail.html", function(message) {
-    console.log("Transition notify settings display template updated");
-});
-
-download("https://raw.githubusercontent.com/e-mission/e-mission-transition-notify/master/www/ui/ionic/templates/main-transition-notify-settings.html", "www/templates/control/main-transition-notify-settings.html", function(message) {
-    console.log("Transition notify settings edit template updated");
-});

package.cordovabuild.json

@@ -7,10 +7,41 @@
     "type": "git",
     "url": "git+https://github.com/e-mission/e-mission-phone.git"
   },
+  "scripts": {
+    "build": "npx webpack --config webpack.prod.js && npx cordova build",
+    "build-dev": "npx webpack --config webpack.dev.js && npx cordova build",
+    "build-dev-android": "npx webpack --config webpack.dev.js && npx cordova build android",
+    "build-dev-ios": "npx webpack --config webpack.dev.js && npx cordova build ios"
+  },
   "devDependencies": {
-    "cordova": "11.1.0",
+    "@babel/core": "^7.21.3",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
+    "@babel/preset-env": "^7.21.4",
+    "@babel/preset-flow": "^7.21.4",
+    "@babel/preset-react": "^7.18.6",
+    "@babel/preset-typescript": "^7.21.4",
     "@ionic/cli": "6.20.8",
-    "bower": "1.8.14"
+    "@types/luxon": "^3.3.0",
+    "babel-loader": "^9.1.2",
+    "babel-plugin-angularjs-annotate": "^0.10.0",
+    "babel-plugin-optional-require": "^0.3.1",
+    "concurrently": "^8.0.1",
+    "cordova": "^11.1.0",
+    "css-loader": "^6.7.4",
+    "exports-loader": "^4.0.0",
+    "expose-loader": "^4.1.0",
+    "file-loader": "^6.2.0",
+    "phonegap": "9.0.0+cordova.9.0.0",
+    "process": "^0.11.10",
+    "sass": "^1.62.1",
+    "sass-loader": "^13.3.1",
+    "style-loader": "^3.3.3",
+    "ts-loader": "^9.4.2",
+    "typescript": "^5.0.3",
+    "url-loader": "^4.1.1",
+    "webpack": "^5.0.1",
+    "webpack-cli": "^5.0.1"
   },
   "cordova": {
     "platforms": [
@@ -66,6 +97,24 @@
     }
   },
   "dependencies": {
+    "@havesource/cordova-plugin-push": "git+https://github.com/havesource/cordova-plugin-push.git#4.0.0-dev.0",
+    "@react-navigation/native": "^6.1.7",
+    "@react-navigation/stack": "^6.3.17",
+    "@shopify/flash-list": "^1.3.1",
+    "angular": "1.6.7",
+    "angular-animate": "1.6.7",
+    "angular-local-storage": "^0.7.1",
+    "angular-nvd3": "^1.0.7",
+    "angular-sanitize": "1.6.7",
+    "angular-simple-logger": "^0.1.7",
+    "angular-translate": "^2.18.1",
+    "angular-translate-loader-static-files": "^2.18.1",
+    "angular-ui-router": "0.2.13",
+    "animate.css": "^3.5.2",
+    "bottleneck": "^2.19.5",
+    "chart.js": "^4.3.0",
+    "chartjs-adapter-luxon": "^1.3.1",
+    "chartjs-plugin-annotation": "^3.0.1",
     "cordova-android": "11.0.0",
     "cordova-ios": "6.2.0",
     "cordova-plugin-advanced-http": "3.3.1",
@@ -74,22 +123,51 @@
     "cordova-plugin-customurlscheme": "5.0.2",
     "cordova-plugin-device": "2.1.0",
     "cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.7.8",
-    "cordova-plugin-em-opcodeauth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.7.1",
-    "cordova-plugin-em-server-communication": "git+https://github.com/e-mission/cordova-server-communication.git#v1.2.5",
-    "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.3.1",
+    "cordova-plugin-em-opcodeauth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.7.2",
+    "cordova-plugin-em-server-communication": "git+https://github.com/e-mission/cordova-server-communication.git#v1.2.6",
+    "cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.3.2",
     "cordova-plugin-em-settings": "git+https://github.com/e-mission/cordova-connection-settings.git#v1.2.3",
     "cordova-plugin-em-unifiedlogger": "git+https://github.com/e-mission/cordova-unified-logger.git#v1.3.6",
-    "cordova-plugin-em-usercache": "git+https://github.com/e-mission/cordova-usercache.git#v1.1.5",
+    "cordova-plugin-em-usercache": "git+https://github.com/e-mission/cordova-usercache.git#v1.1.6",
     "cordova-plugin-email-composer": "git+https://github.com/katzer/cordova-plugin-email-composer.git#0.10.1",
     "cordova-plugin-file": "7.0.0",
     "cordova-plugin-inappbrowser": "5.0.0",
     "cordova-plugin-ionic-keyboard": "2.2.0",
     "cordova-plugin-ionic-webview": "5.0.0",
     "cordova-plugin-local-notification-12": "github:e-mission/cordova-plugin-local-notification-12#v0.1.4-fix-android-action",
     "cordova-plugin-x-socialsharing": "6.0.4",
+    "core-js": "^2.5.7",
+    "enketo-core": "^6.1.7",
+    "fast-xml-parser": "^4.2.2",
     "fs-extra": "^9.0.1",
+    "i18next": "^22.5.0",
+    "install": "^0.13.0",
+    "ionic-datepicker": "1.2.1",
+    "ionic-toast": "^0.4.1",
+    "jquery": "^3.1.0",
     "klaw-sync": "^6.0.0",
+    "leaflet": "^1.9.4",
+    "luxon": "^3.3.0",
+    "messageformat": "^2.3.0",
+    "moment": "^2.29.4",
+    "moment-timezone": "^0.5.43",
+    "ng-i18next": "^1.0.7",
+    "npm": "^9.6.3",
+    "nvd3": "^1.8.6",
     "phonegap-plugin-barcodescanner": "git+https://github.com/phonegap/phonegap-plugin-barcodescanner#v8.1.0",
-    "@havesource/cordova-plugin-push": "git+https://github.com/havesource/cordova-plugin-push.git#4.0.0-dev.0"
+    "prop-types": "^15.8.1",
+    "react": "^18.2.*",
+    "react-chartjs-2": "^5.2.0",
+    "react-dom": "^18.2.*",
+    "react-i18next": "^12.3.1",
+    "react-native-paper": "^5.8.0",
+    "react-native-paper-dates": "^0.18.12",
+    "react-native-safe-area-context": "^4.6.3",
+    "react-native-screens": "^3.22.0",
+    "react-native-vector-icons": "^9.2.0",
+    "react-native-web": "^0.18.10",
+    "react-native-web-webview": "^1.0.2",
+    "react-qr-code": "^2.0.11",
+    "shelljs": "^0.8.5"
   }
 }