Merge pull request #176 from e-picsa/feat/capacitor-5-updates

Feat/core updates
e-picsa · Sep 18, 2023 · 4368c5d · 4368c5d
2 parents b52f5dd + 11981a2
commit 4368c5d
Show file tree

Hide file tree

Showing 130 changed files with 9,081 additions and 10,362 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,12 +1,12 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx", "simple-import-sort"],
+  "plugins": ["@nx", "simple-import-sort"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -34,12 +34,12 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript", "prettier"],
+      "extends": ["plugin:@nx/typescript", "prettier"],
       "rules": {}
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     }
   ]

diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
@@ -23,12 +23,30 @@ jobs:
       - uses: actions/checkout@v3
         with:
           lfs: true
-          ref: '${{github.event.inputs.build_branch}}'
-      - uses: actions/setup-node@v3
+      - name: Setup Node
+        uses: actions/setup-node@v3
         with:
-          node-version: '18'
-          cache: 'yarn'
-      - run: yarn install --immutable
+          node-version: 18.x
+      #############################################################################
+      #         Node Modules
+      # Manually restore any previous cache to speed install
+      # As immutable install will not change cache only save new cache if not hit
+      # Uses fine-grained methods from https://github.com/actions/cache
+      #############################################################################
+      - uses: actions/cache/restore@v3
+        id: cache
+        with:
+          path: ./.yarn/cache
+          key: ${{ runner.os }}-node-modules-yarn-v1-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-modules-yarn-v1-
+      - name: Install node modules
+        run: yarn install --immutable
+      - uses: actions/cache/save@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          path: ./.yarn/cache
+          key: ${{ runner.os }}-node-modules-yarn-v1-${{ hashFiles('yarn.lock') }}
       - name: Populate google-services.json
         env:
           GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -12,11 +12,30 @@ jobs:
       - uses: actions/checkout@v3
         with:
           lfs: true
-      - uses: actions/setup-node@v3
+      - name: Setup Node
+        uses: actions/setup-node@v3
         with:
-          node-version: '18'
-          cache: 'yarn'
-      - run: yarn install --immutable
+          node-version: 18.x
+      #############################################################################
+      #         Node Modules
+      # Manually restore any previous cache to speed install
+      # As immutable install will not change cache only save new cache if not hit
+      # Uses fine-grained methods from https://github.com/actions/cache
+      #############################################################################
+      - uses: actions/cache/restore@v3
+        id: cache
+        with:
+          path: ./.yarn/cache
+          key: ${{ runner.os }}-node-modules-yarn-v1-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-modules-yarn-v1-
+      - name: Install node modules
+        run: yarn install --immutable
+      - uses: actions/cache/save@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          path: ./.yarn/cache
+          key: ${{ runner.os }}-node-modules-yarn-v1-${{ hashFiles('yarn.lock') }}
       - run: yarn lint
       # - run: yarn nx test
       # Ensure can also build

diff --git a/.github/workflows/web-preview.yml b/.github/workflows/web-preview.yml
@@ -17,11 +17,30 @@ jobs:
       - uses: actions/checkout@v3
         with:
           lfs: true
-      - uses: actions/setup-node@v3
+      - name: Setup Node
+        uses: actions/setup-node@v3
         with:
-          node-version: '18'
-          cache: 'yarn'
-      - run: yarn install --immutable
+          node-version: 18.x
+      #############################################################################
+      #         Node Modules
+      # Manually restore any previous cache to speed install
+      # As immutable install will not change cache only save new cache if not hit
+      # Uses fine-grained methods from https://github.com/actions/cache
+      #############################################################################
+      - uses: actions/cache/restore@v3
+        id: cache
+        with:
+          path: ./.yarn/cache
+          key: ${{ runner.os }}-node-modules-yarn-v1-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-modules-yarn-v1-
+      - name: Install node modules
+        run: yarn install --immutable
+      - uses: actions/cache/save@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          path: ./.yarn/cache
+          key: ${{ runner.os }}-node-modules-yarn-v1-${{ hashFiles('yarn.lock') }}
       - run: yarn nx run picsa-apps-extension-app:build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:

diff --git a/.github/workflows/web-release.yml b/.github/workflows/web-release.yml
@@ -18,11 +18,30 @@ jobs:
       - uses: actions/checkout@v3
         with:
           lfs: true
-      - uses: actions/setup-node@v3
+      - name: Setup Node
+        uses: actions/setup-node@v3
         with:
