Merge pull request #2444 from GlobalFishingWatch/chore/update-depende…

…ncies Update dependencies
GlobalFishingWatch · Jan 10, 2024 · 4407cf9 · 4407cf9
2 parents 54d1187 + 3b87293
commit 4407cf9
Show file tree

Hide file tree

Showing 253 changed files with 14,741 additions and 15,627 deletions.
diff --git a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
diff --git a/.yarn/releases/yarn-3.6.1.cjs b/.yarn/releases/yarn-3.6.1.cjs
diff --git a/.yarn/releases/yarn-4.0.2.cjs b/.yarn/releases/yarn-4.0.2.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -2,10 +2,6 @@ cacheFolder: .yarn/cache
 
 nodeLinker: node-modules
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: '@yarnpkg/plugin-interactive-tools'
-
 supportedArchitectures:
   cpu:
     - x64
@@ -14,4 +10,4 @@ supportedArchitectures:
     - darwin
     - linux
 
-yarnPath: .yarn/releases/yarn-3.6.1.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs
diff --git a/apps/api-portal/cloudbuild.yaml b/apps/api-portal/cloudbuild.yaml
@@ -12,7 +12,7 @@ steps:
     script: |
       if [ ! -d "node_modules" ]; then
         apk add git
-        yarn set version 3.6.1
+        yarn set version 4.0.2
         yarn -v
         yarn install --immutable
       fi
@@ -43,13 +43,13 @@ steps:
       - 'NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID=$_NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID'
       - 'NEXT_PUBLIC_URL=$_NEXT_PUBLIC_URL'
     script: |
-        yarn -v
-        yarn nx run api-portal:build --parallel
+      yarn -v
+      yarn nx run api-portal:build --parallel
 
-        raw_tag="$COMMIT_SHA;$NEXT_PUBLIC_API_GATEWAY;$NEXT_PUBLIC_GOOGLE_MEASUREMENT_ID;$NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID;$NEXT_PUBLIC_URL"
-        tag=`echo $raw_tag | sha256sum | cut -c1-64`
-        echo $tag > image-tag
-        echo Docker Image Tag: $tag
+      raw_tag="$COMMIT_SHA;$NEXT_PUBLIC_API_GATEWAY;$NEXT_PUBLIC_GOOGLE_MEASUREMENT_ID;$NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID;$NEXT_PUBLIC_URL"
+      tag=`echo $raw_tag | sha256sum | cut -c1-64`
+      echo $tag > image-tag
+      echo Docker Image Tag: $tag
 
   - name: 'gcr.io/kaniko-project/executor:debug'
     id: 'build-image'

diff --git a/apps/api-portal/package.json b/apps/api-portal/package.json
@@ -14,31 +14,27 @@
     "analyze": "source-map-explorer 'build/static/js/*.js'"
   },
   "dependencies": {
-    "classnames": "2.3.2",
+    "classnames": "2.5.1",
     "lodash": "4.17.21",
-    "luxon": "^3.4.3",
+    "luxon": "^3.4.4",
     "qs": "^6.11.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-ga4": "2.1.0",
     "react-query": "3.39.3",
     "recoil": "0.7.7",
-    "typescript": "5.2.2"
+    "typescript": "5.3.3"
   },
   "devDependencies": {
-    "@types/lodash": "4.14.199",
-    "@types/luxon": "^3.3.2",
-    "@types/node": "20.7.1",
-    "depcheck": "1.4.6",
-    "prettier": "3.0.3",
+    "@types/lodash": "4.14.202",
+    "@types/luxon": "^3.3.8",
+    "@types/node": "20.10.6",
+    "depcheck": "1.4.7",
+    "prettier": "3.1.1",
     "prop-types": "^15.8.1",
     "react-test-renderer": "18.2.0",
     "serve": "14.2.1",
-    "source-map-explorer": "2.5.3",
-    "stylelint": "^15.10.3",
-    "stylelint-config-css-modules": "^4.3.0",
-    "stylelint-config-prettier": "^9.0.5",
-    "stylelint-config-standard": "^34.0.0"
+    "source-map-explorer": "2.5.3"
   },
   "browserslist": [
     ">0.1%",

diff --git a/apps/api-portal/project.json b/apps/api-portal/project.json
@@ -51,17 +51,13 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/api-portal/**/*.{ts,tsx,js,jsx}"]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/api-portal"],
       "options": {
-        "jestConfig": "apps/api-portal/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/api-portal/jest.config.ts"
       }
     }
   },

