Pioneer workspaces config etc.

.gitignore

@@ -13,6 +13,7 @@ joystream_runtime.wasm
 
 # Generated by yarn
 yarn*
+!yarn.lock
 
 # JetBrains IDEs
 .idea
@@ -24,4 +25,4 @@ yarn*
 .vscode
 
 # Compiled WASM code
-*.wasm
+*.wasm

.yarnclean

@@ -0,0 +1,2 @@
+@types/react-native
+@polkadot/ts/node_modules

cli/package.json

@@ -8,7 +8,7 @@
   },
   "bugs": "https://github.com/Joystream/substrate-runtime-joystream/issues",
   "dependencies": {
-    "@joystream/types": "^0.6.0",
+    "@joystream/types": "*",
     "@oclif/command": "^1.5.19",
     "@oclif/config": "^1.14.0",
     "@oclif/plugin-help": "^2.2.3",

cli/src/Api.ts

@@ -1,5 +1,5 @@
 import BN from 'bn.js';
-import { registerJoystreamTypes } from '@joystream/types';
+import { registerJoystreamTypes } from '@joystream/types/lib';
 import { ApiPromise, WsProvider } from '@polkadot/api';
 import { QueryableStorageMultiArg } from '@polkadot/api/types';
 import { formatBalance } from '@polkadot/util';

cli/src/Types.ts

@@ -1,5 +1,5 @@
 import BN from 'bn.js';
-import { ElectionStage, Seat } from '@joystream/types';
+import { ElectionStage, Seat } from '@joystream/types/lib';
 import { Option } from '@polkadot/types';
 import { BlockNumber, Balance } from '@polkadot/types/interfaces';
 import { DerivedBalances } from '@polkadot/api-derive/types';

cli/src/commands/council/info.ts

@@ -1,4 +1,4 @@
-import { ElectionStage } from '@joystream/types';
+import { ElectionStage } from '@joystream/types/lib';
 import { formatNumber, formatBalance } from '@polkadot/util';
 import { BlockNumber } from '@polkadot/types/interfaces';
 import { CouncilInfoObj, NameValueObj } from '../../Types';

package.json

@@ -1,21 +1,25 @@
-{
-	"private": true,
-	"name": "joystream",
-	"license": "GPL-3.0-only",
-	"scripts": {
-		"test": "yarn && yarn workspaces run test",
-		"test-migration": "yarn && yarn workspaces run test-migration"
-	},
-	"workspaces": [
-		"tests/network-tests"
-	],
-	"devDependencies": {
-		"husky": "^4.2.5"
-	},
-	"husky": {
-	  "hooks": {
-		"pre-commit": "devops/git-hooks/pre-commit",
-		"pre-push": "devops/git-hooks/pre-push"
-	  }
-	}
-}
+{
+	"private": true,
+	"name": "joystream",
+	"license": "GPL-3.0-only",
+	"scripts": {
+		"test": "yarn && yarn workspaces run test",
+		"test-migration": "yarn && yarn workspaces run test-migration"
+	},
+	"workspaces": [
+		"tests/network-tests",
+		"cli",
+		"types",
+		"pioneer",
+		"pioneer/packages/*"
+	],
+	"devDependencies": {
+		"husky": "^4.2.5"
+	},
+	"husky": {
+	  "hooks": {
+		"pre-commit": "devops/git-hooks/pre-commit",
+		"pre-push": "devops/git-hooks/pre-push"
+	  }
+	}
+}

pioneer/.storybook/webpack.config.js

@@ -11,7 +11,7 @@ config.module.rules.push({
     {
       loader: require.resolve('postcss-loader'),
       options: {
-        // Set postcss.config.js config path && ctx 
+        // Set postcss.config.js config path && ctx
         config: {
           path: '../postcss.config.js',
         },
@@ -32,7 +32,7 @@ config.module.rules.push({
 
 // TypeScript loader (via Babel to match polkadot/apps)
 config.module.rules.push({
-  test: /\.(ts|tsx)$/,
+  test: /\.(js|ts|tsx)$/,
   exclude: /(node_modules)/,
   use: [
     {
@@ -41,7 +41,7 @@ config.module.rules.push({
     },
   ],
 });
-config.resolve.extensions.push('.ts', '.tsx');
+config.resolve.extensions.push('.js', '.ts', '.tsx');
 
 // TSConfig, uses the same file as packages
 config.resolve.plugins = config.resolve.plugins || [];
@@ -71,9 +71,9 @@ config.module.rules.push(
             'sass-loader',
         ],
     },
-    { 
-        test: /\.less$/, 
-        loaders: [ 'style-loader', 'css-loader', 'less-loader' ] 
+    {
+        test: /\.less$/,
+        loaders: [ 'style-loader', 'css-loader', 'less-loader' ]
     }
 );
 

pioneer/package.json

@@ -6,9 +6,7 @@
     "yarn": "^1.10.1"
   },
   "homepage": ".",
-  "workspaces": [
-    "packages/*"
-  ],
+  "name": "pioneer",
   "resolutions": {
     "@polkadot/api": "^0.96.1",
     "@polkadot/api-contract": "^0.96.1",
@@ -39,13 +37,16 @@
   "devDependencies": {
     "@babel/core": "^7.7.0",
     "@babel/runtime": "^7.7.1",
+    "@babel/cli": "^7.7.4",
     "@polkadot/dev-react": "^0.32.0-beta.13",
     "@polkadot/ts": "^0.1.84",
+    "@polkadot/dev": "^0.32.0-beta.15",
     "@storybook/addon-knobs": "^5.2.5",
     "@storybook/addon-storysource": "^5.2.5",
     "@types/jest": "^24.0.22",
     "@types/react-router-dom": "^5.1.4",
     "@types/yup": "^0.26.36",
+    "@joystream/types": "*",
     "autoprefixer": "^9.7.1",
     "empty": "^0.10.1",
     "html-loader": "^0.5.5",
@@ -64,7 +65,16 @@
     "source-map-explorer": "^2.0.1",
     "storybook-react-router": "^1.0.8",
     "ts-jest": "^24.1.0",
-    "tsconfig-paths-webpack-plugin": "^3.2.0"
+    "tsconfig-paths-webpack-plugin": "^3.2.0",
+    "webpack": "^4.33.0",
+    "typescript": "3.7.2",
+    "cpx": "^1.5.0",
+    "eslint-config-semistandard": "^15.0.0",
+    "eslint-config-standard": "^14.1.1",
+    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1"
   },
   "dependencies": {
     "@polkadot/ui-settings": "^0.47.0-beta.3",

pioneer/packages/apps/src/SideBar/Item.tsx

@@ -20,7 +20,7 @@ import { Option } from '@polkadot/types';
 import translate from '../translate';
 
 import { queryToProp } from '@polkadot/joy-utils/index';
-import { ElectionStage } from '@joystream/types/';
+import { ElectionStage } from '@joystream/types/lib/';
 import { councilSidebarName } from '@polkadot/apps-routing/joy-election';
 
 interface Props extends I18nProps {

pioneer/packages/apps/src/index.tsx

@@ -61,7 +61,7 @@ const wsEndpoint = _wsEndpoint.split('#')[0];
 console.log('WS endpoint=', wsEndpoint);
 
 try {
-  require('@joystream/types/').registerJoystreamTypes();
+  require('@joystream/types/lib/').registerJoystreamTypes();
 
   const types = store.get('types') || {};
   const names = Object.keys(types);

pioneer/packages/apps/webpack.config.js

@@ -93,9 +93,9 @@ function createWebpack ({ alias = {}, context, name = 'index' }) {
               'sass-loader',
             ],
         },
-        { 
-            test: /\.less$/, 
-            loaders: [ 'style-loader', 'css-loader', 'less-loader' ] 
+        {
+            test: /\.less$/,
+            loaders: [ 'style-loader', 'css-loader', 'less-loader' ]
         },
         {
           test: /\.css$/,

pioneer/packages/joy-election/src/Applicant.tsx

@@ -11,7 +11,7 @@ import CandidatePreview from "./CandidatePreview";
 
 import translate from './translate';
 import { calcTotalStake } from '@polkadot/joy-utils/index';
-import { Stake } from '@joystream/types/';
+import { Stake } from '@joystream/types/lib/';
 
 type Props = ApiProps & I18nProps & {
   index: number,

pioneer/packages/joy-election/src/ApplyForm.tsx

@@ -10,7 +10,7 @@ import { Balance } from '@polkadot/types/interfaces';
 import translate from './translate';
 import TxButton from '@polkadot/joy-utils/TxButton';
 import InputStake from '@polkadot/joy-utils/InputStake';
-import { Stake } from '@joystream/types/';
+import { Stake } from '@joystream/types/lib/';
 import { calcTotalStake, ZERO } from '@polkadot/joy-utils/index';
 import { MyAddressProps, withOnlyMembers } from '@polkadot/joy-utils/MyAccount';
 

pioneer/packages/joy-election/src/Council.tsx

@@ -8,7 +8,7 @@ import { formatBalance } from "@polkadot/util";
 import CouncilCandidate from './CandidatePreview';
 
 import { calcBackersStake } from "@polkadot/joy-utils/index";
-import { Seat } from "@joystream/types/";
+import { Seat } from "@joystream/types/lib/";
 import translate from "./translate";
 import Section from "@polkadot/joy-utils/Section";
 

pioneer/packages/joy-election/src/Dashboard.tsx

@@ -11,7 +11,7 @@ import { formatNumber, formatBalance } from '@polkadot/util';
 
 import Section from '@polkadot/joy-utils/Section';
 import { queryToProp } from '@polkadot/joy-utils/index';
-import { ElectionStage, Seat } from '@joystream/types/';
+import { ElectionStage, Seat } from '@joystream/types/lib/';
 import translate from './translate';
 
 type Props = ApiProps & I18nProps & {

pioneer/packages/joy-election/src/SealedVote.tsx

@@ -10,7 +10,7 @@ import { formatBalance } from '@polkadot/util';
 
 import translate from './translate';
 import { calcTotalStake } from '@polkadot/joy-utils/index';
-import { SealedVote } from '@joystream/types/';
+import { SealedVote } from '@joystream/types/lib/';
 import AddressMini from '@polkadot/react-components/AddressMiniJoy';
 import CandidatePreview from "./CandidatePreview";
 import { findVoteByHash } from './myVotesStore';

pioneer/packages/joy-election/src/index.tsx

@@ -18,7 +18,7 @@ import Applicants from './Applicants';
 import Votes from './Votes';
 import Reveals from './Reveals';
 import { queryToProp } from '@polkadot/joy-utils/index';
-import { Seat } from '@joystream/types/';
+import { Seat } from '@joystream/types/lib/';
 
 // define out internal types
 type Props = AppProps & ApiProps & I18nProps & {

pioneer/packages/joy-forum/src/CategoryList.tsx

@@ -7,7 +7,7 @@ import orderBy from 'lodash/orderBy';
 import BN from 'bn.js';
 
 import { Option, bool } from '@polkadot/types';
-import { CategoryId, Category, ThreadId, Thread } from '@joystream/types/forum';
+import { CategoryId, Category, ThreadId, Thread } from '@joystream/types/lib/forum';
 import { ViewThread } from './ViewThread';
 import { MutedSpan } from '@polkadot/joy-utils/MutedText';
 import { UrlHasIdProps, CategoryCrumbs, Pagination, ThreadsPerPage } from './utils';

pioneer/packages/joy-forum/src/Context.tsx

@@ -2,7 +2,7 @@
 // NOTE: The purpose of this context is to immitate a Substrate storage for the forum until it's implemented as a substrate runtime module.
 
 import React, { useReducer, createContext, useContext } from 'react';
-import { Category, Thread, Reply, ModerationAction, BlockchainTimestamp } from '@joystream/types/forum';
+import { Category, Thread, Reply, ModerationAction, BlockchainTimestamp } from '@joystream/types/lib/forum';
 import { Option, Text } from '@polkadot/types';
 import { GenericAccountId } from '@polkadot/types';
 

pioneer/packages/joy-forum/src/EditCategory.tsx

@@ -11,7 +11,7 @@ import { withMulti } from '@polkadot/react-api/with';
 import * as JoyForms from '@polkadot/joy-utils/forms';
 import { Text } from '@polkadot/types';
 import { Option } from '@polkadot/types/codec';
-import { CategoryId, Category } from '@joystream/types/forum';
+import { CategoryId, Category } from '@joystream/types/lib/forum';
 import Section from '@polkadot/joy-utils/Section';
 import { useMyAccount } from '@polkadot/joy-utils/MyAccountContext';
 import { UrlHasIdProps, CategoryCrumbs } from './utils';

pioneer/packages/joy-forum/src/EditReply.tsx

@@ -10,7 +10,7 @@ import { withMulti } from '@polkadot/react-api/with';
 
 import * as JoyForms from '@polkadot/joy-utils/forms';
 import { Text } from '@polkadot/types';
-import { PostId, Post, ThreadId } from '@joystream/types/forum';
+import { PostId, Post, ThreadId } from '@joystream/types/lib/forum';
 import { withOnlyMembers } from '@polkadot/joy-utils/MyAccount';
 import Section from '@polkadot/joy-utils/Section';
 import { useMyAccount } from '@polkadot/joy-utils/MyAccountContext';

pioneer/packages/joy-forum/src/EditThread.tsx

@@ -12,7 +12,7 @@ import { withMulti } from '@polkadot/react-api/with';
 
 import * as JoyForms from '@polkadot/joy-utils/forms';
 import { Text } from '@polkadot/types';
-import { ThreadId, Thread, CategoryId } from '@joystream/types/forum';
+import { ThreadId, Thread, CategoryId } from '@joystream/types/lib/forum';
 import { withOnlyMembers } from '@polkadot/joy-utils/MyAccount';
 import Section from '@polkadot/joy-utils/Section';
 import { useMyAccount } from '@polkadot/joy-utils/MyAccountContext';

pioneer/packages/joy-forum/src/Moderate.tsx

@@ -9,7 +9,7 @@ import { withMulti } from '@polkadot/react-api/with';
 
 import * as JoyForms from '@polkadot/joy-utils/forms';
 import { Text } from '@polkadot/types';
-import { ReplyId, ThreadId } from '@joystream/types/forum';
+import { ReplyId, ThreadId } from '@joystream/types/lib/forum';
 import Section from '@polkadot/joy-utils/Section';
 import { withOnlyForumSudo } from './ForumSudo';
 import { ValidationProps, withPostModerationValidation } from './validation';

pioneer/packages/joy-forum/src/ViewReply.tsx

@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
 import ReactMarkdown from 'react-markdown';
 import { Segment, Button } from 'semantic-ui-react';
 
-import { Post, Category, Thread } from '@joystream/types/forum';
+import { Post, Category, Thread } from '@joystream/types/lib/forum';
 import { Moderate } from './Moderate';
 import { JoyWarn } from '@polkadot/joy-utils/JoyStatus';
 import { useMyAccount } from '@polkadot/joy-utils/MyAccountContext';

pioneer/packages/joy-forum/src/ViewThread.tsx

@@ -5,7 +5,7 @@ import { Table, Button, Label } from 'semantic-ui-react';
 import { History } from 'history';
 import BN from 'bn.js';
 
-import { Category, Thread, ThreadId, Post, PostId } from '@joystream/types/forum';
+import { Category, Thread, ThreadId, Post, PostId } from '@joystream/types/lib/forum';
 import { Pagination, RepliesPerPage, CategoryCrumbs } from './utils';
 import { ViewReply } from './ViewReply';
 import { Moderate } from './Moderate';

pioneer/packages/joy-forum/src/calls.tsx

@@ -7,7 +7,7 @@ import { Option } from '@polkadot/types/codec';
 import { AccountId } from '@polkadot/types/interfaces';
 import { u64 } from '@polkadot/types';
 import { Constructor } from '@polkadot/types/types';
-import { Category, Thread, Reply } from '@joystream/types/forum';
+import { Category, Thread, Reply } from '@joystream/types/lib/forum';
 import { useForum, ForumState } from './Context';
 
 type Call = string | [string, Options];

pioneer/packages/joy-forum/src/utils.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { Pagination as SuiPagination } from 'semantic-ui-react';
 
-import { Category, CategoryId, Thread, ThreadId } from '@joystream/types/forum';
+import { Category, CategoryId, Thread, ThreadId } from '@joystream/types/lib/forum';
 import { withForumCalls } from './calls';
 import { withMulti } from '@polkadot/react-api';
 

pioneer/packages/joy-forum/src/validation.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { withMulti } from '@polkadot/react-api/with';
-import { InputValidationLengthConstraint } from '@joystream/types/forum';
+import { InputValidationLengthConstraint } from '@joystream/types/lib/forum';
 import { withForumCalls } from './calls';
 
 export type ValidationProps = {

pioneer/packages/joy-media/src/DiscoveryProvider.tsx

@@ -5,7 +5,7 @@ import { parse as parseUrl } from 'url';
 
 import { AccountId } from '@polkadot/types/interfaces';
 import { Vec } from '@polkadot/types';
-import { Url } from '@joystream/types/discovery'
+import { Url } from '@joystream/types/lib/discovery'
 import ApiContext from '@polkadot/react-api/ApiContext';
 import { ApiProps } from '@polkadot/react-api/types';
 import { JoyInfo } from '@polkadot/joy-utils/JoyStatus';

pioneer/packages/joy-media/src/MediaView.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { MediaTransport } from './transport';
-import { MemberId } from '@joystream/types/members';
+import { MemberId } from '@joystream/types/lib/members';
 import { useMyMembership } from '@polkadot/joy-utils/MyMembershipContext';
 import { useTransportContext } from './TransportContext';
 import { withMembershipRequired } from '@polkadot/joy-utils/MyAccount';

pioneer/packages/joy-media/src/Upload.tsx

@@ -15,12 +15,12 @@ import { AccountId } from '@polkadot/types/interfaces';
 
 import translate from './translate';
 import { fileNameWoExt } from './utils';
-import { ContentId, DataObject } from '@joystream/types/media';
+import { ContentId, DataObject } from '@joystream/types/lib/media';
 import { withMembershipRequired } from '@polkadot/joy-utils/MyAccount';
 import { DiscoveryProviderProps, withDiscoveryProvider } from './DiscoveryProvider';
 import TxButton from '@polkadot/joy-utils/TxButton';
 import IpfsHash from 'ipfs-only-hash';
-import { ChannelId } from '@joystream/types/content-working-group';
+import { ChannelId } from '@joystream/types/lib/content-working-group';
 import { EditVideoView } from './upload/EditVideo.view';
 import { JoyInfo } from '@polkadot/joy-utils/JoyStatus';
 import { IterableFile } from './IterableFile';

pioneer/packages/joy-media/src/channels/ChannelHelpers.ts

@@ -1,6 +1,6 @@
 import { AccountId } from '@polkadot/types/interfaces';
 import { ChannelType } from "../schemas/channel/Channel";
-import { ChannelPublicationStatusAllValues } from "@joystream/types/content-working-group";
+import { ChannelPublicationStatusAllValues } from "@joystream/types/lib/content-working-group";
 
 export const ChannelPublicationStatusDropdownOptions =
   ChannelPublicationStatusAllValues
@@ -31,4 +31,4 @@ export function isCensoredChannel(channel: ChannelType): boolean {
 
 export function isVerifiedChannel(channel: ChannelType): boolean {
   return channel.verified
-}
+}

pioneer/packages/joy-media/src/channels/ChannelsByOwner.tsx

@@ -4,7 +4,7 @@ import { Segment, Tab } from 'semantic-ui-react';
 import { AccountId } from '@polkadot/types/interfaces';
 import { ChannelEntity } from '../entities/ChannelEntity';
 import { YouHaveNoChannels } from './YouHaveNoChannels';
-import { ChannelContentTypeValue } from '@joystream/types/content-working-group';
+import { ChannelContentTypeValue } from '@joystream/types/lib/content-working-group';
 import { ChannelPreview } from './ChannelPreview';
 
 export type ChannelsByOwnerProps = {

pioneer/packages/joy-media/src/channels/CurationPanel.tsx

@@ -3,7 +3,7 @@ import { ChannelEntity } from '../entities/ChannelEntity';
 import { isVerifiedChannel, isCensoredChannel } from './ChannelHelpers';
 import { useMyMembership } from '@polkadot/joy-utils/MyMembershipContext';
 import TxButton from '@polkadot/joy-utils/TxButton';
-import { ChannelCurationStatus } from '@joystream/types/content-working-group';
+import { ChannelCurationStatus } from '@joystream/types/lib/content-working-group';
 import { AccountId } from '@polkadot/types/interfaces';
 
 type ChannelCurationPanelProps = {

pioneer/packages/joy-media/src/channels/EditChannel.tsx

@@ -9,7 +9,7 @@ import { onImageError } from '@polkadot/joy-utils/images';
 import { withMediaForm, MediaFormProps } from '../common/MediaForms';
 import { ChannelType, ChannelClass as Fields, buildChannelValidationSchema, ChannelFormValues, ChannelToFormValues, ChannelGenericProp } from '../schemas/channel/Channel';
 import { MediaDropdownOptions } from '../common/MediaDropdownOptions';
-import { ChannelId, ChannelContentType, ChannelPublicationStatus, OptionalText } from '@joystream/types/content-working-group';
+import { ChannelId, ChannelContentType, ChannelPublicationStatus, OptionalText } from '@joystream/types/lib/content-working-group';
 import { newOptionalText, findFirstParamOfSubstrateEvent } from '@polkadot/joy-utils/index';
 import { useMyMembership } from '@polkadot/joy-utils/MyMembershipContext';
 import { ChannelPublicationStatusDropdownOptions, isAccountAChannelOwner } from './ChannelHelpers';

pioneer/packages/joy-media/src/channels/EditChannel.view.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { MediaView } from '../MediaView';
 import { OuterProps, EditForm } from './EditChannel';
-import { ChannelId } from '@joystream/types/content-working-group';
+import { ChannelId } from '@joystream/types/lib/content-working-group';
 import { JoyError } from '@polkadot/joy-utils/JoyStatus';
 
 type Props = OuterProps;

pioneer/packages/joy-media/src/channels/ViewChannel.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ChannelEntity } from '../entities/ChannelEntity';
-import { ChannelId } from '@joystream/types/content-working-group';
+import { ChannelId } from '@joystream/types/lib/content-working-group';
 import { VideoType } from '../schemas/video/Video';
 import { MusicAlbumPreviewProps } from '../music/MusicAlbumPreview';
 import { MusicTrackReaderPreviewProps } from '../music/MusicTrackReaderPreview';

pioneer/packages/joy-media/src/channels/ViewChannel.view.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { MediaView } from '../MediaView';
 import { ViewChannelProps, ViewChannel } from './ViewChannel';
-import { ChannelId } from '@joystream/types/content-working-group';
+import { ChannelId } from '@joystream/types/lib/content-working-group';
 import { JoyError } from '@polkadot/joy-utils/JoyStatus';
 
 type Props = ViewChannelProps;

pioneer/packages/joy-media/src/common/MediaDropdownOptions.tsx

@@ -1,7 +1,7 @@
 import ISO6391 from 'iso-639-1';
 import { DropdownItemProps } from 'semantic-ui-react';
 import { LanguageType } from '../schemas/general/Language';
-import { TextValueEntity } from '@joystream/types/versioned-store/EntityCodec';
+import { TextValueEntity } from '@joystream/types/lib/versioned-store/EntityCodec';
 import { InternalEntities } from '../transport';
 
 const buildOptions = (entities: TextValueEntity[]): DropdownItemProps[] =>

pioneer/packages/joy-media/src/common/MediaPlayerView.tsx

@@ -10,7 +10,7 @@ import { Option } from '@polkadot/types/codec';
 
 import translate from '../translate';
 import { DiscoveryProviderProps } from '../DiscoveryProvider';
-import { DataObject, ContentId } from '@joystream/types/media';
+import { DataObject, ContentId } from '@joystream/types/lib/media';
 import { VideoType } from '../schemas/video/Video';
 import { isAccountAChannelOwner } from '../channels/ChannelHelpers';
 import { ChannelEntity } from '../entities/ChannelEntity';

pioneer/packages/joy-media/src/common/MediaPlayerWithResolver.tsx

@@ -10,7 +10,7 @@ import { AccountId } from '@polkadot/types/interfaces';
 
 import translate from '../translate';
 import { DiscoveryProviderProps, withDiscoveryProvider } from '../DiscoveryProvider';
-import { DataObjectStorageRelationshipId, DataObjectStorageRelationship } from '@joystream/types/media';
+import { DataObjectStorageRelationshipId, DataObjectStorageRelationship } from '@joystream/types/lib/media';
 import { Message } from 'semantic-ui-react';
 import { MediaPlayerView, RequiredMediaPlayerProps } from './MediaPlayerView';
 import { JoyInfo } from '@polkadot/joy-utils/JoyStatus';

pioneer/packages/joy-media/src/common/TypeHelpers.ts

@@ -1,6 +1,6 @@
 import BN from 'bn.js'
-import { ChannelId } from "@joystream/types/content-working-group"
-import { EntityId, ClassId } from "@joystream/types/versioned-store"
+import { ChannelId } from "@joystream/types/lib/content-working-group"
+import { EntityId, ClassId } from "@joystream/types/lib/versioned-store"
 
 export type AnyChannelId = ChannelId | BN | number | string
 

pioneer/packages/joy-media/src/music/EditMusicAlbum.tsx

@@ -8,7 +8,7 @@ import { onImageError } from '@polkadot/joy-utils/images';
 import { ReorderableTracks } from './ReorderableTracks';
 import { MusicAlbumValidationSchema, MusicAlbumType, MusicAlbumClass as Fields, MusicAlbumFormValues, MusicAlbumToFormValues } from '../schemas/music/MusicAlbum';
 import { withMediaForm, MediaFormProps, datePlaceholder } from '../common/MediaForms';
-import EntityId from '@joystream/types/versioned-store/EntityId';
+import EntityId from '@joystream/types/lib/versioned-store/EntityId';
 import { MediaDropdownOptions } from '../common/MediaDropdownOptions';
 import { MusicTrackReaderPreviewProps } from './MusicTrackReaderPreview';
 import { FormTabs } from '../common/FormTabs';

pioneer/packages/joy-media/src/schemas/channel/Channel.ts

@@ -1,8 +1,8 @@
 
 import * as Yup from 'yup';
 import { BlockNumber, AccountId } from '@polkadot/types/interfaces';
-import { ChannelContentTypeValue, PrincipalId, Channel, ChannelId, ChannelPublicationStatusValue, ChannelCurationStatusValue } from '@joystream/types/content-working-group';
-import { MemberId } from '@joystream/types/members';
+import { ChannelContentTypeValue, PrincipalId, Channel, ChannelId, ChannelPublicationStatusValue, ChannelCurationStatusValue } from '@joystream/types/lib/content-working-group';
+import { MemberId } from '@joystream/types/lib/members';
 import { ChannelValidationConstraints } from '@polkadot/joy-media/transport';
 import { ValidationConstraint } from '@polkadot/joy-utils/ValidationConstraint';
 

pioneer/packages/joy-media/src/schemas/general/ContentLicense.ts

@@ -2,7 +2,7 @@
 /** This file is generated based on JSON schema. Do not modify. */
 
 import * as Yup from 'yup';
-import { EntityCodec } from '@joystream/types/versioned-store/EntityCodec';
+import { EntityCodec } from '@joystream/types/lib/versioned-store/EntityCodec';
 
 export const ContentLicenseValidationSchema = Yup.object().shape({
   value: Yup.string()

pioneer/packages/joy-media/src/schemas/general/CurationStatus.ts

@@ -2,7 +2,7 @@
 /** This file is generated based on JSON schema. Do not modify. */
 
 import * as Yup from 'yup';
-import { EntityCodec } from '@joystream/types/versioned-store/EntityCodec';
+import { EntityCodec } from '@joystream/types/lib/versioned-store/EntityCodec';
 
 export const CurationStatusValidationSchema = Yup.object().shape({
   value: Yup.string()

pioneer/packages/joy-media/src/schemas/general/FeaturedContent.ts

@@ -2,7 +2,7 @@
 /** This file is generated based on JSON schema. Do not modify. */
 
 import * as Yup from 'yup';
-import { EntityCodec } from '@joystream/types/versioned-store/EntityCodec';
+import { EntityCodec } from '@joystream/types/lib/versioned-store/EntityCodec';
 import { VideoType } from '../video/Video';
 import { MusicAlbumType } from '../music/MusicAlbum';
 

pioneer/packages/joy-media/src/schemas/general/Language.ts

@@ -2,7 +2,7 @@
 /** This file is generated based on JSON schema. Do not modify. */
 
 import * as Yup from 'yup';
-import { EntityCodec } from '@joystream/types/versioned-store/EntityCodec';
+import { EntityCodec } from '@joystream/types/lib/versioned-store/EntityCodec';
 
 export const LanguageValidationSchema = Yup.object().shape({
   value: Yup.string()

pioneer/packages/joy-media/src/schemas/general/MediaObject.ts

@@ -2,7 +2,7 @@
 /** This file is generated based on JSON schema. Do not modify. */
 
 import * as Yup from 'yup';
-import { EntityCodec } from '@joystream/types/versioned-store/EntityCodec';
+import { EntityCodec } from '@joystream/types/lib/versioned-store/EntityCodec';
 
 export const MediaObjectValidationSchema = Yup.object().shape({
   value: Yup.string()

pioneer/packages/joy-media/src/schemas/general/PublicationStatus.ts

@@ -2,7 +2,7 @@
 /** This file is generated based on JSON schema. Do not modify. */
 
 import * as Yup from 'yup';
-import { EntityCodec } from '@joystream/types/versioned-store/EntityCodec';
+import { EntityCodec } from '@joystream/types/lib/versioned-store/EntityCodec';
 
 export const PublicationStatusValidationSchema = Yup.object().shape({
   value: Yup.string()

pioneer/packages/joy-media/src/schemas/music/MusicAlbum.ts

@@ -2,7 +2,7 @@
 /** This file is generated based on JSON schema. Do not modify. */
 
 import * as Yup from 'yup';
-import { EntityCodec } from '@joystream/types/versioned-store/EntityCodec';
+import { EntityCodec } from '@joystream/types/lib/versioned-store/EntityCodec';
 import moment from 'moment';
 import { MusicGenreType } from './MusicGenre';
 import { MusicMoodType } from './MusicMood';

pioneer/packages/joy-media/src/schemas/music/MusicGenre.ts

@@ -2,7 +2,7 @@
 /** This file is generated based on JSON schema. Do not modify. */
 
 import * as Yup from 'yup';
-import { EntityCodec } from '@joystream/types/versioned-store/EntityCodec';
+import { EntityCodec } from '@joystream/types/lib/versioned-store/EntityCodec';
 
 export const MusicGenreValidationSchema = Yup.object().shape({
   value: Yup.string()

pioneer/packages/joy-media/src/schemas/music/MusicMood.ts

@@ -2,7 +2,7 @@
 /** This file is generated based on JSON schema. Do not modify. */
 
 import * as Yup from 'yup';
-import { EntityCodec } from '@joystream/types/versioned-store/EntityCodec';
+import { EntityCodec } from '@joystream/types/lib/versioned-store/EntityCodec';
 
 export const MusicMoodValidationSchema = Yup.object().shape({
   value: Yup.string()

pioneer/packages/joy-media/src/schemas/music/MusicTheme.ts

@@ -2,7 +2,7 @@
 /** This file is generated based on JSON schema. Do not modify. */
 
 import * as Yup from 'yup';
-import { EntityCodec } from '@joystream/types/versioned-store/EntityCodec';
+import { EntityCodec } from '@joystream/types/lib/versioned-store/EntityCodec';
 
 export const MusicThemeValidationSchema = Yup.object().shape({
   value: Yup.string()

pioneer/packages/joy-media/src/schemas/music/MusicTrack.ts

@@ -2,7 +2,7 @@
 /** This file is generated based on JSON schema. Do not modify. */
 
 import * as Yup from 'yup';
-import { EntityCodec } from '@joystream/types/versioned-store/EntityCodec';
+import { EntityCodec } from '@joystream/types/lib/versioned-store/EntityCodec';
 import moment from 'moment';
 import { LanguageType } from '../general/Language';
 import { MusicGenreType } from './MusicGenre';

pioneer/packages/joy-media/src/schemas/video/Video.ts

@@ -2,7 +2,7 @@
 /** This file is generated based on JSON schema. Do not modify. */
 
 import * as Yup from 'yup';
-import { EntityCodec } from '@joystream/types/versioned-store/EntityCodec';
+import { EntityCodec } from '@joystream/types/lib/versioned-store/EntityCodec';
 import moment from 'moment';
 import { LanguageType } from '../general/Language';
 import { VideoCategoryType } from './VideoCategory';

pioneer/packages/joy-media/src/schemas/video/VideoCategory.ts

@@ -2,7 +2,7 @@
 /** This file is generated based on JSON schema. Do not modify. */
 
 import * as Yup from 'yup';
-import { EntityCodec } from '@joystream/types/versioned-store/EntityCodec';
+import { EntityCodec } from '@joystream/types/lib/versioned-store/EntityCodec';
 
 export const VideoCategoryValidationSchema = Yup.object().shape({
   value: Yup.string()

pioneer/packages/joy-media/src/stories/MusicAlbumTracks.stories.tsx

@@ -7,7 +7,7 @@ import { MusicAlbumSamples } from './data/MusicAlbumSamples';
 import { albumTracks, AllMusicTrackSamples } from './data/MusicTrackSamples';
 import { withMockTransport } from './withMockTransport';
 import { EditMusicAlbumView } from '../music/EditMusicAlbum.view';
-import EntityId from '@joystream/types/versioned-store/EntityId';
+import EntityId from '@joystream/types/lib/versioned-store/EntityId';
 
 export default { 
 	title: 'Media | My music tracks',

pioneer/packages/joy-media/src/stories/MyChannels.stories.tsx

@@ -7,7 +7,7 @@ import { AllMockChannels } from './data/ChannelSamples';
 import { withMockTransport } from './withMockTransport';
 import EditForm from '../channels/EditChannel';
 import { EditChannelView } from '../channels/EditChannel.view';
-import { ChannelId } from '@joystream/types/content-working-group';
+import { ChannelId } from '@joystream/types/lib/content-working-group';
 import { AccountIdSamples } from './data/AccountIdSamples';
 
 export default { 

pioneer/packages/joy-media/src/stories/Playback.stories.tsx

@@ -8,7 +8,7 @@ import { Album1TrackSamples } from './data/MusicTrackSamples';
 import { MockMusicChannel, MockVideoChannel } from './data/ChannelSamples';
 import { withMockTransport } from './withMockTransport';
 import { Video } from '../mocks';
-import { EntityId } from '@joystream/types/versioned-store';
+import { EntityId } from '@joystream/types/lib/versioned-store';
 
 export default { 
 	title: 'Media | Playback',

pioneer/packages/joy-media/src/stories/UploadAudio.stories.tsx

@@ -2,8 +2,8 @@ import React from 'react';
 import { EditForm } from '../upload/UploadAudio'
 import '../index.css';
 
-import { ContentId } from '@joystream/types/media';
-import EntityId from '@joystream/types/versioned-store/EntityId';
+import { ContentId } from '@joystream/types/lib/media';
+import EntityId from '@joystream/types/lib/versioned-store/EntityId';
 import { UploadAudioView } from '../upload/UploadAudio.view';
 import { withMockTransport } from './withMockTransport';
 

pioneer/packages/joy-media/src/stories/UploadVideo.stories.tsx

@@ -2,10 +2,10 @@ import React from 'react';
 import { EditForm } from '../upload/UploadVideo'
 import '../index.css';
 
-import { ContentId } from '@joystream/types/media';
+import { ContentId } from '@joystream/types/lib/media';
 import { withMockTransport } from './withMockTransport';
 import EditVideoView from '../upload/EditVideo.view';
-import EntityId from '@joystream/types/versioned-store/EntityId';
+import EntityId from '@joystream/types/lib/versioned-store/EntityId';
 
 export default { 
 	title: 'Media | Upload video',

pioneer/packages/joy-media/src/stories/data/ChannelSamples.ts

@@ -2,8 +2,8 @@ import BN from 'bn.js';
 import { ChannelEntity } from '@polkadot/joy-media/entities/ChannelEntity';
 import { u32 } from '@polkadot/types';
 import { AccountIdSamples } from './AccountIdSamples';
-import { MemberId } from '@joystream/types/members';
-import { PrincipalId } from '@joystream/types/content-working-group';
+import { MemberId } from '@joystream/types/lib/members';
+import { PrincipalId } from '@joystream/types/lib/content-working-group';
 
 let id = 0;
 const nextId = () => ++id;

pioneer/packages/joy-media/src/transport.mock.ts

@@ -1,5 +1,5 @@
 import { MediaTransport, ChannelValidationConstraints } from './transport';
-import { Entity, Class } from '@joystream/types/versioned-store';
+import { Entity, Class } from '@joystream/types/lib/versioned-store';
 import { MusicTrackType } from './schemas/music/MusicTrack';
 import { MusicAlbumType } from './schemas/music/MusicAlbum';
 import { VideoType } from './schemas/video/Video';

pioneer/packages/joy-media/src/transport.substrate.ts

@@ -1,8 +1,8 @@
 import BN from 'bn.js';
 import { MediaTransport, ChannelValidationConstraints } from './transport';
-import { ClassId, Class, EntityId, Entity, ClassName } from '@joystream/types/versioned-store';
-import { InputValidationLengthConstraint } from '@joystream/types/forum';
-import { PlainEntity, EntityCodecResolver } from '@joystream/types/versioned-store/EntityCodec';
+import { ClassId, Class, EntityId, Entity, ClassName } from '@joystream/types/lib/versioned-store';
+import { InputValidationLengthConstraint } from '@joystream/types/lib/forum';
+import { PlainEntity, EntityCodecResolver } from '@joystream/types/lib/versioned-store/EntityCodec';
 import { MusicTrackType } from './schemas/music/MusicTrack';
 import { MusicAlbumType } from './schemas/music/MusicAlbum';
 import { VideoType } from './schemas/video/Video';
@@ -16,7 +16,7 @@ import { MusicThemeType } from './schemas/music/MusicTheme';
 import { PublicationStatusType } from './schemas/general/PublicationStatus';
 import { VideoCategoryType } from './schemas/video/VideoCategory';
 import { ChannelEntity } from './entities/ChannelEntity';
-import { ChannelId, Channel } from '@joystream/types/content-working-group';
+import { ChannelId, Channel } from '@joystream/types/lib/content-working-group';
 import { ApiPromise } from '@polkadot/api/index';
 import { ApiProps } from '@polkadot/react-api/types';
 import { Vec } from '@polkadot/types';

pioneer/packages/joy-media/src/transport.ts

@@ -1,6 +1,6 @@
 import { Transport } from '@polkadot/joy-utils/index'
 import { AccountId } from '@polkadot/types/interfaces';
-import { EntityId, Class, ClassName, unifyClassName, ClassIdByNameMap } from '@joystream/types/versioned-store';
+import { EntityId, Class, ClassName, unifyClassName, ClassIdByNameMap } from '@joystream/types/lib/versioned-store';
 import { MusicTrackType, MusicTrackCodec } from './schemas/music/MusicTrack';
 import { MusicAlbumType, MusicAlbumCodec } from './schemas/music/MusicAlbum';
 import { VideoType, VideoCodec } from './schemas/video/Video';
@@ -16,7 +16,7 @@ import { PublicationStatusType, PublicationStatusCodec } from './schemas/general
 import { VideoCategoryType, VideoCategoryCodec } from './schemas/video/VideoCategory';
 import { MediaDropdownOptions } from './common/MediaDropdownOptions';
 import { ChannelEntity } from './entities/ChannelEntity';
-import { ChannelId } from '@joystream/types/content-working-group';
+import { ChannelId } from '@joystream/types/lib/content-working-group';
 import { isVideoChannel, isPublicChannel } from './channels/ChannelHelpers';
 import { ValidationConstraint } from '@polkadot/joy-utils/ValidationConstraint';
 

pioneer/packages/joy-media/src/upload/EditVideo.view.tsx

@@ -2,8 +2,8 @@ import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { MediaView } from '../MediaView';
 import { OuterProps, EditForm } from './UploadVideo';
-import EntityId from '@joystream/types/versioned-store/EntityId';
-import { ChannelId } from '@joystream/types/content-working-group';
+import EntityId from '@joystream/types/lib/versioned-store/EntityId';
+import { ChannelId } from '@joystream/types/lib/content-working-group';
 import { JoyError } from '@polkadot/joy-utils/JoyStatus';
 
 type Props = OuterProps;

pioneer/packages/joy-media/src/upload/UploadAudio.tsx

@@ -4,11 +4,11 @@ import { Form, withFormik } from 'formik';
 import { History } from 'history';
 
 import TxButton from '@polkadot/joy-utils/TxButton';
-import { ContentId } from '@joystream/types/media';
+import { ContentId } from '@joystream/types/lib/media';
 import { onImageError } from '@polkadot/joy-utils/images';
 import { MusicTrackValidationSchema, MusicTrackType, MusicTrackClass as Fields, MusicTrackFormValues, MusicTrackToFormValues } from '../schemas/music/MusicTrack';
 import { withMediaForm, MediaFormProps, datePlaceholder } from '../common/MediaForms';
-import EntityId from '@joystream/types/versioned-store/EntityId';
+import EntityId from '@joystream/types/lib/versioned-store/EntityId';
 import { MediaDropdownOptions } from '../common/MediaDropdownOptions';
 import { FormTabs } from '../common/FormTabs';
 

pioneer/packages/joy-media/src/upload/UploadVideo.tsx

@@ -5,29 +5,29 @@ import { History } from 'history';
 import moment from 'moment';
 
 import TxButton, { OnTxButtonClick } from '@polkadot/joy-utils/TxButton';
-import { ContentId } from '@joystream/types/media';
+import { ContentId } from '@joystream/types/lib/media';
 import { onImageError } from '@polkadot/joy-utils/images';
 import { VideoValidationSchema, VideoType, VideoClass as Fields, VideoFormValues, VideoToFormValues, VideoCodec, VideoPropId } from '../schemas/video/Video';
 import { MediaFormProps, withMediaForm, datePlaceholder } from '../common/MediaForms';
-import EntityId from '@joystream/types/versioned-store/EntityId';
+import EntityId from '@joystream/types/lib/versioned-store/EntityId';
 import { MediaDropdownOptions } from '../common/MediaDropdownOptions';
 import { FormTabs } from '../common/FormTabs';
-import { ChannelId } from '@joystream/types/content-working-group';
+import { ChannelId } from '@joystream/types/lib/content-working-group';
 import { ChannelEntity } from '../entities/ChannelEntity';
-import { Credential } from '@joystream/types/versioned-store/permissions/credentials';
-import { Class, VecClassPropertyValue } from '@joystream/types/versioned-store';
+import { Credential } from '@joystream/types/lib/versioned-store/permissions/credentials';
+import { Class, VecClassPropertyValue } from '@joystream/types/lib/versioned-store';
 import { TxCallback } from '@polkadot/react-components/Status/types';
 import { SubmittableResult } from '@polkadot/api';
 import { nonEmptyStr, filterSubstrateEventsAndExtractData } from '@polkadot/joy-utils/index';
 import { u16, u32, bool, Option, Vec } from '@polkadot/types';
-import { isInternalProp } from '@joystream/types/versioned-store/EntityCodec';
+import { isInternalProp } from '@joystream/types/lib/versioned-store/EntityCodec';
 import { MediaObjectCodec } from '../schemas/general/MediaObject';
-import { Operation } from '@joystream/types/versioned-store/permissions/batching';
-import { OperationType } from '@joystream/types/versioned-store/permissions/batching/operation-types';
-import { ParametrizedEntity } from '@joystream/types/versioned-store/permissions/batching/parametrized-entity';
-import ParametrizedClassPropertyValue from '@joystream/types/versioned-store/permissions/batching/ParametrizedClassPropertyValue';
-import { ParametrizedPropertyValue } from '@joystream/types/versioned-store/permissions/batching/parametrized-property-value';
-import { ParameterizedClassPropertyValues } from '@joystream/types/versioned-store/permissions/batching/operations';
+import { Operation } from '@joystream/types/lib/versioned-store/permissions/batching';
+import { OperationType } from '@joystream/types/lib/versioned-store/permissions/batching/operation-types';
+import { ParametrizedEntity } from '@joystream/types/lib/versioned-store/permissions/batching/parametrized-entity';
+import ParametrizedClassPropertyValue from '@joystream/types/lib/versioned-store/permissions/batching/ParametrizedClassPropertyValue';
+import { ParametrizedPropertyValue } from '@joystream/types/lib/versioned-store/permissions/batching/parametrized-property-value';
+import { ParameterizedClassPropertyValues } from '@joystream/types/lib/versioned-store/permissions/batching/operations';
 import { useMyMembership } from '@polkadot/joy-utils/MyMembershipContext';
 import { isAccountAChannelOwner } from '../channels/ChannelHelpers';
 import { JoyError } from '@polkadot/joy-utils/JoyStatus';

pioneer/packages/joy-media/src/video/PlayVideo.tsx

@@ -3,7 +3,7 @@ import ReactMarkdown from 'react-markdown';
 import { Table } from 'semantic-ui-react';
 import { ApiProps } from '@polkadot/react-api/types';
 import { ApiConsumer } from '@polkadot/react-api/ApiContext';
-import EntityId from '@joystream/types/versioned-store/EntityId';
+import EntityId from '@joystream/types/lib/versioned-store/EntityId';
 import { ChannelEntity } from '../entities/ChannelEntity';
 import { ChannelPreview } from '../channels/ChannelPreview';
 import { VideoPreview } from './VideoPreview';
@@ -11,7 +11,7 @@ import { VideoType, VideoClass as Fields, VideoGenericProp } from '../schemas/vi
 import { printExplicit, printReleaseDate, printLanguage } from '../entities/EntityHelpers';
 import { MediaObjectType } from '../schemas/general/MediaObject';
 import { MediaPlayerWithResolver } from '../common/MediaPlayerWithResolver';
-import { ContentId } from '@joystream/types/media';
+import { ContentId } from '@joystream/types/lib/media';
 import { JoyError } from '@polkadot/joy-utils/JoyStatus';
 
 export type PlayVideoProps = {

pioneer/packages/joy-media/src/video/PlayVideo.view.tsx

@@ -2,8 +2,8 @@ import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { MediaView } from '../MediaView';
 import { PlayVideoProps, PlayVideo } from './PlayVideo';
-import { ChannelId } from '@joystream/types/content-working-group';
-import { EntityId } from '@joystream/types/versioned-store';
+import { ChannelId } from '@joystream/types/lib/content-working-group';
+import { EntityId } from '@joystream/types/lib/versioned-store';
 import { JoyError } from '@polkadot/joy-utils/JoyStatus';
 
 type Props = PlayVideoProps;

pioneer/packages/joy-members/src/Details.tsx

@@ -12,9 +12,9 @@ import AddressMini from '@polkadot/react-components/AddressMiniJoy';
 import { formatNumber } from '@polkadot/util';
 
 import translate from './translate';
-import { MemberId, Profile, EntryMethod, Paid, Screening, Genesis, SubscriptionId } from '@joystream/types/members';
+import { MemberId, Profile, EntryMethod, Paid, Screening, Genesis, SubscriptionId } from '@joystream/types/lib/members';
 import { queryMembershipToProp } from './utils';
-import { Seat } from '@joystream/types/';
+import { Seat } from '@joystream/types/lib/';
 import { nonEmptyStr, queryToProp } from '@polkadot/joy-utils/index';
 import { MyAccountProps, withMyAccount } from '@polkadot/joy-utils/MyAccount';
 

pioneer/packages/joy-members/src/DetailsByHandle.tsx

@@ -6,7 +6,7 @@ import { stringToU8a, u8aToHex } from '@polkadot/util';
 
 import translate from './translate';
 import Details from './Details';
-import { MemberId } from '@joystream/types/members';
+import { MemberId } from '@joystream/types/lib/members';
 import { queryMembershipToProp } from './utils';
 
 type DetailsByHandleProps = {

pioneer/packages/joy-members/src/EditForm.tsx

@@ -9,8 +9,8 @@ import Section from '@polkadot/joy-utils/Section';
 import TxButton from '@polkadot/joy-utils/TxButton';
 import * as JoyForms from '@polkadot/joy-utils/forms';
 import { SubmittableResult } from '@polkadot/api';
-import { MemberId, UserInfo, Profile, PaidTermId, PaidMembershipTerms } from '@joystream/types/members';
-import { OptionText } from '@joystream/types/';
+import { MemberId, UserInfo, Profile, PaidTermId, PaidMembershipTerms } from '@joystream/types/lib/members';
+import { OptionText } from '@joystream/types/lib/';
 import { MyAccountProps, withMyAccount } from '@polkadot/joy-utils/MyAccount';
 import { queryMembershipToProp } from './utils';
 import { withCalls } from '@polkadot/react-api/index';

pioneer/packages/joy-members/src/List.tsx

@@ -7,7 +7,7 @@ import { I18nProps } from '@polkadot/react-components/types';
 import Section from '@polkadot/joy-utils/Section';
 import translate from './translate';
 import Details from './Details';
-import { MemberId } from '@joystream/types/members';
+import { MemberId } from '@joystream/types/lib/members';
 import { RouteComponentProps, Redirect } from 'react-router-dom';
 import { Pagination, Icon, PaginationProps } from 'semantic-ui-react';
 import styled from 'styled-components';

pioneer/packages/joy-members/src/MemberPreview.tsx

@@ -9,9 +9,9 @@ import { AccountId } from '@polkadot/types/interfaces';
 import IdentityIcon from '@polkadot/react-components/IdentityIcon';
 
 import translate from './translate';
-import { MemberId, Profile } from '@joystream/types/members';
+import { MemberId, Profile } from '@joystream/types/lib/members';
 import { queryMembershipToProp } from './utils';
-import { Seat } from '@joystream/types/';
+import { Seat } from '@joystream/types/lib/';
 import { nonEmptyStr, queryToProp } from '@polkadot/joy-utils/index';
 import { FlexCenter } from '@polkadot/joy-utils/FlexCenter';
 import { MutedSpan } from '@polkadot/joy-utils/MutedText';

pioneer/packages/joy-proposals/src/Proposal/Body.tsx

@@ -5,12 +5,12 @@ import { blake2AsHex } from '@polkadot/util-crypto';
 import styled from 'styled-components';
 import AddressMini from '@polkadot/react-components/AddressMiniJoy';
 import TxButton from '@polkadot/joy-utils/TxButton';
-import { ProposalId } from "@joystream/types/proposals";
-import { MemberId } from "@joystream/types/members";
+import { ProposalId } from "@joystream/types/lib/proposals";
+import { MemberId } from "@joystream/types/lib/members";
 import ProfilePreview from "@polkadot/joy-utils/MemberProfilePreview";
 import { useTransport } from "../runtime";
 import { usePromise } from "../utils";
-import { Profile } from "@joystream/types/members";
+import { Profile } from "@joystream/types/lib/members";
 import { Option } from "@polkadot/types/";
 import { formatBalance } from "@polkadot/util";
 import PromiseComponent from "./PromiseComponent";

pioneer/packages/joy-proposals/src/Proposal/ProposalDetails.tsx

@@ -11,10 +11,10 @@ import { withCalls } from '@polkadot/react-api';
 import { withMulti } from '@polkadot/react-api/with';
 
 import "./Proposal.css";
-import { ProposalId, ProposalDecisionStatuses, ApprovedProposalStatuses, ExecutionFailedStatus } from "@joystream/types/proposals";
+import { ProposalId, ProposalDecisionStatuses, ApprovedProposalStatuses, ExecutionFailedStatus } from "@joystream/types/lib/proposals";
 import { BlockNumber } from '@polkadot/types/interfaces'
-import { MemberId } from "@joystream/types/members";
-import { Seat } from "@joystream/types/";
+import { MemberId } from "@joystream/types/lib/members";
+import { Seat } from "@joystream/types/lib/";
 import PromiseComponent from './PromiseComponent';
 
 type BasicProposalStatus = 'Active' | 'Finalized';

pioneer/packages/joy-proposals/src/Proposal/Votes.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { Header, Divider, Table, Icon } from "semantic-ui-react";
 import useVoteStyles from "./useVoteStyles";
 import { ProposalVote } from "../runtime";
-import { VoteKind } from "@joystream/types/proposals";
+import { VoteKind } from "@joystream/types/lib/proposals";
 import { VoteKindStr } from "./VotingSection";
 import ProfilePreview from "@polkadot/joy-utils/MemberProfilePreview";
 

pioneer/packages/joy-proposals/src/Proposal/VotingSection.tsx

@@ -3,12 +3,12 @@ import React, { useState } from "react";
 import { Icon, Button, Message, Divider, Header } from "semantic-ui-react";
 import useVoteStyles from "./useVoteStyles";
 import TxButton from "@polkadot/joy-utils/TxButton";
-import { MemberId } from "@joystream/types/members";
-import { ProposalId } from "@joystream/types/proposals";
+import { MemberId } from "@joystream/types/lib/members";
+import { ProposalId } from "@joystream/types/lib/proposals";
 import { useTransport } from "../runtime";
-import { VoteKind } from '@joystream/types/proposals';
+import { VoteKind } from '@joystream/types/lib/proposals';
 import { usePromise } from "../utils";
-import { VoteKinds } from "@joystream/types/proposals";
+import { VoteKinds } from "@joystream/types/lib/proposals";
 
 export type VoteKindStr = typeof VoteKinds[number];
 

pioneer/packages/joy-proposals/src/forms/GenericProposalForm.tsx

@@ -17,7 +17,7 @@ import { ProposalType } from "../runtime";
 import { calculateStake } from "../utils";
 import { formatBalance } from "@polkadot/util"
 import "./forms.css";
-import { ProposalId } from "@joystream/types/proposals";
+import { ProposalId } from "@joystream/types/lib/proposals";
 
 
 // Generic form values

pioneer/packages/joy-proposals/src/forms/SetContentWorkingGroupLeadForm.tsx

@@ -17,7 +17,7 @@ import { FormField } from "./FormFields";
 import { withFormContainer } from "./FormContainer";
 import { useTransport } from "../runtime";
 import { usePromise } from "../utils";
-import { Profile } from "@joystream/types/members";
+import { Profile } from "@joystream/types/lib/members";
 import PromiseComponent from "../Proposal/PromiseComponent";
 import _ from 'lodash';
 import "./forms.css";

pioneer/packages/joy-proposals/src/forms/SetCouncilParamsForm.tsx

@@ -19,7 +19,7 @@ import { createType } from "@polkadot/types";
 import "./forms.css";
 import { useTransport } from "../runtime";
 import { usePromise, snakeCaseToCamelCase } from "../utils";
-import { ElectionParameters } from "@joystream/types/proposals";
+import { ElectionParameters } from "@joystream/types/lib/proposals";
 import PromiseComponent from "../Proposal/PromiseComponent";
 
 type FormValues = GenericFormValues & {

pioneer/packages/joy-proposals/src/runtime/transport.substrate.ts

@@ -7,8 +7,8 @@ import {
   ProposalVote,
   IStorageRoleParameters
 } from "./transport";
-import { Proposal, ProposalId, Seats, VoteKind, ElectionParameters } from "@joystream/types/proposals";
-import { MemberId, Profile, ActorInRole, RoleKeys, Role } from "@joystream/types/members";
+import { Proposal, ProposalId, Seats, VoteKind, ElectionParameters } from "@joystream/types/lib/proposals";
+import { MemberId, Profile, ActorInRole, RoleKeys, Role } from "@joystream/types/lib/members";
 import { ApiProps } from "@polkadot/react-api/types";
 import { u32, u128, Vec, Option } from "@polkadot/types/";
 import { Balance, Moment, AccountId, BlockNumber, BalanceOf } from "@polkadot/types/interfaces";
@@ -17,8 +17,8 @@ import { ApiPromise } from "@polkadot/api";
 import { FIRST_MEMBER_ID } from "@polkadot/joy-members/constants";
 
 import { includeKeys, calculateStake, calculateMetaFromType, splitOnUpperCase } from "../utils";
-import { MintId, Mint } from "@joystream/types/mint";
-import { LeadId } from "@joystream/types/content-working-group";
+import { MintId, Mint } from "@joystream/types/lib/mint";
+import { LeadId } from "@joystream/types/lib/content-working-group";
 
 export class SubstrateTransport extends Transport {
   protected api: ApiPromise;

pioneer/packages/joy-proposals/src/runtime/transport.ts

@@ -1,5 +1,5 @@
-import { ProposalId, VoteKind } from "@joystream/types/proposals";
-import { MemberId } from "@joystream/types/members";
+import { ProposalId, VoteKind } from "@joystream/types/lib/proposals";
+import { MemberId } from "@joystream/types/lib/members";
 export const ProposalTypes = [
   "Text",
   "RuntimeUpgrade",

pioneer/packages/joy-proposals/src/stories/data/ProposalDetails.mock.ts

@@ -1,5 +1,5 @@
 import { ParsedProposal } from "../../runtime";
-import { ProposalId } from "@joystream/types/proposals"
+import { ProposalId } from "@joystream/types/lib/proposals"
 
 const mockedProposal: ParsedProposal = {
   id: new ProposalId(100),

pioneer/packages/joy-proposals/src/utils.ts

@@ -2,7 +2,7 @@ import { useState, useEffect, useCallback } from "react";
 import { ProposalType } from "./runtime";
 import { Category } from "./Proposal/ChooseProposalType";
 import { useTransport, ParsedProposal, ProposalVote } from "./runtime";
-import { ProposalId } from "@joystream/types/proposals";
+import { ProposalId } from "@joystream/types/lib/proposals";
 
 type ProposalMeta = {
   description: string;

pioneer/packages/joy-roles/src/classifiers.spec.ts

@@ -6,7 +6,7 @@ import {
   StakingPolicy,
   Opening, OpeningStage,
   ReviewPeriod,
-} from "@joystream/types/hiring"
+} from "@joystream/types/lib/hiring"
 
 import {
   OpeningState,

pioneer/packages/joy-roles/src/classifiers.ts

@@ -17,7 +17,7 @@ import {
   ApplicationDeactivationCause, ApplicationDeactivationCauseKeys,
   UnstakingApplicationStage,
   InactiveApplicationStage,
-} from "@joystream/types/hiring"
+} from "@joystream/types/lib/hiring"
 
 import {
   StakeRequirement,

pioneer/packages/joy-roles/src/elements.stories.tsx

@@ -5,7 +5,7 @@ import { Table } from 'semantic-ui-react';
 
 import { u128, Text } from '@polkadot/types'
 
-import { Actor } from '@joystream/types/roles'
+import { Actor } from '@joystream/types/lib/roles'
 
 import { BalanceView, GroupMemberView, HandleView, MemberView, MemoView } from './elements'
 

pioneer/packages/joy-roles/src/elements.tsx

@@ -6,10 +6,10 @@ import { Link } from 'react-router-dom';
 import { Balance } from '@polkadot/types/interfaces';
 import { formatBalance } from '@polkadot/util';
 import Identicon from '@polkadot/react-identicon';
-import { Actor } from '@joystream/types/roles';
-import { IProfile, MemberId } from '@joystream/types/members';
+import { Actor } from '@joystream/types/lib/roles';
+import { IProfile, MemberId } from '@joystream/types/lib/members';
 import { Text, GenericAccountId } from '@polkadot/types';
-import { LeadRoleState } from '@joystream/types/content-working-group';
+import { LeadRoleState } from '@joystream/types/lib/content-working-group';
 
 type ActorProps = {
   actor: Actor

pioneer/packages/joy-roles/src/flows/apply.controller.tsx

@@ -7,7 +7,7 @@ import AccountId from '@polkadot/types/primitive/Generic/AccountId';
 
 import { Controller, View } from '@polkadot/joy-utils/index'
 
-import { GenericJoyStreamRoleSchema } from '@joystream/types/hiring/schemas/role.schema.typings'
+import { GenericJoyStreamRoleSchema } from '@joystream/types/lib/hiring/schemas/role.schema.typings'
 
 import { Container } from 'semantic-ui-react'
 

pioneer/packages/joy-roles/src/flows/apply.elements.stories.tsx

@@ -8,7 +8,7 @@ import { Balance } from '@polkadot/types/interfaces';
 
 import {
   ApplicationDetails
-} from '@joystream/types/schemas/role.schema'
+} from '@joystream/types/lib/schemas/role.schema'
 import {
   ConfirmStakesStage, ConfirmStakesStageProps,
   ProgressStepsView, ProgressStepsProps, ProgressSteps,

pioneer/packages/joy-roles/src/flows/apply.tsx

@@ -34,7 +34,7 @@ import { Slider } from "react-semantic-ui-range";
 import Identicon from '@polkadot/react-identicon';
 import AccountId from '@polkadot/types/primitive/Generic/AccountId';
 
-import { GenericJoyStreamRoleSchema } from '@joystream/types/hiring/schemas/role.schema.typings'
+import { GenericJoyStreamRoleSchema } from '@joystream/types/lib/hiring/schemas/role.schema.typings'
 
 import {
   OpeningBodyApplicationsStatus, OpeningStakeAndApplicationStatus,
@@ -46,7 +46,7 @@ import {
   ApplicationDetails,
   QuestionField,
   QuestionSection,
-} from '@joystream/types/hiring/schemas/role.schema.typings'
+} from '@joystream/types/lib/hiring/schemas/role.schema.typings'
 
 import { Loadable } from '@polkadot/joy-utils/index'
 import { Add } from '../balances'

pioneer/packages/joy-roles/src/mocks.ts

@@ -1,7 +1,7 @@
 import { bool, Option, Text, u32, u64, Vec } from '@polkadot/types'
 import AccountId from '@polkadot/types/primitive/Generic/AccountId';
 
-import { ActorInRole, IProfile, EntryMethod } from '@joystream/types/members';
+import { ActorInRole, IProfile, EntryMethod } from '@joystream/types/lib/members';
 
 export function mockProfile(name: string, avatar_uri: string = ""): IProfile {
   return {

pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx

@@ -40,23 +40,23 @@ import {
   OpeningStage,
   StakingPolicy,
   StakingAmountLimitModeKeys,
-} from '@joystream/types/hiring'
+} from '@joystream/types/lib/hiring'
 
 import {
   Profile,
   MemberId,
-} from '@joystream/types/members'
+} from '@joystream/types/lib/members'
 
-import { Stake, StakeId } from '@joystream/types/stake'
+import { Stake, StakeId } from '@joystream/types/lib/stake'
 
 import {
   GenericJoyStreamRoleSchema,
-} from '@joystream/types/hiring/schemas/role.schema.typings'
+} from '@joystream/types/lib/hiring/schemas/role.schema.typings'
 import {
   CuratorApplication, CuratorApplicationId,
   CuratorOpening,
   OpeningPolicyCommitment, IOpeningPolicyCommitment,
-} from '@joystream/types/content-working-group'
+} from '@joystream/types/lib/content-working-group'
 
 import {
   classifyOpeningStage,

pioneer/packages/joy-roles/src/tabs/MyRoles.elements.stories.tsx

@@ -30,7 +30,7 @@ import {
 } from './Opportunities.stories'
 import { OpeningState } from "../classifiers"
 
-import { CuratorId } from '@joystream/types/content-working-group';
+import { CuratorId } from '@joystream/types/lib/content-working-group';
 
 export default {
   title: 'Roles / Components / My roles tab / Elements',

pioneer/packages/joy-roles/src/tabs/MyRoles.tsx

@@ -22,8 +22,8 @@ import { Balance } from '@polkadot/types/interfaces';
 
 import { Loadable } from '@polkadot/joy-utils/index'
 
-import { GenericJoyStreamRoleSchema } from '@joystream/types/hiring/schemas/role.schema.typings'
-import { Opening } from "@joystream/types/hiring"
+import { GenericJoyStreamRoleSchema } from '@joystream/types/lib/hiring/schemas/role.schema.typings'
+import { Opening } from "@joystream/types/lib/hiring"
 
 import {
   OpeningBodyReviewInProgress,
@@ -34,7 +34,7 @@ import {
 } from '../openingStateMarkup'
 import { CancelledReason, OpeningStageClassification, OpeningState } from "../classifiers"
 import { OpeningMetadata } from "../OpeningMetadata"
-import { CuratorId } from '@joystream/types/content-working-group';
+import { CuratorId } from '@joystream/types/lib/content-working-group';
 
 type CTACallback = (rationale: string) => void
 

pioneer/packages/joy-roles/src/tabs/Opportunities.controller.tsx

@@ -4,7 +4,7 @@ import { Controller, View } from '@polkadot/joy-utils/index'
 
 import { ITransport } from '../transport'
 
-import { MemberId } from '@joystream/types/members';
+import { MemberId } from '@joystream/types/lib/members';
 
 import {
   WorkingGroupOpening,