Chore/fix UI components dynamic export (#2936)

apps/fourwings-explorer/features/map/map-sources.hooks.ts

@@ -5,9 +5,9 @@ import {
   DEFAULT_CONTEXT_SOURCE_LAYER,
   ExtendedStyle,
   HeatmapLayerMeta,
+  isMergedAnimatedGenerator,
   TEMPORALGRID_SOURCE_LAYER_INTERACTIVE,
 } from '@globalfishingwatch/layer-composer'
-import { isMergedAnimatedGenerator } from '@globalfishingwatch/dataviews-client/resolve-dataviews-generators'
 import { useMemoCompare } from '@globalfishingwatch/react-hooks'
 import { TimeseriesFeatureProps } from '@globalfishingwatch/fourwings-aggregate'
 import {

apps/vessel-history/features/dataviews/dataviews.selectors.ts

@@ -9,11 +9,11 @@ import {
   getDatasetConfigsByDatasetType,
   _getLegacyResources,
 } from '@globalfishingwatch/dataviews-client'
-import { getGeneratorConfig } from '@globalfishingwatch/dataviews-client/resolve-dataviews-generators'
 import {
   BasemapGeneratorConfig,
   BasemapType,
   GeneratorType,
+  getGeneratorConfig,
 } from '@globalfishingwatch/layer-composer'
 import { AsyncReducerStatus } from 'utils/async-slice'
 import { selectDatasets, selectDatasetsStatus } from 'features/datasets/datasets.slice'

apps/vessel-history/features/map/map.selectors.ts

@@ -3,8 +3,11 @@ import { GFWApiClient } from 'http-client/http-client'
 import { ApiEvent } from '@globalfishingwatch/api-types'
 import { SymbolLayerSpecification } from '@globalfishingwatch/maplibre-gl'
 import { UrlDataviewInstance } from '@globalfishingwatch/dataviews-client'
-import { getDataviewsGeneratorConfigs } from '@globalfishingwatch/dataviews-client/resolve-dataviews-generators'
-import { GeneratorType, GlGeneratorConfig } from '@globalfishingwatch/layer-composer'
+import {
+  GeneratorType,
+  getDataviewsGeneratorConfigs,
+  GlGeneratorConfig,
+} from '@globalfishingwatch/layer-composer'
 import {
   selectDataviewsForResourceQuerying,
   selectDefaultBasemapGenerator,

libs/api-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globalfishingwatch/api-client",
-  "version": "6.0.3",
+  "version": "6.0.5",
   "description": "",
   "author": "satellitestudio <[email protected]>",
   "homepage": "https://github.com/GlobalFishingWatch/frontend#readme",
@@ -12,8 +12,8 @@
   "main": "./index.cjs",
   "module": "./index.js",
   "dependencies": {
-    "@globalfishingwatch/api-types": "^8.0.1",
-    "@globalfishingwatch/pbf-decoders": "^3.0.3",
+    "@globalfishingwatch/api-types": "^8.0.3",
+    "@globalfishingwatch/pbf-decoders": "^3.0.5",
     "file-saver": "2.x",
     "lodash": "4.x",
     "react": "18.x"

libs/api-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globalfishingwatch/api-types",
-  "version": "8.0.1",
+  "version": "8.0.3",
   "description": "Typescript definitions for API responses",
   "author": "satellitestudio <[email protected]>",
   "homepage": "https://github.com/GlobalFishingWatch/frontend#readme",

libs/data-transforms/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@globalfishingwatch/data-transforms",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "license": "MIT",
   "description": "Utils to decode various data formats",
   "main": "./index.cjs",
   "module": "./index.js",
   "dependencies": {
-    "@globalfishingwatch/api-types": "^8.0.1",
+    "@globalfishingwatch/api-types": "^8.0.3",
     "@tmcw/togeojson": "5.x",
     "@turf/bbox": "7.x",
     "@turf/helpers": "7.x",

libs/datasets-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globalfishingwatch/datasets-client",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "",
   "homepage": "https://github.com/GlobalFishingWatch/frontend#readme",
   "license": "MIT",
@@ -11,7 +11,7 @@
     "url": "git+https://github.com/GlobalFishingWatch/frontend.git"
   },
   "dependencies": {
-    "@globalfishingwatch/api-types": "^8.0.1",
+    "@globalfishingwatch/api-types": "^8.0.3",
     "d3-scale": "4.x"
   }
 }

libs/dataviews-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globalfishingwatch/dataviews-client",
-  "version": "17.0.1",
+  "version": "17.0.7",
   "description": "",
   "homepage": "https://github.com/GlobalFishingWatch/frontend#readme",
   "license": "MIT",
@@ -11,12 +11,11 @@
     "url": "git+https://github.com/GlobalFishingWatch/frontend.git"
   },
   "dependencies": {
-    "@globalfishingwatch/api-client": "^6.0.3",
-    "@globalfishingwatch/api-types": "^8.0.1",
-    "@globalfishingwatch/data-transforms": "^3.0.3",
-    "@globalfishingwatch/datasets-client": "^3.0.1",
-    "@globalfishingwatch/fourwings-aggregate": "^6.0.1",
-    "@globalfishingwatch/layer-composer": "^12.0.1",
+    "@globalfishingwatch/api-client": "^6.0.5",
+    "@globalfishingwatch/api-types": "^8.0.3",
+    "@globalfishingwatch/data-transforms": "^3.0.5",
+    "@globalfishingwatch/datasets-client": "^3.0.3",
+    "@globalfishingwatch/fourwings-aggregate": "^6.0.3",
     "@reduxjs/toolkit": "*",
     "geojson": "0.x",
     "lodash": "4.x",

libs/dataviews-client/src/index.ts

@@ -1,4 +1,3 @@
 export * from './resolve-dataviews'
-// export * from './resolve-dataviews-generators'
 export * from './resources'
 export * from './url-workspace'

libs/dataviews-client/src/url-workspace/migrations.config.ts

@@ -26,19 +26,21 @@ export const AIS_LEGACY_FISHING_EFFORT_DATASETS_DICT = {
 }
 
 export const AIS_LEGACY_VESSELS_DATASETS_DICT = {
-  'public-global-other-vessels:v20201001': 'public-global-vessel-identity:v20231026',
-  'public-global-carrier-vessels:v20201001': 'public-global-vessel-identity:v20231026',
-  'public-global-all-vessels:v20201001': 'public-global-vessel-identity:v20231026',
-  'public-global-fishing-vessels:v20201001': 'public-global-vessel-identity:v20231026',
-  'public-global-support-vessels:v20201001': 'public-global-vessel-identity:v20231026',
-  'private-global-other-vessels:v20201001': 'public-global-vessel-identity:v20231026',
+  'public-global-other-vessels:v20201001': 'public-global-vessel-identity:v3.0',
+  'public-global-carrier-vessels:v20201001': 'public-global-vessel-identity:v3.0',
+  'public-global-all-vessels:v20201001': 'public-global-vessel-identity:v3.0',
+  'public-global-fishing-vessels:v20201001': 'public-global-vessel-identity:v3.0',
+  'public-global-support-vessels:v20201001': 'public-global-vessel-identity:v3.0',
+  'private-global-other-vessels:v20201001': 'public-global-vessel-identity:v3.0',
   'public-global-carriers-tracks:v20201001': 'public-global-all-tracks:v20231026',
   'public-global-fishing-longliner-tracks:v20201001': 'public-global-all-tracks:v20231026',
   'public-global-support-tracks:v20201001': 'public-global-all-tracks:v20231026',
   'public-global-fishing-tracks:v20201001': 'public-global-all-tracks:v20231026',
   'public-global-presence-tracks:v20201001': 'public-global-all-tracks:v20231026',
   'public-global-all-tracks:v20201001': 'public-global-all-tracks:v20231026',
   'private-global-presence-tracks:v20201001': 'public-global-all-tracks:v20231026',
+  'public-global-vessel-identity:v20231026': 'public-global-vessel-identity:v3.0',
+  'public-global-all-tracks:v20231026': 'public-global-all-tracks:v3.0',
 }
 
 export const VMS_LEGACY_VESSELS_DATASETS_DICT = {

libs/deck-layer-composer/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@globalfishingwatch/deck-layer-composer",
-  "version": "0.1.1",
+  "version": "0.1.13",
   "main": "./index.cjs",
   "module": "./index.js",
   "dependencies": {
-    "@globalfishingwatch/api-client": "^6.0.3",
-    "@globalfishingwatch/api-types": "^8.0.1",
-    "@globalfishingwatch/deck-layers": "^0.1.1",
+    "@globalfishingwatch/api-client": "^6.0.5",
+    "@globalfishingwatch/api-types": "^8.0.3",
+    "@globalfishingwatch/deck-layers": "^0.1.7",
     "@globalfishingwatch/dataviews-client": "^16.x",
-    "@globalfishingwatch/layer-composer": "^12.0.1",
+    "@globalfishingwatch/layer-composer": "^12.0.3",
     "jotai": "2.x",
     "lodash": "4.x",
     "luxon": "3.x",

libs/deck-layers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globalfishingwatch/deck-layers",
-  "version": "0.1.1",
+  "version": "0.1.7",
   "main": "./index.cjs",
   "module": "./index.js",
   "dependencies": {
@@ -13,9 +13,9 @@
     "@deck.gl/mesh-layers": "^9.0.35",
     "@deck.gl/react": "^9.0.35",
     "@math.gl/core": "4.x",
-    "@globalfishingwatch/api-client": "^6.0.3",
-    "@globalfishingwatch/api-types": "^8.0.1",
-    "@globalfishingwatch/deck-loaders": "^0.1.1",
+    "@globalfishingwatch/api-client": "^6.0.5",
+    "@globalfishingwatch/api-types": "^8.0.3",
+    "@globalfishingwatch/deck-loaders": "^0.1.3",
     "@globalfishingwatch/dataviews-client": "^16.x",
     "@loaders.gl/core": "4.x",
     "@loaders.gl/mvt": "4.x",

libs/deck-loaders/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@globalfishingwatch/deck-loaders",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "main": "./index.cjs",
   "module": "./index.js",
   "dependencies": {
-    "@globalfishingwatch/api-types": "^8.0.1",
+    "@globalfishingwatch/api-types": "^8.0.3",
     "@loaders.gl/loader-utils": "^4.x",
     "luxon": "3.x",
     "pbf": "3.x"

libs/features-aggregate/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@globalfishingwatch/features-aggregate",
-  "version": "2.0.2",
+  "version": "2.0.8",
   "main": "./index.cjs",
   "module": "./index.js",
   "dependencies": {
-    "@globalfishingwatch/layer-composer": "^12.0.1",
-    "@globalfishingwatch/fourwings-aggregate": "^6.0.1",
+    "@globalfishingwatch/layer-composer": "^12.0.3",
+    "@globalfishingwatch/fourwings-aggregate": "^6.0.3",
     "lodash": "4.x",
     "luxon": "3.x"
   }

libs/fourwings-aggregate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globalfishingwatch/fourwings-aggregate",
-  "version": "6.0.1",
+  "version": "6.0.3",
   "description": "Logic to turn fourwings tiles or cells into meaningful values for the frontend",
   "main": "./index.cjs",
   "module": "./index.js",

libs/layer-composer/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@globalfishingwatch/layer-composer",
-  "version": "12.0.1",
+  "version": "12.0.3",
   "description": "",
   "author": "satellitestudio <[email protected]>",
   "homepage": "https://github.com/GlobalFishingWatch/frontend#readme",
   "main": "./index.cjs",
   "module": "./index.js",
   "dependencies": {
-    "@globalfishingwatch/api-types": "^8.0.1",
-    "@globalfishingwatch/data-transforms": "^3.0.3",
-    "@globalfishingwatch/fourwings-aggregate": "^6.0.1",
+    "@globalfishingwatch/api-types": "^8.0.3",
+    "@globalfishingwatch/data-transforms": "^3.0.5",
+    "@globalfishingwatch/fourwings-aggregate": "^6.0.3",
     "@globalfishingwatch/maplibre-gl": "^3.5.1-gfw.2",
     "@turf/great-circle": "7.x",
     "@turf/length": "7.x",

libs/dataviews-client/src/resolve-dataviews-generators.ts → libs/layer-composer/src/dataviews/resolve-dataviews-generators.ts

@@ -37,16 +37,11 @@ import {
   isActivityDataview,
   isDetectionsDataview,
   isTrackDataview,
+  pickTrackResource,
   resolveDataviewDatasetResource,
   resolveDataviewDatasetResources,
   UrlDataviewInstance,
-} from './resolve-dataviews'
-import { pickTrackResource } from './resources'
-import {
-  setGeneratorConfigCircleRadius,
-  setGeneratorConfigPolygonColor,
-  setGeneratorConfigTimeFilter,
-} from './dataviews.config'
+} from '@globalfishingwatch/dataviews-client'
 
 const MULTILAYER_SEPARATOR = '__'
 const MERGED_ACTIVITY_ANIMATED_HEATMAP_GENERATOR_ID = 'mergedActivityHeatmap'
@@ -628,3 +623,14 @@ export function getDataviewsGeneratorConfigs(
   })
   return generatorsConfig
 }
+function setGeneratorConfigCircleRadius(arg0: { dataset: Dataset; generator: any }) {
+  throw new Error('Function not implemented.')
+}
+
+function setGeneratorConfigTimeFilter(arg0: { dataset: Dataset; generator: any }) {
+  throw new Error('Function not implemented.')
+}
+
+function setGeneratorConfigPolygonColor(arg0: { dataset: Dataset; generator: any }) {
+  throw new Error('Function not implemented.')
+}

libs/layer-composer/src/index.ts

@@ -1,4 +1,5 @@
 export * from './config'
+export * from './dataviews/resolve-dataviews-generators'
 export * from './generators'
 export * from './generators/heatmap/util/time-chunks'
 export * from './generators/types'
@@ -8,4 +9,4 @@ export * from './transforms/sort/sort'
 export * from './types'
 export * from './react-hooks/use-layer-composer'
 export * from './react-hooks/use-map-interaction'
-export * from './react-hooks/use-map-legend'
+export * from './react-hooks/use-map-legend'

libs/ocean-areas/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globalfishingwatch/ocean-areas",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "main": "./index.cjs",
   "module": "./index.js",
   "scripts": {

libs/pbf-decoders/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globalfishingwatch/pbf-decoders",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "main": "./index.cjs",
   "module": "./index.js",
   "scripts": {

libs/react-hooks/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@globalfishingwatch/react-hooks",
-  "version": "17.0.1",
+  "version": "17.0.9",
   "description": "set of react hooks to easily use pure js libraries",
   "author": "satellitestudio <[email protected]>",
   "homepage": "https://github.com/GlobalFishingWatch/frontend#readme",
   "main": "./index.cjs",
   "module": "./index.js",
   "dependencies": {
-    "@globalfishingwatch/api-client": "^6.0.3",
-    "@globalfishingwatch/api-types": "^8.0.1",
+    "@globalfishingwatch/api-client": "^6.0.5",
+    "@globalfishingwatch/api-types": "^8.0.3",
     "@globalfishingwatch/dataviews-client": "^16.0.0",
-    "@globalfishingwatch/fourwings-aggregate": "^6.0.1",
-    "@globalfishingwatch/layer-composer": "^12.0.1",
+    "@globalfishingwatch/fourwings-aggregate": "^6.0.3",
+    "@globalfishingwatch/layer-composer": "^12.0.3",
     "@globalfishingwatch/maplibre-gl": "^3.5.1-gfw.2",
     "@mapbox/tilebelt": "1.x",
     "lodash": "4.x",

libs/timebar/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@globalfishingwatch/timebar",
-  "version": "5.0.2",
+  "version": "5.0.14",
   "description": "GFW timebar",
   "author": "satellitestudio <[email protected]>",
   "homepage": "https://github.com/GlobalFishingWatch/frontend#readme",
   "main": "./index.cjs",
   "module": "./index.js",
   "dependencies": {
-    "@globalfishingwatch/api-types": "^8.0.1",
-    "@globalfishingwatch/dataviews-client": "^17.0.1",
-    "@globalfishingwatch/deck-loaders": "^0.1.1",
-    "@globalfishingwatch/ui-components": "^14.0.7",
+    "@globalfishingwatch/api-types": "^8.0.3",
+    "@globalfishingwatch/dataviews-client": "^17.0.7",
+    "@globalfishingwatch/deck-loaders": "^0.1.3",
+    "@globalfishingwatch/ui-components": "^14.0.9",
     "classnames": "2.x",
     "d3-array": "3.x",
     "d3-scale": "4.x",

libs/ui-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globalfishingwatch/ui-components",
-  "version": "14.0.7",
+  "version": "14.0.9",
   "description": "Set of react components to consume on the gfw ecosystem",
   "author": "satellitestudio <[email protected]>",
   "homepage": "https://github.com/GlobalFishingWatch/frontend#readme",
@@ -15,7 +15,7 @@
   "main": "./index.cjs",
   "module": "./index.js",
   "dependencies": {
-    "@globalfishingwatch/api-types": "^8.0.1",
+    "@globalfishingwatch/api-types": "^8.0.3",
     "countryflag": "5.x",
     "d3-format": "3.x",
     "d3-geo": "3.x",

libs/ui-components/rollup.config.js

@@ -1,12 +1,13 @@
 const nrwlConfig = require('@nx/react/plugins/bundle-rollup')
 const svgr = require('@svgr/rollup')
+const dynamicImportVars = require('@rollup/plugin-dynamic-import-vars')
 const pkg = require('./package.json')
 
 module.exports = (config) => {
   nrwlConfig(config)
   return {
     ...config,
-    plugins: [...config.plugins, svgr()],
+    plugins: [...config.plugins, svgr(), dynamicImportVars()],
     external: Object.keys(pkg.dependencies || {}),
   }
 }