diff --git a/apps/deck-playground/cloudbuild.yaml b/apps/deck-playground/cloudbuild.yaml
@@ -12,7 +12,7 @@ steps:
     script: |
       if [ ! -d "node_modules" ]; then
         apk add git
-        yarn set version 3.6.1
+        yarn set version 4.0.2
         yarn -v
         yarn install --immutable
       fi

diff --git a/apps/deck-playground/package.json b/apps/deck-playground/package.json
@@ -17,19 +17,19 @@
     "@nebula.gl/edit-modes": "^1.0.4",
     "@nebula.gl/layers": "^1.0.4",
     "@recoiljs/refine": "^0.1.1",
-    "@tanstack/react-query": "^4.35.3",
-    "@testing-library/jest-dom": "^5.16.5",
+    "@tanstack/react-query": "^4.36.1",
+    "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@turf/bbox-polygon": "^6.5.0",
     "@turf/boolean-point-in-polygon": "^6.5.0",
     "apache-arrow": "^13.0.0",
-    "classnames": "2.3.2",
-    "d3-scale": "^3.3.0",
+    "classnames": "2.5.1",
+    "d3-scale": "^4.0.2",
     "jotai": "^1.13.1",
     "lodash": "4.17.21",
-    "luxon": "^3.4.3",
+    "luxon": "^3.4.4",
     "next-react-memory-stats": "^1.0.2",
-    "parquet-wasm": "0.5.0-alpha.1",
+    "parquet-wasm": "0.5.0",
     "qs": "^6.11.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -38,25 +38,21 @@
     "recoil-sync": "^0.2.0",
     "recoil-sync-next": "^0.0.5",
     "simple-statistics": "^7.8.3",
-    "typescript": "5.2.2"
+    "typescript": "5.3.3"
   },
   "devDependencies": {
     "@globalfishingwatch/linting": "2.0.2",
-    "@next/eslint-plugin-next": "13.5.3",
+    "@next/eslint-plugin-next": "14.0.4",
     "@testing-library/react": "12.1.5",
-    "@types/lodash": "4.14.199",
-    "@types/luxon": "^3.3.2",
-    "@types/node": "20.7.1",
-    "@types/qs": "6.9.8",
-    "depcheck": "1.4.6",
-    "prettier": "3.0.3",
+    "@types/lodash": "4.14.202",
+    "@types/luxon": "^3.3.8",
+    "@types/node": "20.10.6",
+    "@types/qs": "6.9.11",
+    "depcheck": "1.4.7",
+    "prettier": "3.1.1",
     "react-test-renderer": "18.2.0",
     "serve": "14.2.1",
-    "source-map-explorer": "2.5.3",
-    "stylelint": "^15.10.3",
-    "stylelint-config-css-modules": "^4.3.0",
-    "stylelint-config-prettier": "^9.0.5",
-    "stylelint-config-standard": "^34.0.0"
+    "source-map-explorer": "2.5.3"
   },
   "browserslist": [
     ">0.1%",

diff --git a/apps/deck-playground/project.json b/apps/deck-playground/project.json
@@ -7,28 +7,11 @@
     "deploy": {
       "executor": "nx:run-commands",
       "options": {
-        "commands": ["nx build deck-playground --parallel", "nx docker-prepare deck-playground"],
+        "commands": ["nx build deck-playground --parallel"],
         "parallel": false
       }
     },
-    "docker-prepare": {
-      "executor": "nx:run-commands",
-      "outputs": [],
-      "options": {
-        "commands": [
-          "cp config/entrypoint.sh dist/apps/deck-playground",
-          "cp apps/deck-playground/nginx.conf dist/apps/deck-playground"
-        ]
-      }
-    },
-    "zip": {
-      "executor": "nx:run-commands",
-      "outputs": [],
-      "options": {
-        "commands": ["zip -r dist.zip dist/apps/deck-playground/exported/*"]
-      }
-    },
-    "compile": {
+    "build": {
       "executor": "@nx/next:build",
       "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "production",
@@ -39,67 +22,42 @@
         "production": {}
       }
     },
-    "clean-locales": {
+    "start": {
       "executor": "nx:run-commands",
-      "outputs": [],
       "options": {
-        "commands": ["rm -rf dist/apps/deck-playground/public/locales"]
+        "commands": ["nx serve deck-playground --hostname=0.0.0.0"],
+        "parallel": true
       }
     },
-    "start": {
+    "serve": {
       "executor": "@nx/next:server",
       "options": {
-        "buildTarget": "deck-playground:compile",
+        "buildTarget": "deck-playground:build",
         "dev": true,
-        "port": 3000
+        "port": 3003
       },
       "configurations": {
         "production": {
-          "buildTarget": "deck-playground:compile:production",
+          "buildTarget": "deck-playground:build:production",
           "dev": false
         }
       }
     },
-    "build": {
+    "export": {
       "executor": "@nx/next:export",
       "options": {
-        "buildTarget": "deck-playground:compile:production"
-      }
-    },
-    "rename-export": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "rm -rf dist/apps/deck-playground/map",
-          "mv dist/apps/deck-playground/exported dist/apps/deck-playground/map"
-        ],
-        "parallel": false
+        "buildTarget": "deck-playground:build:production"
       }
     },
-    "serve:export": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "nx build deck-playground --parallel",
-          "nx rename-export deck-playground",
-          "serve dist/apps/deck-playground"
-        ],
-        "parallel": false
-      }
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/deck-playground"],
       "options": {
-        "jestConfig": "apps/deck-playground/jest.config.ts",
-        "passWithNoTests": true
-      }
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/deck-playground/**/*.{ts,tsx,js,jsx}"]
+        "jestConfig": "apps/deck-playground/jest.config.ts"
       }
     }
   },

