From c30fa365d0dd6f5ddc5d7c76d5203349f17f6720 Mon Sep 17 00:00:00 2001 From: Maha Lakshme S Date: Wed, 6 Sep 2023 16:05:26 +0530 Subject: [PATCH] avniproject/avni-product#1374 | Corrected bundle path in sourcemap upload --- Makefile | 2 +- packages/openchs-android/package-lock.json | 61 +++++++++++++++------- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 42f1aba64..8f25e8c6c 100644 --- a/Makefile +++ b/Makefile @@ -56,11 +56,11 @@ ip:=$(if $(ip),$(ip),$(shell ifconfig | grep -A 2 'en0' | grep 'inet ' | tail -1 ip:=$(if $(ip),$(ip),$(shell ifconfig | grep -A 4 'en0' | grep 'inet ' | tail -1 | xargs | cut -d ' ' -f 2 | cut -d ':' -f 2)) AVNI_HOST?=$(ip) sha:=$(shell git rev-parse --short=4 HEAD) -flavor_folder_uppercase_path:=$(shell echo "$(flavor)" | awk '{print toupper(substr($$0,1,1)) tolower(substr($$0,2))}') ifndef flavor flavor:=generic endif +flavor_folder_uppercase_path:=$(shell echo "$(flavor)" | awk '{print toupper(substr($$0,1,1)) (substr($$0,2))}') flavor_folder_uppercase_path:=$(shell echo "$(flavor)" | awk '{print toupper(substr($$0,1,1)) tolower(substr($$0,2))}') ifeq ($(flavor), lfe) diff --git a/packages/openchs-android/package-lock.json b/packages/openchs-android/package-lock.json index 6799c3ed5..00e8ea486 100644 --- a/packages/openchs-android/package-lock.json +++ b/packages/openchs-android/package-lock.json @@ -1,7 +1,7 @@ { "name": "openchs-android", "version": "0.0.1", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, "packages": { "": { @@ -26,6 +26,7 @@ "create-react-class": "15.6.3", "deprecated-react-native-listview": "^0.0.8", "deprecated-react-native-prop-types": "2.3.0", + "flatted": "^3.2.7", "i18n-js": "3.9.2", "immutable": "4.1.0", "invariant": "2.2.4", @@ -33,7 +34,7 @@ "lodash": "4.17.21", "moment": "2.29.4", "native-base": "3.4.9", - "openchs-models": "1.30.62", + "openchs-models": "1.30.63", "prop-types": "15.8.1", "react": "18.2.0", "react-native": "0.72.3", @@ -9150,6 +9151,11 @@ "node": ">= 0.10" } }, + "node_modules/flatted": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", + "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" + }, "node_modules/flow-bin": { "version": "0.98.1", "resolved": "https://registry.npmjs.org/flow-bin/-/flow-bin-0.98.1.tgz", @@ -16431,10 +16437,11 @@ } }, "node_modules/openchs-models": { - "version": "1.30.62", - "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.30.62.tgz", - "integrity": "sha512-2sRAVlF+MXeriGTZUgEfqHNyzMSNRxResI8xgv/IHDJzFWMI3xjIyW1q+2Ck6H1xHzRagitHsBl5pI+ioHxzsA==", + "version": "1.30.63", + "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.30.63.tgz", + "integrity": "sha512-sKIL1YfzM+3pOHyLfZ34EREl3atvPLiHSiv6L+ZrkD8kt8ofIw7AdtZYA/ebGoj7sXBvM7dsW3Rx3AqjRwrztg==", "peerDependencies": { + "flatted": "*", "lodash": "*", "moment": "*" } @@ -34757,8 +34764,9 @@ }, "openchs-idi": { "version": "git+ssh://git@github.com/openchs/openchs-idi.git#fe0f390ed049a7c6078ff44033dd4d25cb3bbfb9", - "from": "openchs-idi@github:openchs/openchs-idi#fe0f390ed049a7c6078ff44033dd4d25cb3bbfb9", + "integrity": "sha512-iIYDIFtznCrmHThQ8qgKioHwczDnOzCU+wjGwKczSrp+SkiiyPJJ19EOSK0xlSqjjOjkqogBwvU8LimXnHwcjg==", "dev": true, + "from": "openchs-idi@github:openchs/openchs-idi#fe0f390ed049a7c6078ff44033dd4d25cb3bbfb9", "requires": { "amazon-cognito-identity-js": "1.28.0", "axios": "^0.21.1", @@ -35135,9 +35143,9 @@ } }, "openchs-models": { - "version": "1.30.62", - "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.30.62.tgz", - "integrity": "sha512-2sRAVlF+MXeriGTZUgEfqHNyzMSNRxResI8xgv/IHDJzFWMI3xjIyW1q+2Ck6H1xHzRagitHsBl5pI+ioHxzsA==" + "version": "1.30.63", + "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.30.63.tgz", + "integrity": "sha512-sKIL1YfzM+3pOHyLfZ34EREl3atvPLiHSiv6L+ZrkD8kt8ofIw7AdtZYA/ebGoj7sXBvM7dsW3Rx3AqjRwrztg==" }, "opencollective-postinstall": { "version": "2.0.3", @@ -36685,7 +36693,8 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==", - "dev": true + "dev": true, + "optional": true }, "braces": { "version": "2.3.2", @@ -37355,6 +37364,7 @@ }, "rules-config": { "version": "git+ssh://git@github.com/openchs/rules-config.git#fe552da405368bfd138e2f38e605c1d307e3ebe4", + "integrity": "sha512-SM3+9ZMkwOmwdUIUxyqmJCQGK13MHZv191JM+Ws4RDynXXTV1QqKUKxscoJV/HnMtT4hWqnL8o3uI37xEtN/1Q==", "from": "rules-config@github:openchs/rules-config#fe552da405368bfd138e2f38e605c1d307e3ebe4" }, "run-parallel-limit": { @@ -38040,6 +38050,14 @@ "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", "dev": true }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, "string-length": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", @@ -38143,13 +38161,6 @@ "dev": true, "requires": { "char-regex": "^1.0.2" - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -39241,13 +39252,15 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true + "dev": true, + "optional": true }, "is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, + "optional": true, "requires": { "is-extglob": "^2.1.1" } @@ -39308,13 +39321,15 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==", - "dev": true + "dev": true, + "optional": true }, "braces": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, + "optional": true, "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -39333,6 +39348,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", "dev": true, + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -39515,6 +39531,7 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==", "dev": true, + "optional": true, "requires": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -39527,6 +39544,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", "dev": true, + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -39592,7 +39610,8 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true + "dev": true, + "optional": true }, "is-glob": { "version": "4.0.3", @@ -39609,6 +39628,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2" }, @@ -39618,6 +39638,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" }