-          node-version: '18'
-          cache: 'yarn'
-      - run: yarn install --immutable
+          node-version: 18.x
+      #############################################################################
+      #         Node Modules
+      # Manually restore any previous cache to speed install
+      # As immutable install will not change cache only save new cache if not hit
+      # Uses fine-grained methods from https://github.com/actions/cache
+      #############################################################################
+      - uses: actions/cache/restore@v3
+        id: cache
+        with:
+          path: ./.yarn/cache
+          key: ${{ runner.os }}-node-modules-yarn-v1-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-modules-yarn-v1-
+      - name: Install node modules
+        run: yarn install --immutable
+      - uses: actions/cache/save@v3
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          path: ./.yarn/cache
+          key: ${{ runner.os }}-node-modules-yarn-v1-${{ hashFiles('yarn.lock') }}
       - run: yarn nx run picsa-apps-extension-app:build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:

diff --git a/.gitignore b/.gitignore
@@ -64,7 +64,6 @@ libs/environments/firebase/config.prod.ts
 libs/features/map/tiles/assets-for-copy   
 libs/features/map/tiles/**/*.png
 
-releases/
 apps/extension-toolkit/www_sourcemaps
 
 .env

diff --git a/.yarn/releases/yarn-3.2.1.cjs b/.yarn/releases/yarn-3.2.1.cjs
diff --git a/.yarn/releases/yarn-3.6.3.cjs b/.yarn/releases/yarn-3.6.3.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,10 +1,11 @@
+checksumBehavior: update
+
 logFilters:
   - code: YN0060
     level: discard
   - code: YN0002
     level: discard
 
-yarnPath: .yarn/releases/yarn-3.2.1.cjs
 nodeLinker: node-modules
-# Avoid throwing error installing enketo/leaflet-draw (will not match checksum)
-checksumBehavior: update
+
+yarnPath: .yarn/releases/yarn-3.6.3.cjs
diff --git a/angular.json b/angular.json
diff --git a/apps/picsa-apps/content-dashboard-e2e/project.json b/apps/picsa-apps/content-dashboard-e2e/project.json
@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/picsa-apps/content-dashboard-e2e/cypress.json",
         "devServerTarget": "picsa-apps-content-dashboard:serve:development"
@@ -17,7 +17,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/picsa-apps/content-dashboard-e2e/**/*.{js,ts}"]

diff --git a/apps/picsa-apps/content-dashboard/.eslintrc.json b/apps/picsa-apps/content-dashboard/.eslintrc.json
@@ -4,7 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -26,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

diff --git a/apps/picsa-apps/content-dashboard/jest.config.ts b/apps/picsa-apps/content-dashboard/jest.config.ts
@@ -3,15 +3,16 @@ export default {
   displayName: 'picsa-apps-content-dashboard',
   preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../../coverage/apps/picsa-apps/content-dashboard',
   transform: {
-    '^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+\\.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
   snapshotSerializers: [

diff --git a/apps/picsa-apps/content-dashboard/project.json b/apps/picsa-apps/content-dashboard/project.json
@@ -66,13 +66,13 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": ["apps/picsa-apps/content-dashboard/**/*.ts", "apps/picsa-apps/content-dashboard/**/*.html"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/picsa-apps/content-dashboard"],
       "options": {
         "jestConfig": "apps/picsa-apps/content-dashboard/jest.config.ts",

diff --git a/apps/picsa-apps/extension-app-e2e/project.json b/apps/picsa-apps/extension-app-e2e/project.json
@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/picsa-apps/extension-app-e2e/cypress.json",
         "devServerTarget": "picsa-apps-extension-app:serve:development"
@@ -17,7 +17,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/picsa-apps/extension-app-e2e/**/*.{js,ts}"]

diff --git a/apps/picsa-apps/extension-app-native/android/.idea/misc.xml b/apps/picsa-apps/extension-app-native/android/.idea/misc.xml
diff --git a/apps/picsa-apps/extension-app-native/android/app/build.gradle b/apps/picsa-apps/extension-app-native/android/app/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "io.picsa.extension"
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "io.picsa.extension"
@@ -39,17 +40,21 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation project(':capacitor-cordova-android-plugins')
+
+    implementation(platform("com.google.firebase:firebase-bom:32.3.1"))
 }
 
 apply from: 'capacitor.build.gradle'
 
+
 try {
     def servicesJSON = file('google-services.json')
     if (servicesJSON.text) {
         apply plugin: 'com.google.gms.google-services'
+        apply plugin: 'com.google.firebase.crashlytics'
         apply plugin: 'com.google.firebase.firebase-perf' // Firebase Performance Monitoring plugin
-        apply plugin: 'com.google.firebase.crashlytics' // Firebase Crashlytics plugin
     }
 } catch(Exception e) {
     logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
+    throw e
 }
diff --git a/apps/picsa-apps/extension-app-native/android/app/capacitor.build.gradle b/apps/picsa-apps/extension-app-native/android/app/capacitor.build.gradle
@@ -2,8 +2,8 @@
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_11
-      targetCompatibility JavaVersion.VERSION_11
+      sourceCompatibility JavaVersion.VERSION_17
+      targetCompatibility JavaVersion.VERSION_17
   }
 }