Some import fixes

Signed-off-by: Daria Terekhova <daria.terekhova@actionengine.com>
keplergl · Sep 2, 2022 · c11286f · c11286f
1 parent 6dbe2d4
commit c11286f
Show file tree

Hide file tree

Showing 41 changed files with 60 additions and 97 deletions.
diff --git a/src/actions/src/provider-actions.ts b/src/actions/src/provider-actions.ts
@@ -21,7 +21,7 @@
 import {createAction} from '@reduxjs/toolkit';
 import {ACTION_PREFIX} from './action-types';
 import {ExportFileOptions, ExportFileToCloudPayload, OnErrorCallBack, OnSuccessCallBack} from '@kepler.gl/types';
-import {MapListItem, Provider} from 'cloud-providers';
+import {MapListItem, Provider} from '@kepler.gl/cloud-providers';
 
 // eslint-disable-next-line prettier/prettier
 const assignType = <T>(obj: T): { [K in keyof T]: `${typeof ACTION_PREFIX}${string & K}`; } => obj as any

diff --git a/src/actions/tsconfig.production.json b/src/actions/tsconfig.production.json
@@ -22,9 +22,9 @@
     "strict": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "baseUrl": "../../src", //TODO change once all dependencies are isolated
+    "baseUrl": "./src",
     "paths": {
-      "@kepler.gl/actions": ["actions/src"] //TODO change once all dependencies are isolated
+      "*": ["*"]
     }
   },
   "include": [

diff --git a/src/cloud-providers/tsconfig.production.json b/src/cloud-providers/tsconfig.production.json
@@ -22,9 +22,9 @@
     "strict": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "baseUrl": "../../src", //TODO change once all dependencies are isolated
+    "baseUrl": "./src",
     "paths": {
-      "@kepler.gl/cloud-providers": ["cloud-providers/src"] //TODO change once all dependencies are isolated
+      "*": ["*"]
     }
   },
   "include": [

diff --git a/src/components/package.json b/src/components/package.json
@@ -5,7 +5,7 @@
   "description": "kepler.gl constants used by kepler.gl components, actions and reducers",
   "license": "MIT",
   "main": "dist/index.js",
-  "types": "dist/components/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "keywords": [
     "babel",
     "es6",

diff --git a/src/components/src/common/animation-control/animation-window-control.tsx b/src/components/src/common/animation-control/animation-window-control.tsx
@@ -1,5 +1,5 @@
 import React, {useCallback} from 'react';
-import {FormattedMessage} from 'localization';
+import {FormattedMessage} from '@kepler.gl/localization';
 import {ReactComponentLike} from 'prop-types';
 import IconButton from '../icon-button';
 import {Tooltip} from '../styled-components';

diff --git a/src/components/src/common/animation-control/play-control.tsx b/src/components/src/common/animation-control/play-control.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import classnames from 'classnames';
-import {FormattedMessage} from 'localization';
+import {FormattedMessage} from '@kepler.gl/localization';
 import {Tooltip} from '../styled-components';
 import IconButton from '../icon-button';
 

diff --git a/src/components/src/common/animation-control/reset-control.tsx b/src/components/src/common/animation-control/reset-control.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {FormattedMessage} from 'localization';
+import {FormattedMessage} from '@kepler.gl/localization';
 import {Tooltip} from '../styled-components';
 import IconButton from '../icon-button';
 

diff --git a/src/components/src/common/animation-control/window-action-control.tsx b/src/components/src/common/animation-control/window-action-control.tsx
@@ -1,6 +1,6 @@
 import React, {useMemo} from 'react';
 import classnames from 'classnames';
-import {FormattedMessage} from 'localization';
+import {FormattedMessage} from '@kepler.gl/localization';
 import {Tooltip} from '../styled-components';
 import IconButton from '../icon-button';
 

diff --git a/src/connect/keplergl-connect.ts → ...omponents/src/connect/keplergl-connect.ts b/src/connect/keplergl-connect.ts → ...omponents/src/connect/keplergl-connect.ts
diff --git a/src/connect/with-local-selector.tsx → ...nents/src/connect/with-local-selector.tsx b/src/connect/with-local-selector.tsx → ...nents/src/connect/with-local-selector.tsx
@@ -20,7 +20,7 @@
 
 import React, {Component} from 'react';
 import {createSelector} from 'reselect';
-import {KeplerGlContext} from '@kepler.gl/components';
+import KeplerGlContext from '../context';
 import {KeplerGlState} from '@kepler.gl/reducers';
 
 const identity = state => state;

diff --git a/src/components/src/kepler-gl.tsx b/src/components/src/kepler-gl.tsx
@@ -23,7 +23,7 @@ import Console from 'global/console';
 import {bindActionCreators} from 'redux';
 import styled, {ThemeProvider, withTheme} from 'styled-components';
 import {createSelector} from 'reselect';
-import {connect as keplerGlConnect} from 'connect/keplergl-connect';
+import {connect as keplerGlConnect} from './connect/keplergl-connect';
 import {IntlProvider} from 'react-intl';
 import {messages} from '@kepler.gl/localization';
 import {RootContext, FeatureFlagsContextProvider, FeatureFlags} from './context';
@@ -75,7 +75,7 @@ import {
 
 import {theme as basicTheme, themeLT, themeBS} from '@kepler.gl/styles';
 import {KeplerGlState} from '@kepler.gl/reducers';
-import {Provider} from 'cloud-providers';
+import {Provider} from '@kepler.gl/cloud-providers';
 
 // Maybe we should think about exporting this or creating a variable
 // as part of the base.js theme

diff --git a/src/components/src/modal-container.tsx b/src/components/src/modal-container.tsx
@@ -74,9 +74,9 @@ import {
   ProviderActions
 } from '@kepler.gl/actions';
 import {ModalDialogProps} from './common/modal';
-import {Provider} from 'cloud-providers';
+import {Provider} from '@kepler.gl/cloud-providers';
 import {findDOMNode} from 'react-dom';
-import {VisState} from 'schemas';
+import {VisState} from '@kepler.gl/schemas';
 
 const DataTableModalStyle = css`
   top: 80px;

diff --git a/src/components/src/modals/load-data-modal.tsx b/src/components/src/modals/load-data-modal.tsx
@@ -30,7 +30,7 @@ import LoadingDialog from './loading-dialog';
 
 import {LOADING_METHODS} from '@kepler.gl/constants';
 import {FileLoading, FileLoadingProgress, LoadFiles} from '@kepler.gl/types';
-import {Provider} from 'cloud-providers';
+import {Provider} from '@kepler.gl/cloud-providers';
 import {SetCloudProviderPayload, ProviderActions, ActionHandler} from '@kepler.gl/actions';
 
 /** @typedef {import('./load-data-modal').LoadDataModalProps} LoadDataModalProps */

diff --git a/src/components/src/modals/load-storage-map.tsx b/src/components/src/modals/load-storage-map.tsx
@@ -29,7 +29,7 @@ import {Base} from '@kepler.gl/constants';
 import {ArrowLeft} from '../common/icons';
 import ProviderModalContainer from './provider-modal-container';
 import {FormattedMessage} from '@kepler.gl/localization';
-import {MapListItem, Provider} from 'cloud-providers';
+import {MapListItem, Provider} from '@kepler.gl/cloud-providers';
 
 const StyledProviderSection = styled.div.attrs({
   className: 'provider-selection'

diff --git a/src/components/src/modals/modal-tabs.tsx b/src/components/src/modals/modal-tabs.tsx
@@ -22,7 +22,7 @@ import React, {useCallback} from 'react';
 import classnames from 'classnames';
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
-import {media} from 'styles';
+import {media} from '@kepler.gl/styles';
 import {FormattedMessage, useIntl} from 'react-intl';
 import {LoadingMethod} from './load-data-modal';
 

diff --git a/src/components/src/modals/overwrite-map-modal.tsx b/src/components/src/modals/overwrite-map-modal.tsx
@@ -25,7 +25,7 @@ import {UploadAnimation} from './status-panel';
 import {FormattedMessage} from '@kepler.gl/localization';
 import ImageModalContainer, {ImageModalContainerProps} from './image-modal-container';
 import {Provider} from '@kepler.gl/cloud-providers';
-import {cleanupExportImage as cleanupExportImageAction} from 'actions';
+import {cleanupExportImage as cleanupExportImageAction} from '@kepler.gl/actions';
 
 /** @typedef {import('./overwrite-map-modal').OverwriteMapModalProps} OverwriteMapModalProps */
 

diff --git a/src/components/src/modals/provider-modal-container.tsx b/src/components/src/modals/provider-modal-container.tsx
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 import React, {Component} from 'react';
-import {Provider} from 'cloud-providers';
+import {Provider} from '@kepler.gl/cloud-providers';
 import {SetCloudProviderPayload} from '@kepler.gl/actions';
 
 export type ProviderModalContainerProps = {

diff --git a/src/components/src/modals/save-map-modal.tsx b/src/components/src/modals/save-map-modal.tsx
@@ -38,8 +38,8 @@ import {
 import ImagePreview from '../common/image-preview';
 import {FormattedMessage} from '@kepler.gl/localization';
 import {MapInfo} from '@kepler.gl/types';
-import {Provider} from 'cloud-providers';
-import {setMapInfo, cleanupExportImage as cleanupExportImageAction} from 'actions';
+import {Provider} from '@kepler.gl/cloud-providers';
+import {setMapInfo, cleanupExportImage as cleanupExportImageAction} from '@kepler.gl/actions';
 
 /** @typedef {import('./save-map-modal').SaveMapModalProps} SaveMapModalProps */
 

diff --git a/src/components/src/modals/share-map-modal.tsx b/src/components/src/modals/share-map-modal.tsx
@@ -34,8 +34,11 @@ import {
 import CloudTile from './cloud-tile';
 import StatusPanel from './status-panel';
 import {FormattedMessage} from '@kepler.gl/localization';
-import {Provider} from 'cloud-providers';
-import {cleanupExportImage as cleanupExportImageAction, SetCloudProviderPayload} from 'actions';
+import {Provider} from '@kepler.gl/cloud-providers';
+import {
+  cleanupExportImage as cleanupExportImageAction,
+  SetCloudProviderPayload
+} from '@kepler.gl/actions';
 
 export const StyledInputLabel = styled.label`
   font-size: 12px;

diff --git a/src/components/tsconfig.production.json b/src/components/tsconfig.production.json
@@ -22,9 +22,9 @@
     "strict": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "baseUrl": "../../src", //TODO change once all dependencies are isolated
+    "baseUrl": "./src",
     "paths": {
-      "@kepler.gl/components": ["components/src"] //TODO change once all dependencies are isolated
+      "*": ["*"]
     }
   },
   "include": [

diff --git a/src/deckgl-layers/package.json b/src/deckgl-layers/package.json
@@ -5,7 +5,7 @@
   "description": "kepler.gl constants used by kepler.gl components, actions and reducers",
   "license": "MIT",
   "main": "dist/index.js",
-  "types": "index.d.ts",
+  "types": "dist/index.d.ts",
   "keywords": [
     "babel",
     "es6",
@@ -49,15 +49,6 @@
     "@kepler.gl/constants": "2.5.5",
     "lodash.memoize": "^4.1.2"
   },
-  "exports": {
-    ".": "./dist/index.js",
-    "./*": "./dist/*"
-  },
-  "typesVersions": {
-    "*": {
-      "*": ["dist/*"]
-    }
-  },
   "nyc": {
     "sourceMap": false,
     "instrument": false

diff --git a/src/index.js b/src/index.js
@@ -22,10 +22,10 @@
 export * from '@kepler.gl/reducers';
 
 // Schemas
-export * from './schemas';
+export * from '@kepler.gl/schemas';
 
 // Actions
-export * from './actions';
+export * from '@kepler.gl/actions';
 
 // Constants
 export * from '@kepler.gl/constants';
@@ -34,13 +34,13 @@ export * from '@kepler.gl/constants';
 export * from '@kepler.gl/processors';
 
 // Components
-export * from './components';
+export * from '@kepler.gl/components';
 
 // Layers
-export * from './layers';
+export * from '@kepler.gl/layers';
 
 // Styles
-export * from './styles';
+export * from '@kepler.gl/styles';
 
 // Middleware
 export * from '@kepler.gl/middleware';

diff --git a/src/layers/tsconfig.production.json b/src/layers/tsconfig.production.json
@@ -22,9 +22,9 @@
     "strict": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "baseUrl": "../../src", //TODO change once all dependencies are isolated
+    "baseUrl": "./src",
     "paths": {
-      "@kepler.gl/layers": ["layers/src"] //TODO change once all dependencies are isolated
+      "*": ["*"]
     }
   },
   "include": ["src"]

diff --git a/src/localization/tsconfig.production.json b/src/localization/tsconfig.production.json
@@ -22,9 +22,9 @@
     "strict": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "baseUrl": "../../src", //TODO change once all dependencies are isolated
+    "baseUrl": "./src",
     "paths": {
-      "@kepler.gl/localization": ["localization"] //TODO change once all dependencies are isolated
+      "*": ["*"]
     }
   },
   "include": ["src"]

diff --git a/src/middleware/package.json b/src/middleware/package.json
@@ -5,7 +5,7 @@
   "description": "kepler.gl middleware used by kepler.gl components, actions and reducers",
   "license": "MIT",
   "main": "dist/index.js",
-  "types": "index.d.ts",
+  "types": "dist/index.d.ts",
   "keywords": [
     "babel",
     "es6",

diff --git a/src/processors/package.json b/src/processors/package.json
@@ -5,7 +5,7 @@
   "description": "kepler.gl constants used by kepler.gl components, actions and reducers",
   "license": "MIT",
   "main": "dist/index.js",
-  "types": "dist/processors/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "keywords": [
     "babel",
     "es6",

diff --git a/src/processors/tsconfig.production.json b/src/processors/tsconfig.production.json
@@ -22,9 +22,9 @@
     "strict": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "baseUrl": "../../src", //TODO change once all dependencies are isolated
+    "baseUrl": "./src",
     "paths": {
-      "@kepler.gl/processors": ["processors/src"] //TODO change once all dependencies are isolated
+      "*": ["*"]
     }
   },
   "include": ["src"]

diff --git a/src/reducers/package.json b/src/reducers/package.json
@@ -5,7 +5,7 @@
   "description": "kepler.gl constants used by kepler.gl components, actions and reducers",
   "license": "MIT",
   "main": "dist/index.js",
-  "types": "dist/reducers/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "keywords": [
     "babel",
     "es6",

diff --git a/src/reducers/src/combined-updaters.ts b/src/reducers/src/combined-updaters.ts
@@ -34,7 +34,7 @@ import {MapState, UiState, AddDataToMapPayload, ParsedConfig} from '@kepler.gl/t
 import {MapStyle} from './map-style-updaters';
 import {ProviderState} from './provider-state-updaters';
 import {loadFilesSuccessUpdaterAction} from '@kepler.gl/actions';
-import {VisState} from 'schemas';
+import {VisState} from '@kepler.gl/schemas';
 import {Layer} from '@kepler.gl/layers';
 import {isPlainObject} from '@kepler.gl/utils';
 import {findMapBounds} from './data-utils';

diff --git a/src/reducers/src/core.ts b/src/reducers/src/core.ts
@@ -28,7 +28,7 @@ import {providerStateReducerFactory} from './provider-state';
 
 import composers from './composers';
 
-import {VisState} from 'schemas';
+import {VisState} from '@kepler.gl/schemas';
 import {MapState, UiState} from '@kepler.gl/types';
 import {MapStyle} from './map-style-updaters';
 import {ProviderState} from './provider-state-updaters';

diff --git a/src/reducers/src/layer-utils.ts b/src/reducers/src/layer-utils.ts
@@ -34,7 +34,7 @@ import {
 } from '@kepler.gl/layers';
 
 import KeplerTable, {DataRow, Datasets} from '@kepler.gl/table';
-import {VisState} from 'schemas';
+import {VisState} from '@kepler.gl/schemas';
 import {isFunction, getMapLayersFromSplitMaps} from '@kepler.gl/utils';
 import {ThreeDBuildingLayer} from '@kepler.gl/deckgl-layers';
 

diff --git a/src/reducers/src/provider-state-updaters.ts b/src/reducers/src/provider-state-updaters.ts
@@ -51,7 +51,7 @@ import {
 } from '@kepler.gl/constants';
 import {ExportFileToCloudPayload} from '@kepler.gl/types';
 
-import {FILE_CONFLICT_MSG, MapListItem} from 'cloud-providers';
+import {FILE_CONFLICT_MSG, MapListItem} from '@kepler.gl/cloud-providers';
 import {DATASET_HANDLERS} from '@kepler.gl/processors';
 
 type ActionPayload<P> = {

diff --git a/src/reducers/src/ui-state-updaters.ts b/src/reducers/src/ui-state-updaters.ts
@@ -31,7 +31,7 @@ import {
   MAP_CONTROLS,
   ExportImage
 } from '@kepler.gl/constants';
-import {ActionTypes} from 'actions';
+import {ActionTypes} from '@kepler.gl/actions';
 import {LOCALE_CODES} from '@kepler.gl/localization';
 import {createNotification, errorNotification, calculateExportImageSize} from '@kepler.gl/utils';
 import {payload_, apply_, compose_} from './composer-helpers';

diff --git a/src/reducers/src/vis-state-merger.ts b/src/reducers/src/vis-state-merger.ts
@@ -33,7 +33,7 @@ import {
   visStateSchema
 } from '@kepler.gl/schemas';
 
-import {ParsedConfig} from 'schemas';
+import {ParsedConfig} from '@kepler.gl/schemas';
 import {ParsedLayer, SavedInteractionConfig, TooltipInfo} from '@kepler.gl/types';
 import {KeplerTable, Datasets} from '@kepler.gl/table';
 import {

diff --git a/src/reducers/tsconfig.production.json b/src/reducers/tsconfig.production.json
@@ -22,9 +22,9 @@
     "strict": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "baseUrl": "../../src", //TODO change once all dependencies are isolated
+    "baseUrl": "./src",
     "paths": {
-      "*": ["*"] //TODO change once all dependencies are isolated
+      "*": ["*"]
     }
   },
   "include": [