diff --git a/apps/fishing-map-e2e/project.json b/apps/fishing-map-e2e/project.json
@@ -88,10 +88,7 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/fishing-map-e2e/**/*.{js,ts}"]
-      }
+      "outputs": ["{options.outputFile}"]
     }
   },
   "tags": [],

diff --git a/apps/fishing-map/Dockerfile b/apps/fishing-map/Dockerfile
@@ -3,7 +3,7 @@
 #################################################################################
 
 # Production image, copy all the files and run next
-FROM node:18-alpine AS production
+FROM node:21-alpine AS production
 WORKDIR /app
 
 ARG APP_NAME=fishing-map

diff --git a/apps/fishing-map/cloudbuild.yaml b/apps/fishing-map/cloudbuild.yaml
@@ -11,7 +11,7 @@ steps:
 
   - id: 'generate-cypress-lock'
     waitFor: ['restore_cache']
-    name: node:18
+    name: node:21
     script: |
       if [ -d "node_modules" ]; then
         yarn info cypress version > cypress.lock
@@ -31,11 +31,11 @@ steps:
 
   - id: 'install-yarn'
     waitFor: ['restore_cache']
-    name: node:18
+    name: node:21
     script: |
       if [ ! -d "node_modules" ]; then
         apk add git
-        yarn set version 3.6.1
+        yarn set version 4.0.2
         yarn -v
         CYPRESS_CACHE_FOLDER=.cypress-cache yarn install --immutable
         yarn info cypress version > cypress.lock
@@ -69,7 +69,7 @@ steps:
 
   - id: 'build-app'
     waitFor: ['install-yarn']
-    name: node:18
+    name: node:21
     entrypoint: yarn
     args: ['nx', 'build', 'fishing-map', '--parallel']
     env:
@@ -146,8 +146,8 @@ steps:
            --project $_RUN_PROJECT \
            --platform managed \
            --region $_RUN_REGION \
-           --format 'value(status.url)'` > app_url 
-           printf %s "/map" >> app_url 
+           --format 'value(status.url)'` > app_url
+           printf %s "/map" >> app_url
         fi
 
   - id: 'i18n-labels publish stable'

diff --git a/apps/fishing-map/data/config.ts b/apps/fishing-map/data/config.ts
@@ -14,6 +14,7 @@ export const PUBLIC_WORKSPACE_ENV = process.env.NEXT_PUBLIC_WORKSPACE_ENV
 export const IS_PRODUCTION_WORKSPACE_ENV =
   PUBLIC_WORKSPACE_ENV === 'production' || PUBLIC_WORKSPACE_ENV === 'staging'
 export const IS_PRODUCTION = IS_PRODUCTION_WORKSPACE_ENV || IS_PRODUCTION_BUILD
+export const PATH_BASENAME = process.env.NEXT_PUBLIC_URL || (IS_PRODUCTION ? '/map' : '')
 
 export const REPORT_DAYS_LIMIT =
   typeof process.env.NEXT_PUBLIC_REPORT_DAYS_LIMIT !== 'undefined'
@@ -60,6 +61,12 @@ export const DEFAULT_VIEWPORT = {
   longitude: 26,
 }
 
+export const DEFAULT_WORKSPACE_LIST_VIEWPORT = {
+  latitude: 10,
+  longitude: -90,
+  zoom: 1,
+}
+
 export const DEFAULT_TIME_RANGE = {
   start: getUTCDateTime(LAST_DATA_UPDATE)?.minus({ months: 3 }).toISO() as string,
   end: LAST_DATA_UPDATE,