From f42c3a6564aaa6d1e5bb8411f9f13cf3d17eccbc Mon Sep 17 00:00:00 2001 From: Evandre Silva Date: Fri, 1 Jul 2022 09:27:44 +0000 Subject: [PATCH 1/5] set cd for release/* --- bitbucket-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 5e9527e91..2dd80cc6e 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -4,7 +4,7 @@ definitions: memory: 3072 pipelines: branches: - developer: + realease/*: - step: size: 2x name: 'Build Images and push to Docker hub' From e8a5469e9a32b9598c81bb7181fe1a749f34d4c2 Mon Sep 17 00:00:00 2001 From: Evandre Da Silva Date: Fri, 1 Jul 2022 13:53:52 +0100 Subject: [PATCH 2/5] add howler dependency --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index c88ac0fc2..0ab3c3b17 100644 --- a/package.json +++ b/package.json @@ -133,6 +133,7 @@ "g": "^2.0.1", "global": "^4.4.0", "hammerjs": "^2.0.8", + "howler": "^2.2.3", "http-server": "^14.1.1", "i": "^0.3.7", "ionic-angular": "^3.9.10", From 6f9333ac31a4eb20b6f6e75ae0047e069dd0d232 Mon Sep 17 00:00:00 2001 From: Evandre Da Silva Date: Fri, 1 Jul 2022 14:40:57 +0100 Subject: [PATCH 3/5] add package.json --- package.json | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 0ab3c3b17..ff5a8d997 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@awesome-cordova-plugins/multiple-document-picker": "^5.40.0", "@byteowls/capacitor-filesharer": "^3.0.0", "@capacitor-community/camera-preview": "^1.2.1", - "@capacitor/android": "3.6.0", + "@capacitor/android": "3.3.3", "@capacitor/app": "^1.0.5", "@capacitor/browser": "1.0.6", "@capacitor/camera": "^1.2.0", @@ -110,7 +110,7 @@ "capacitor-voice-recorder": "^2.0.0", "capacitor2-file-picker": "^1.0.0", "ci": "^2.1.1", - "cordova": "^11.0.0", + "cordova": "^10.0.0", "cordova-plugin-crop": "^0.4.0", "cordova-plugin-dbcopy": "git+https://github.com/an-rahulpandey/cordova-plugin-dbcopy.git", "cordova-plugin-document-viewer": "^1.0.0", @@ -129,12 +129,11 @@ "dotenv": "^10.0.0", "duration": "^0.2.2", "faker": "^5.5.3", - "firebase": "^9.8.4", + "firebase": "^9.3.0", "g": "^2.0.1", "global": "^4.4.0", "hammerjs": "^2.0.8", - "howler": "^2.2.3", - "http-server": "^14.1.1", + "http-server": "^0.12.3", "i": "^0.3.7", "ionic-angular": "^3.9.10", "ionic-image-loader": "^6.3.3", @@ -146,7 +145,7 @@ "jest-puppeteer": "^5.0.4", "jetifier": "^1.6.8", "lite-server": "^2.6.1", - "moment": "^2.29.3", + "moment": "^2.29.1", "ng-lazyload-image": "^9.1.2", "ng2-pdf-viewer": "^3.0.8", "ngx-cookie-service": "^12.0.3", @@ -157,11 +156,11 @@ "ngx-socket-io": "^3.2.0", "pdfjs": "^2.4.6", "pdfjs-dist": "^2.9.359", - "puppeteer": "^15.1.1", + "puppeteer": "^10.1.0", "rocket.chat.realtime.api.rxjs": "^2.1.1", "rxjs": "~6.6.3", "rxjs-compat": "^6.6.7", - "sharp": "^0.30.7", + "sharp": "^0.29.1", "socket.io-client": "^2.3.0", "ts-jest": "^27.0.3", "tslib": "^2.0.0", @@ -177,15 +176,15 @@ "@angular/compiler-cli": "^12.1.2", "@angular/language-service": "^12.1.2", "@capacitor/cli": "^3.3.2", - "@ionic/angular-toolkit": "^6.1.0", + "@ionic/angular-toolkit": "^4.0.0", "@ionic/lab": "3.1.7", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", "@types/jest": "^26.0.24", "@types/node": "^12.11.1", - "codelyzer": "^0.0.28", + "codelyzer": "^6.0.0", "com-sarriaroman-photoviewer": "^1.2.5", - "cordova-android": "^10.1.2", + "cordova-android": "^5.0.0", "cordova-android-support-gradle-release": "^3.0.1", "cordova-browser": "^6.0.0", "cordova-plugin-androidx": "^3.0.0", @@ -205,7 +204,7 @@ "jasmine-spec-reporter": "~5.0.0", "jest": "^27.0.6", "jest-preset-angular": "^9.0.4", - "karma": "^6.3.20", + "karma": "~6.3.4", "karma-chrome-launcher": "~3.1.0", "karma-coverage-istanbul-reporter": "~3.0.2", "karma-jasmine": "~4.0.0", From f27f4a36bd6013490e5ce8ee113f1b4da0925c18 Mon Sep 17 00:00:00 2001 From: Evandre Da Silva Date: Fri, 1 Jul 2022 15:56:02 +0100 Subject: [PATCH 4/5] update version of dependecies --- package.json | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index ff5a8d997..0ab3c3b17 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@awesome-cordova-plugins/multiple-document-picker": "^5.40.0", "@byteowls/capacitor-filesharer": "^3.0.0", "@capacitor-community/camera-preview": "^1.2.1", - "@capacitor/android": "3.3.3", + "@capacitor/android": "3.6.0", "@capacitor/app": "^1.0.5", "@capacitor/browser": "1.0.6", "@capacitor/camera": "^1.2.0", @@ -110,7 +110,7 @@ "capacitor-voice-recorder": "^2.0.0", "capacitor2-file-picker": "^1.0.0", "ci": "^2.1.1", - "cordova": "^10.0.0", + "cordova": "^11.0.0", "cordova-plugin-crop": "^0.4.0", "cordova-plugin-dbcopy": "git+https://github.com/an-rahulpandey/cordova-plugin-dbcopy.git", "cordova-plugin-document-viewer": "^1.0.0", @@ -129,11 +129,12 @@ "dotenv": "^10.0.0", "duration": "^0.2.2", "faker": "^5.5.3", - "firebase": "^9.3.0", + "firebase": "^9.8.4", "g": "^2.0.1", "global": "^4.4.0", "hammerjs": "^2.0.8", - "http-server": "^0.12.3", + "howler": "^2.2.3", + "http-server": "^14.1.1", "i": "^0.3.7", "ionic-angular": "^3.9.10", "ionic-image-loader": "^6.3.3", @@ -145,7 +146,7 @@ "jest-puppeteer": "^5.0.4", "jetifier": "^1.6.8", "lite-server": "^2.6.1", - "moment": "^2.29.1", + "moment": "^2.29.3", "ng-lazyload-image": "^9.1.2", "ng2-pdf-viewer": "^3.0.8", "ngx-cookie-service": "^12.0.3", @@ -156,11 +157,11 @@ "ngx-socket-io": "^3.2.0", "pdfjs": "^2.4.6", "pdfjs-dist": "^2.9.359", - "puppeteer": "^10.1.0", + "puppeteer": "^15.1.1", "rocket.chat.realtime.api.rxjs": "^2.1.1", "rxjs": "~6.6.3", "rxjs-compat": "^6.6.7", - "sharp": "^0.29.1", + "sharp": "^0.30.7", "socket.io-client": "^2.3.0", "ts-jest": "^27.0.3", "tslib": "^2.0.0", @@ -176,15 +177,15 @@ "@angular/compiler-cli": "^12.1.2", "@angular/language-service": "^12.1.2", "@capacitor/cli": "^3.3.2", - "@ionic/angular-toolkit": "^4.0.0", + "@ionic/angular-toolkit": "^6.1.0", "@ionic/lab": "3.1.7", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", "@types/jest": "^26.0.24", "@types/node": "^12.11.1", - "codelyzer": "^6.0.0", + "codelyzer": "^0.0.28", "com-sarriaroman-photoviewer": "^1.2.5", - "cordova-android": "^5.0.0", + "cordova-android": "^10.1.2", "cordova-android-support-gradle-release": "^3.0.1", "cordova-browser": "^6.0.0", "cordova-plugin-androidx": "^3.0.0", @@ -204,7 +205,7 @@ "jasmine-spec-reporter": "~5.0.0", "jest": "^27.0.6", "jest-preset-angular": "^9.0.4", - "karma": "~6.3.4", + "karma": "^6.3.20", "karma-chrome-launcher": "~3.1.0", "karma-coverage-istanbul-reporter": "~3.0.2", "karma-jasmine": "~4.0.0", From b18163c98cbb8744060c95132a418d0a3117f3c7 Mon Sep 17 00:00:00 2001 From: Evandre Da Silva Date: Fri, 1 Jul 2022 16:19:47 +0100 Subject: [PATCH 5/5] workaround for typescript version --- dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/dockerfile b/dockerfile index 50b0ed4d3..719543f90 100644 --- a/dockerfile +++ b/dockerfile @@ -4,6 +4,7 @@ COPY ./package*.json /app/ RUN npm config set unsafe-perm true RUN npm install -g ionic RUN npm config set legacy-peer-deps true +RUN npm i -D typescript@4.3.5 RUN npm install --save --legacy-peer-deps COPY ./ /app/ RUN ionic build --prod