From 6cd1f22718e0335190b4f9d5756b1a9f3f46238e Mon Sep 17 00:00:00 2001
From: Pablo P Varela <pablovarela182@gmail.com>
Date: Thu, 21 Mar 2019 10:58:03 +0100
Subject: [PATCH] change(all): Move all remaining JS files to Typescript
 (#2875)

* Convert files that don't throw errors

* Import lodash in all missing files

* Missing lodash imports

* One missing file

* Convert more files to typescript

* Move more files

* Restore to branch version

* Move more files

* Move more files

* wip

* Last files

* Fix lint

* Some window variables

* Add angular type check

* js is now ts on tests

* yarn

* Change promise resolution

* Allow karma to run typescript files

* Fix issues with tslint

* Missing )

* Fix tsc issues

* Get old react functions back (fix e2e)

* No tson

* Fix e2e and lint errors

* Delete unused returns

* Fix tslint

* Add one more property from merge

* Fix more lint issues

* Remove any type

* Example server -> js

* Trailing comma
---
 jsconfig.json                                 | 12 +--
 karma.conf.js                                 | 11 ++-
 package.json                                  |  5 +-
 ...Controller.js => ArchiveListController.ts} |  0
 ...istController.js => BaseListController.ts} | 12 ++-
 ...rchivedItemKill.js => ArchivedItemKill.ts} |  4 +-
 .../{ContentResults.js => ContentResults.ts}  |  2 +
 .../directives/{Export.js => Export.ts}       | 11 +++
 .../directives/{ItemCrops.js => ItemCrops.ts} |  4 +-
 .../directives/{ItemLock.js => ItemLock.ts}   |  2 +
 ...{MarkedItemTitle.js => MarkedItemTitle.ts} | 11 +++
 .../{MediaMetadata.js => MediaMetadata.ts}    |  4 +-
 .../{MediaPreview.js => MediaPreview.ts}      |  2 +
 .../directives/{MediaUsed.js => MediaUsed.ts} |  5 +
 .../directives/{MediaView.js => MediaView.ts} |  2 +
 .../{ResendItem.js => ResendItem.ts}          |  5 +-
 scripts/apps/archive/{index.js => index.ts}   |  4 +-
 .../{ArchiveService.js => ArchiveService.ts}  | 20 ++--
 .../{FamilyService.js => FamilyService.ts}    | 13 ++-
 .../{MultiService.js => MultiService.ts}      |  2 +
 .../{archive.spec.js => archive.spec.ts}      | 18 ++--
 .../authoring/attachments/attachments.spec.ts |  1 +
 .../authoring/article-url-fields.tsx          |  2 +-
 .../{authoring.spec.js => authoring.spec.ts}  | 17 ++--
 .../authoring/{constants.js => constants.ts}  |  2 +-
 .../controllers/AssociationController.ts      |  3 +-
 ...itDirective.js => ArticleEditDirective.ts} |  5 +-
 ...ringDirective.js => AuthoringDirective.ts} | 33 +++----
 ...ctive.js => AuthoringEmbeddedDirective.ts} |  9 +-
 ...ewDirective.js => FullPreviewDirective.ts} |  2 +
 ...ive.js => ItemActionsByIntentDirective.ts} |  4 +-
 ...lDirective.js => ItemCarouselDirective.ts} | 29 +++---
 .../{ReadingTime.js => ReadingTime.ts}        |  4 +-
 .../directives/{SendItem.js => SendItem.tsx}  | 25 +++--
 ...irective.js => TansaScopeSyncDirective.ts} |  4 +-
 .../authoring/{helpers.js => helpers.ts}      | 22 ++---
 .../authoring/preview-test-server/server.js   |  6 +-
 ...uthoringService.js => AuthoringService.ts} | 14 +--
 ...esService.js => AuthoringThemesService.ts} |  2 +-
 ...{AutosaveService.js => AutosaveService.ts} |  2 +
 ...roller.js => CompareVersionsController.ts} |  4 +
 ...nsService.js => CompareVersionsService.ts} | 14 ++-
 ....js => CompareVersionsArticleDirective.ts} | 15 ++-
 ...js => CompareVersionsDropdownDirective.ts} |  9 +-
 ... CompareVersionsDropdownInnerDirective.ts} | 10 +-
 .../{find-replace.js => find-replace.ts}      |  3 +-
 .../authoring/macros/{macros.js => macros.ts} |  3 +-
 .../metadata/{metadata.js => metadata.ts}     | 35 ++++---
 .../multiedit/{multiedit.js => multiedit.ts}  |  4 +-
 .../packages/{packages.js => packages.ts}     |  1 +
 ...gestController.js => SuggestController.ts} |  3 +
 ...uggestDirective.js => SuggestDirective.ts} |  4 +
 .../{SuggestService.js => SuggestService.ts}  |  5 +
 .../{authoring.spec.js => authoring.spec.ts}  | 14 +--
 ...hangeImage.spec.js => changeImage.spec.ts} |  9 +-
 .../translations/{index.js => index.ts}       |  2 +-
 ...toryController.js => HistoryController.ts} |  7 +-
 ...ive.js => TransmissionDetailsDirective.ts} |  6 +-
 scripts/apps/authoring/widgets/widgets.ts     |  4 +-
 ...ctsController.js => ContactsController.ts} | 11 ++-
 .../{ContactList.js => ContactList.ts}        |  7 +-
 ...ve.js => ContactsSearchPanelDirective.tsx} | 15 +--
 ...e.js => ContactsSearchResultsDirective.ts} | 21 +++-
 ...rective.js => ContactsSortBarDirective.ts} |  2 +
 .../apps/contacts/{helpers.js => helpers.ts}  |  5 +-
 ...{ContactsService.js => ContactsService.ts} | 11 ++-
 ...IController.js => ContentAPIController.ts} |  7 +-
 ...e.js => ContentAPISearchPanelDirective.ts} |  5 +-
 ...js => ContentAPISearchResultsDirective.ts} | 23 +++--
 ...ctive.js => ContentAPISortBarDirective.ts} |  2 +
 ...hService.js => ContentAPISearchService.ts} | 47 +++++----
 ...oller.js => FilterConditionsController.ts} |  3 +-
 ...r.js => ManageContentFiltersController.ts} |  5 +-
 ...troller.js => ProductionTestController.ts} |  5 +-
 ...rective.js => DeskRoutingInfoDirective.ts} |  0
 .../closed-desk/{index.js => index.ts}        | 17 ++--
 ...onfigController.js => ConfigController.ts} |  4 +-
 ...rdController.js => DashboardController.ts} |  3 +-
 scripts/apps/dashboard/{index.js => index.ts} |  2 +
 ...ashboardWidgets.js => DashboardWidgets.ts} |  2 +
 .../workspace-tasks/{tasks.js => tasks.ts}    |  6 +-
 .../tests/{tasks.spec.js => tasks.spec.ts}    |  1 +
 .../{world-clock.js => world-clock.ts}        |  3 +-
 ...gController.js => DeskConfigController.ts} |  7 +-
 ...istController.js => DeskListController.ts} |  2 +
 .../{ActionPicker.js => ActionPicker.ts}      |  6 +-
 .../{ContentExpiry.js => ContentExpiry.ts}    |  2 +
 .../{DeskSelect.js => DeskSelect.ts}          |  2 +
 .../{DeskeditPeople.js => DeskeditPeople.ts}  |  1 +
 .../{DeskeditStages.js => DeskeditStages.ts}  | 10 +-
 .../{FocusElement.js => FocusElement.ts}      |  4 +-
 ...ective.js => UserRoleItemListDirective.ts} |  2 +
 .../{UserSelectList.js => UserSelectList.ts}  |  2 +
 .../{DesksFactory.js => DesksFactory.ts}      |  3 +-
 ...eople.spec.js => sdDeskEditPeople.spec.ts} |  2 +-
 ...oller.js => DictionaryConfigController.ts} |  3 +-
 ...troller.js => DictionaryEditController.ts} |  3 +-
 ...tionaryService.js => DictionaryService.ts} |  4 +-
 ...ighlightsConfig.js => HighlightsConfig.ts} |  2 +-
 ...ightsSettings.js => HighlightsSettings.ts} |  2 +
 ...{HighlightsLabel.js => HighlightsLabel.ts} |  2 +
 ...down.js => MultiMarkHighlightsDropdown.ts} |  2 +
 ...earchHighlights.js => SearchHighlights.ts} |  2 +
 ...hlightsService.js => HighlightsService.ts} |  5 +-
 ...{highlights.spec.js => highlights.spec.ts} |  1 -
 ...roller.js => IngestDashboardController.ts} |  3 +-
 ...tController.js => IngestListController.ts} |  1 +
 ...outingAction.js => IngestRoutingAction.ts} |  5 +-
 ...tingContent.js => IngestRoutingContent.ts} | 12 ++-
 ...outingFilter.js => IngestRoutingFilter.ts} |  8 +-
 ...tingGeneral.js => IngestRoutingGeneral.ts} |  6 +-
 ...tRulesContent.js => IngestRulesContent.ts} |  1 +
 ...rcesContent.js => IngestSourcesContent.ts} | 18 ++--
 ...serDashboard.js => IngestUserDashboard.ts} |  4 +-
 .../ingest/filters/{index.js => index.ts}     |  2 +
 ...derService.js => IngestProviderService.ts} |  4 +-
 ...tedService.js => RemoveIngestedService.ts} |  2 +
 .../{SendService.js => SendService.ts}        | 31 +++---
 .../{SubjectService.js => SubjectService.ts}  |  2 +
 .../tests/{ingest.spec.js => ingest.spec.ts}  |  6 +-
 ...ontroller.js => LegalArchiveController.ts} |  2 +
 ...egalItemSortbar.js => LegalItemSortbar.ts} |  2 +
 ...chiveService.js => LegalArchiveService.ts} |  5 +-
 .../{AggregateCtrl.js => AggregateCtrl.ts}    |  4 +-
 ...kNotifications.js => DeskNotifications.ts} |  4 +-
 ...{ItemActionsMenu.js => ItemActionsMenu.ts} |  4 +-
 .../{MonitoringView.js => MonitoringView.ts}  |  5 +-
 .../{WidgetGroup.js => WidgetGroup.ts}        | 28 +++---
 .../{CardsService.js => CardsService.ts}      |  6 +-
 ...{monitoring.spec.js => monitoring.spec.ts} |  9 +-
 ...earchWidgetCtrl.js => SearchWidgetCtrl.ts} |  4 +-
 .../directives/{Package.js => Package.ts}     |  2 +
 ...geItemPreview.js => PackageItemPreview.ts} |  2 +
 ...ackageItemsEdit.js => PackageItemsEdit.ts} | 13 +--
 ...{PackagesService.js => PackagesService.ts} | 12 ++-
 ...troller.js => ProductsConfigController.ts} |  1 +
 ...{ProductsFactory.js => ProductsFactory.ts} |  2 +
 ...ontroller.js => PublishQueueController.ts} | 26 ++---
 ...rsDirective.js => SubscribersDirective.ts} |  8 +-
 ...ribersService.js => SubscribersService.ts} |  2 +
 .../{directive.js => directive.ts}            |  9 +-
 .../apps/search/components/DesksDropdown.ts   |  3 +-
 .../apps/search/components/HighlightsInfo.tsx |  6 +-
 .../apps/search/components/ListTypeIcon.tsx   |  2 +-
 .../search/components/MarkedDesksInfo.tsx     |  6 +-
 .../components/actions-menu/ActionsMenu.tsx   |  2 +-
 .../search/components/actions-menu/Item.tsx   |  3 +-
 .../fields/{highlights.js => highlights.ts}   |  2 +-
 .../fields/{markedDesks.js => markedDesks.ts} |  2 +-
 .../fields/{slugline.js => slugline.ts}       |  6 +-
 .../fields/{wordcount.js => wordcount.ts}     |  6 +-
 .../{BaseSortBar.js => BaseSortBar.ts}        |  3 +
 .../directives/{ItemList.js => ItemList.ts}   |  8 +-
 .../{ItemSearchbar.js => ItemSearchbar.ts}    |  2 +
 .../{ItemSortbar.js => ItemSortbar.ts}        |  5 +
 .../{MultiActionBar.js => MultiActionBar.ts}  |  2 +
 .../{SearchFilters.js => SearchFilters.ts}    | 10 +-
 .../{SearchPanel.js => SearchPanel.ts}        |  4 +-
 ...earchParameters.js => SearchParameters.ts} |  5 +-
 .../{SearchResults.js => SearchResults.ts}    | 27 +++---
 .../{SearchTags.js => SearchTags.ts}          |  1 +
 scripts/apps/search/helpers.ts                |  2 +-
 ...SearchService.js => SavedSearchService.ts} |  2 +
 .../{SearchService.js => SearchService.ts}    | 80 +++++++--------
 .../{SortService.js => SortService.ts}        |  6 +-
 .../services/{TagService.js => TagService.ts} | 15 +--
 .../tests/{search.spec.js => search.spec.ts}  | 11 +--
 .../{RoleUnique.js => RoleUnique.ts}          |  2 +-
 ...treamController.js => StreamController.ts} |  4 +-
 ...eEditorModal.js => TemplateEditorModal.ts} |  2 +
 ...atesDirective.js => TemplatesDirective.ts} | 18 ++--
 .../templates/filters/{index.js => index.ts}  |  2 +
 ...emplatesService.js => TemplatesService.ts} | 25 ++---
 ...tionDropdown.js => TranslationDropdown.ts} |  2 +
 ...ropdown.js => TranslationReactDropdown.ts} | 25 +++--
 ...lationService.js => TranslationService.ts} |  7 +-
 ...ontroller.js => ChangeAvatarController.ts} |  6 +-
 ...istController.js => UserListController.ts} |  4 +-
 ...rective.js => RolesPrivilegesDirective.ts} |  1 +
 ...rListDirective.js => UserListDirective.ts} |  2 +-
 ...tioDirective.js => UserMentioDirective.ts} |  4 +-
 .../directives/UserPreferencesDirective.ts    |  3 +-
 ...irective.js => UserPrivilegesDirective.ts} |  3 +-
 .../users/import/{import.js => import.ts}     |  6 +-
 scripts/apps/users/{index.js => index.ts}     |  6 +-
 .../{RolesService.js => RolesService.ts}      |  2 +
 .../{ProfileService.js => ProfileService.ts}  |  4 +-
 ...{UserListService.js => UserListService.ts} |  4 +-
 ...serPopupService.js => UserPopupService.ts} |  4 +-
 .../{UsersService.js => UsersService.ts}      |  4 +-
 ...leges.spec.js => sdUserPrivileges.spec.ts} | 10 +-
 .../tests/{users.spec.js => users.spec.ts}    |  7 +-
 .../{ContentService.js => ContentService.ts}  | 15 +--
 ...ctive.js => WorkspaceDropdownDirective.ts} |  2 +
 ...belForFieldId.js => getLabelForFieldId.ts} |  0
 ...irective.js => activity-list-directive.ts} |  2 +-
 .../analytics/{analytics.js => analytics.ts}  | 15 ++-
 ...pi-service.spec.js => api-service.spec.ts} |  4 +-
 .../api/{api-service.js => api-service.ts}    | 24 +++--
 ...nt-factory.js => http-endpoint-factory.ts} |  2 +-
 ...{request-service.js => request-service.ts} |  0
 ...or.spec.js => timeout-interceptor.spec.ts} |  5 +-
 ...ter.spec.js => basic-auth-adapter.spec.ts} |  0
 scripts/core/{config.js => config.ts}         |  5 +-
 ...date-directive.js => absdate-directive.ts} |  1 +
 .../datetime/{datetime.js => datetime.ts}     |  6 +-
 ...-directive.js => group-dates-directive.ts} |  2 +
 ...omplex.js => reldate-directive-complex.ts} |  1 +
 ...date-directive.js => reldate-directive.ts} |  0
 ...ckAllDirective.js => CheckAllDirective.ts} |  2 +
 ...ounceDirective.js => DebounceDirective.ts} |  2 +
 .../directives/PasswordStrengthDirective.ts   |  2 +-
 ...irective.js => PhoneHomeModalDirective.ts} |  3 +
 ...istDirective.js => SearchListDirective.ts} |  6 +-
 ...ective.js => SearchListSingleDirective.ts} |  2 +
 ...ottleDirective.js => ThrottleDirective.ts} |  2 +
 ...amsDirective.js => WithParamsDirective.ts} |  4 +-
 .../{add-embed.ctrl.js => add-embed.ctrl.ts}  | 10 +-
 .../{customAnchor.js => customAnchor.ts}      |  4 +
 .../{editor.ctrl.js => editor.ctrl.ts}        | 86 ++++++++--------
 scripts/core/editor2/{editor.js => editor.ts} | 52 +++++-----
 scripts/core/editor2/embedCodeHandlers.ts     |  2 +-
 .../editor3/actions/tests/toolbar.spec.tsx    |  2 +-
 scripts/core/editor3/components/Editor3.tsx   |  2 +-
 .../editor3/components/Editor3Component.tsx   |  2 +-
 .../annotations/AnnotationInput.tsx           |  2 +-
 .../annotations/AnnotationPopup.tsx           |  2 +-
 .../components/comments/CommentInput.tsx      |  2 +-
 .../editor3/components/embeds/EmbedBlock.tsx  |  2 +-
 .../editor3/components/embeds/EmbedInput.tsx  |  2 +-
 .../components/embeds/loadIframely.tsx        |  2 +-
 .../editor3/components/links/LinkInput.tsx    |  2 +-
 .../editor3/components/links/LinkToolbar.tsx  |  2 +-
 .../editor3/components/media/MediaBlock.tsx   |  2 +-
 .../spellchecker/SpellcheckerContextMenu.tsx  |  2 +-
 .../suggestions/SuggestionPopup.tsx           |  2 +-
 .../editor3/components/tables/TableBlock.tsx  |  2 +-
 .../editor3/components/tests/embeds.spec.tsx  |  2 +-
 .../components/tests/spellchecker.spec.tsx    |  4 +-
 .../editor3/{directive.js => directive.tsx}   | 43 ++++++--
 ...Data.spec.js => editor3CustomData.spec.ts} |  6 +-
 ...tor3CustomData.js => editor3CustomData.ts} |  4 +-
 ...ghts.js => handleBeforeInputHighlights.ts} |  9 +-
 ....js => htmlComesFromDraftjsEditor.spec.ts} |  2 +-
 .../{inlineStyles.js => inlineStyles.ts}      | 14 ++-
 ... => insertAtomicBlockWithoutEmptyLines.ts} |  8 +-
 .../{removeFormat.js => removeFormat.ts}      | 10 +-
 ...ectionIterator.js => selectionIterator.ts} |  2 +-
 scripts/core/editor3/helpers/tansa.ts         | 17 ++--
 .../html/from-html/{index.js => index.ts}     | 14 ++-
 ...t.spec.jsx => from-html-snapshot.spec.tsx} |  1 -
 .../{from-html.spec.js => from-html.spec.ts}  |  7 +-
 .../{to-html.spec.js => to-html.spec.ts}      |  7 +-
 ...micBlockParser.js => AtomicBlockParser.ts} |  7 +-
 ...EntityWrapper.js => BlockEntityWrapper.ts} |  4 +
 ...eWrapper.js => BlockInlineStyleWrapper.ts} |  7 +-
 .../{HTMLGenerator.js => HTMLGenerator.ts}    |  8 ++
 .../core/editor3/store/{index.js => index.ts} | 25 +++--
 .../core/editor3/store/tests/store.spec.tsx   |  2 +-
 .../core/editor3/tests/editor3core.spec.tsx   |  2 +-
 scripts/core/elastic/{es.js => es.ts}         |  2 +-
 scripts/core/filters/{index.js => index.ts}   |  8 +-
 .../open-external-links-in-new-tab.js         | 29 ------
 .../open-external-links-in-new-tab.ts         | 28 ++++++
 ...ationFrame.js => onEveryAnimationFrame.ts} |  4 +-
 ...acking.js => stickElementsWithTracking.ts} |  5 +-
 scripts/core/helpers/{uuid.js => uuid.ts}     |  9 +-
 scripts/core/{index.js => index.ts}           |  2 +
 scripts/core/itemList/itemList.ts             |  1 +
 .../keyboard/{keyboard.js => keyboard.ts}     | 27 +++---
 .../{keyboard.spec.js => keyboard.spec.ts}    |  5 +-
 scripts/core/lang/{index.js => index.ts}      |  0
 ...ngs.js => missing-translations-strings.ts} |  3 +
 scripts/core/list/{list.js => list.ts}        |  6 +-
 .../{notifications.js => notifications.ts}    | 19 ++--
 .../{notification.js => notification.ts}      |  5 +-
 scripts/core/services/{data.js => data.ts}    | 10 +-
 .../core/services/{entity.js => entity.ts}    |  4 +-
 scripts/core/services/modalService.spec.ts    | 12 ++-
 ...ssionsService.js => permissionsService.ts} |  2 +
 ...rencesService.js => preferencesService.ts} | 21 ++--
 .../core/services/{server.js => server.ts}    | 20 ++--
 .../{serverConfig.js => serverConfig.ts}      |  4 +-
 .../services/{translate.js => translate.ts}   |  3 +-
 ...{workflowService.js => workflowService.ts} |  2 +
 .../{spellcheck.js => spellcheck.ts}          | 21 ++--
 scripts/core/ui/components/Form/LinkInput.tsx |  3 +-
 scripts/core/ui/{ui.js => ui.ts}              | 19 ++--
 .../{crop-directive.js => crop-directive.ts}  | 13 +--
 scripts/core/upload/sdImageCrop.spec.ts       |  2 +-
 .../{sdImageModify.js => sdImageModify.ts}    | 12 +--
 ...irective.js => video-capture-directive.ts} | 12 +--
 scripts/globals.d.ts                          | 15 ++-
 scripts/{index.js => index.ts}                |  4 +-
 scripts/{tests.js => tests.ts}                |  0
 tsconfig.json                                 |  1 +
 yarn.lock                                     | 97 ++++++++++++++++---
 297 files changed, 1414 insertions(+), 908 deletions(-)
 rename scripts/apps/archive/controllers/{ArchiveListController.js => ArchiveListController.ts} (100%)
 rename scripts/apps/archive/controllers/{BaseListController.js => BaseListController.ts} (90%)
 rename scripts/apps/archive/directives/{ArchivedItemKill.js => ArchivedItemKill.ts} (94%)
 rename scripts/apps/archive/directives/{ContentResults.js => ContentResults.ts} (99%)
 rename scripts/apps/archive/directives/{Export.js => Export.ts} (96%)
 rename scripts/apps/archive/directives/{ItemCrops.js => ItemCrops.ts} (95%)
 rename scripts/apps/archive/directives/{ItemLock.js => ItemLock.ts} (98%)
 rename scripts/apps/archive/directives/{MarkedItemTitle.js => MarkedItemTitle.ts} (97%)
 rename scripts/apps/archive/directives/{MediaMetadata.js => MediaMetadata.ts} (95%)
 rename scripts/apps/archive/directives/{MediaPreview.js => MediaPreview.ts} (99%)
 rename scripts/apps/archive/directives/{MediaUsed.js => MediaUsed.ts} (96%)
 rename scripts/apps/archive/directives/{MediaView.js => MediaView.ts} (99%)
 rename scripts/apps/archive/directives/{ResendItem.js => ResendItem.ts} (94%)
 rename scripts/apps/archive/{index.js => index.ts} (99%)
 rename scripts/apps/archive/services/{ArchiveService.js => ArchiveService.ts} (92%)
 rename scripts/apps/archive/services/{FamilyService.js => FamilyService.ts} (96%)
 rename scripts/apps/archive/services/{MultiService.js => MultiService.ts} (99%)
 rename scripts/apps/archive/tests/{archive.spec.js => archive.spec.ts} (97%)
 rename scripts/apps/authoring/authoring/{authoring.spec.js => authoring.spec.ts} (93%)
 rename scripts/apps/authoring/authoring/{constants.js => constants.ts} (99%)
 rename scripts/apps/authoring/authoring/directives/{ArticleEditDirective.js => ArticleEditDirective.ts} (99%)
 rename scripts/apps/authoring/authoring/directives/{AuthoringDirective.js => AuthoringDirective.ts} (98%)
 rename scripts/apps/authoring/authoring/directives/{AuthoringEmbeddedDirective.js => AuthoringEmbeddedDirective.ts} (93%)
 rename scripts/apps/authoring/authoring/directives/{FullPreviewDirective.js => FullPreviewDirective.ts} (99%)
 rename scripts/apps/authoring/authoring/directives/{ItemActionsByIntentDirective.js => ItemActionsByIntentDirective.ts} (98%)
 rename scripts/apps/authoring/authoring/directives/{ItemCarouselDirective.js => ItemCarouselDirective.ts} (93%)
 rename scripts/apps/authoring/authoring/directives/{ReadingTime.js => ReadingTime.ts} (91%)
 rename scripts/apps/authoring/authoring/directives/{SendItem.js => SendItem.tsx} (98%)
 rename scripts/apps/authoring/authoring/directives/{TansaScopeSyncDirective.js => TansaScopeSyncDirective.ts} (91%)
 rename scripts/apps/authoring/authoring/{helpers.js => helpers.ts} (94%)
 rename scripts/apps/authoring/authoring/services/{AuthoringService.js => AuthoringService.ts} (98%)
 rename scripts/apps/authoring/authoring/services/{AuthoringThemesService.js => AuthoringThemesService.ts} (98%)
 rename scripts/apps/authoring/authoring/services/{AutosaveService.js => AutosaveService.ts} (98%)
 rename scripts/apps/authoring/compare-versions/{CompareVersionsController.js => CompareVersionsController.ts} (96%)
 rename scripts/apps/authoring/compare-versions/{CompareVersionsService.js => CompareVersionsService.ts} (96%)
 rename scripts/apps/authoring/compare-versions/directives/{CompareVersionsArticleDirective.js => CompareVersionsArticleDirective.ts} (97%)
 rename scripts/apps/authoring/compare-versions/directives/{CompareVersionsDropdownDirective.js => CompareVersionsDropdownDirective.ts} (96%)
 rename scripts/apps/authoring/compare-versions/directives/{CompareVersionsDropdownInnerDirective.js => CompareVersionsDropdownInnerDirective.ts} (90%)
 rename scripts/apps/authoring/editor/{find-replace.js => find-replace.ts} (97%)
 rename scripts/apps/authoring/macros/{macros.js => macros.ts} (99%)
 rename scripts/apps/authoring/metadata/{metadata.js => metadata.ts} (98%)
 rename scripts/apps/authoring/multiedit/{multiedit.js => multiedit.ts} (99%)
 rename scripts/apps/authoring/packages/{packages.js => packages.ts} (98%)
 rename scripts/apps/authoring/suggest/{SuggestController.js => SuggestController.ts} (98%)
 rename scripts/apps/authoring/suggest/{SuggestDirective.js => SuggestDirective.ts} (97%)
 rename scripts/apps/authoring/suggest/{SuggestService.js => SuggestService.ts} (97%)
 rename scripts/apps/authoring/tests/{authoring.spec.js => authoring.spec.ts} (99%)
 rename scripts/apps/authoring/tests/{changeImage.spec.js => changeImage.spec.ts} (98%)
 rename scripts/apps/authoring/translations/{index.js => index.ts} (98%)
 rename scripts/apps/authoring/versioning/history/{HistoryController.js => HistoryController.ts} (98%)
 rename scripts/apps/authoring/versioning/history/{TransmissionDetailsDirective.js => TransmissionDetailsDirective.ts} (96%)
 rename scripts/apps/contacts/controllers/{ContactsController.js => ContactsController.ts} (94%)
 rename scripts/apps/contacts/directives/{ContactList.js => ContactList.ts} (96%)
 rename scripts/apps/contacts/directives/{ContactsSearchPanelDirective.js => ContactsSearchPanelDirective.tsx} (96%)
 rename scripts/apps/contacts/directives/{ContactsSearchResultsDirective.js => ContactsSearchResultsDirective.ts} (90%)
 rename scripts/apps/contacts/directives/{ContactsSortBarDirective.js => ContactsSortBarDirective.ts} (97%)
 rename scripts/apps/contacts/{helpers.js => helpers.ts} (98%)
 rename scripts/apps/contacts/services/{ContactsService.js => ContactsService.ts} (95%)
 rename scripts/apps/content-api/controllers/{ContentAPIController.js => ContentAPIController.ts} (94%)
 rename scripts/apps/content-api/directives/{ContentAPISearchPanelDirective.js => ContentAPISearchPanelDirective.ts} (96%)
 rename scripts/apps/content-api/directives/{ContentAPISearchResultsDirective.js => ContentAPISearchResultsDirective.ts} (89%)
 rename scripts/apps/content-api/directives/{ContentAPISortBarDirective.js => ContentAPISortBarDirective.ts} (97%)
 rename scripts/apps/content-api/services/{ContentAPISearchService.js => ContentAPISearchService.ts} (76%)
 rename scripts/apps/content-filters/controllers/{FilterConditionsController.js => FilterConditionsController.ts} (99%)
 rename scripts/apps/content-filters/controllers/{ManageContentFiltersController.js => ManageContentFiltersController.ts} (99%)
 rename scripts/apps/content-filters/controllers/{ProductionTestController.js => ProductionTestController.ts} (98%)
 rename scripts/apps/dashboard/closed-desk/{DeskRoutingInfoDirective.js => DeskRoutingInfoDirective.ts} (100%)
 rename scripts/apps/dashboard/closed-desk/{index.js => index.ts} (93%)
 rename scripts/apps/dashboard/controllers/{ConfigController.js => ConfigController.ts} (70%)
 rename scripts/apps/dashboard/controllers/{DashboardController.js => DashboardController.ts} (99%)
 rename scripts/apps/dashboard/{index.js => index.ts} (98%)
 rename scripts/apps/dashboard/services/{DashboardWidgets.js => DashboardWidgets.ts} (91%)
 rename scripts/apps/dashboard/workspace-tasks/{tasks.js => tasks.ts} (98%)
 rename scripts/apps/dashboard/workspace-tasks/tests/{tasks.spec.js => tasks.spec.ts} (99%)
 rename scripts/apps/dashboard/world-clock/{world-clock.js => world-clock.ts} (99%)
 rename scripts/apps/desks/controllers/{DeskConfigController.js => DeskConfigController.ts} (91%)
 rename scripts/apps/desks/controllers/{DeskListController.js => DeskListController.ts} (98%)
 rename scripts/apps/desks/directives/{ActionPicker.js => ActionPicker.ts} (91%)
 rename scripts/apps/desks/directives/{ContentExpiry.js => ContentExpiry.ts} (99%)
 rename scripts/apps/desks/directives/{DeskSelect.js => DeskSelect.ts} (99%)
 rename scripts/apps/desks/directives/{DeskeditPeople.js => DeskeditPeople.ts} (99%)
 rename scripts/apps/desks/directives/{DeskeditStages.js => DeskeditStages.ts} (95%)
 rename scripts/apps/desks/directives/{FocusElement.js => FocusElement.ts} (81%)
 rename scripts/apps/desks/directives/{UserRoleItemListDirective.js => UserRoleItemListDirective.ts} (97%)
 rename scripts/apps/desks/directives/{UserSelectList.js => UserSelectList.ts} (99%)
 rename scripts/apps/desks/services/{DesksFactory.js => DesksFactory.ts} (99%)
 rename scripts/apps/desks/tests/{sdDeskEditPeople.spec.js => sdDeskEditPeople.spec.ts} (99%)
 rename scripts/apps/dictionaries/controllers/{DictionaryConfigController.js => DictionaryConfigController.ts} (98%)
 rename scripts/apps/dictionaries/controllers/{DictionaryEditController.js => DictionaryEditController.ts} (99%)
 rename scripts/apps/dictionaries/services/{DictionaryService.js => DictionaryService.ts} (99%)
 rename scripts/apps/highlights/controllers/{HighlightsConfig.js => HighlightsConfig.ts} (98%)
 rename scripts/apps/highlights/controllers/{HighlightsSettings.js => HighlightsSettings.ts} (94%)
 rename scripts/apps/highlights/directives/{HighlightsLabel.js => HighlightsLabel.ts} (95%)
 rename scripts/apps/highlights/directives/{MultiMarkHighlightsDropdown.js => MultiMarkHighlightsDropdown.ts} (98%)
 rename scripts/apps/highlights/directives/{SearchHighlights.js => SearchHighlights.ts} (96%)
 rename scripts/apps/highlights/services/{HighlightsService.js => HighlightsService.ts} (98%)
 rename scripts/apps/highlights/tests/{highlights.spec.js => highlights.spec.ts} (99%)
 rename scripts/apps/ingest/controllers/{IngestDashboardController.js => IngestDashboardController.ts} (96%)
 rename scripts/apps/ingest/controllers/{IngestListController.js => IngestListController.ts} (98%)
 rename scripts/apps/ingest/directives/{IngestRoutingAction.js => IngestRoutingAction.ts} (96%)
 rename scripts/apps/ingest/directives/{IngestRoutingContent.js => IngestRoutingContent.ts} (95%)
 rename scripts/apps/ingest/directives/{IngestRoutingFilter.js => IngestRoutingFilter.ts} (94%)
 rename scripts/apps/ingest/directives/{IngestRoutingGeneral.js => IngestRoutingGeneral.ts} (83%)
 rename scripts/apps/ingest/directives/{IngestRulesContent.js => IngestRulesContent.ts} (99%)
 rename scripts/apps/ingest/directives/{IngestSourcesContent.js => IngestSourcesContent.ts} (98%)
 rename scripts/apps/ingest/directives/{IngestUserDashboard.js => IngestUserDashboard.ts} (98%)
 rename scripts/apps/ingest/filters/{index.js => index.ts} (96%)
 rename scripts/apps/ingest/services/{IngestProviderService.js => IngestProviderService.ts} (98%)
 rename scripts/apps/ingest/services/{RemoveIngestedService.js => RemoveIngestedService.ts} (97%)
 rename scripts/apps/ingest/services/{SendService.js => SendService.ts} (93%)
 rename scripts/apps/ingest/services/{SubjectService.js => SubjectService.ts} (98%)
 rename scripts/apps/ingest/tests/{ingest.spec.js => ingest.spec.ts} (96%)
 rename scripts/apps/legal-archive/controllers/{LegalArchiveController.js => LegalArchiveController.ts} (98%)
 rename scripts/apps/legal-archive/directives/{LegalItemSortbar.js => LegalItemSortbar.ts} (98%)
 rename scripts/apps/legal-archive/services/{LegalArchiveService.js => LegalArchiveService.ts} (97%)
 rename scripts/apps/monitoring/controllers/{AggregateCtrl.js => AggregateCtrl.ts} (99%)
 rename scripts/apps/monitoring/directives/{DeskNotifications.js => DeskNotifications.ts} (96%)
 rename scripts/apps/monitoring/directives/{ItemActionsMenu.js => ItemActionsMenu.ts} (97%)
 rename scripts/apps/monitoring/directives/{MonitoringView.js => MonitoringView.ts} (97%)
 rename scripts/apps/monitoring/directives/{WidgetGroup.js => WidgetGroup.ts} (94%)
 rename scripts/apps/monitoring/services/{CardsService.js => CardsService.ts} (96%)
 rename scripts/apps/monitoring/tests/{monitoring.spec.js => monitoring.spec.ts} (99%)
 rename scripts/apps/packaging/controllers/{SearchWidgetCtrl.js => SearchWidgetCtrl.ts} (98%)
 rename scripts/apps/packaging/directives/{Package.js => Package.ts} (97%)
 rename scripts/apps/packaging/directives/{PackageItemPreview.js => PackageItemPreview.ts} (99%)
 rename scripts/apps/packaging/directives/{PackageItemsEdit.js => PackageItemsEdit.ts} (91%)
 rename scripts/apps/packaging/services/{PackagesService.js => PackagesService.ts} (95%)
 rename scripts/apps/products/controllers/{ProductsConfigController.js => ProductsConfigController.ts} (99%)
 rename scripts/apps/products/services/{ProductsFactory.js => ProductsFactory.ts} (98%)
 rename scripts/apps/publish/controllers/{PublishQueueController.js => PublishQueueController.ts} (91%)
 rename scripts/apps/publish/directives/{SubscribersDirective.js => SubscribersDirective.ts} (99%)
 rename scripts/apps/publish/services/{SubscribersService.js => SubscribersService.ts} (98%)
 rename scripts/apps/search-providers/{directive.js => directive.ts} (97%)
 rename scripts/apps/search/components/fields/{highlights.js => highlights.ts} (93%)
 rename scripts/apps/search/components/fields/{markedDesks.js => markedDesks.ts} (93%)
 rename scripts/apps/search/components/fields/{slugline.js => slugline.ts} (90%)
 rename scripts/apps/search/components/fields/{wordcount.js => wordcount.ts} (67%)
 rename scripts/apps/search/directives/{BaseSortBar.js => BaseSortBar.ts} (94%)
 rename scripts/apps/search/directives/{ItemList.js => ItemList.ts} (98%)
 rename scripts/apps/search/directives/{ItemSearchbar.js => ItemSearchbar.ts} (98%)
 rename scripts/apps/search/directives/{ItemSortbar.js => ItemSortbar.ts} (96%)
 rename scripts/apps/search/directives/{MultiActionBar.js => MultiActionBar.ts} (99%)
 rename scripts/apps/search/directives/{SearchFilters.js => SearchFilters.ts} (98%)
 rename scripts/apps/search/directives/{SearchPanel.js => SearchPanel.ts} (98%)
 rename scripts/apps/search/directives/{SearchParameters.js => SearchParameters.ts} (99%)
 rename scripts/apps/search/directives/{SearchResults.js => SearchResults.ts} (96%)
 rename scripts/apps/search/directives/{SearchTags.js => SearchTags.ts} (99%)
 rename scripts/apps/search/services/{SavedSearchService.js => SavedSearchService.ts} (98%)
 rename scripts/apps/search/services/{SearchService.js => SearchService.ts} (92%)
 rename scripts/apps/search/services/{SortService.js => SortService.ts} (95%)
 rename scripts/apps/search/services/{TagService.js => TagService.ts} (97%)
 rename scripts/apps/search/tests/{search.spec.js => search.spec.ts} (98%)
 rename scripts/apps/settings/directives/{RoleUnique.js => RoleUnique.ts} (94%)
 rename scripts/apps/stream/controllers/{StreamController.js => StreamController.ts} (89%)
 rename scripts/apps/templates/directives/{TemplateEditorModal.js => TemplateEditorModal.ts} (98%)
 rename scripts/apps/templates/directives/{TemplatesDirective.js => TemplatesDirective.ts} (96%)
 rename scripts/apps/templates/filters/{index.js => index.ts} (98%)
 rename scripts/apps/templates/services/{TemplatesService.js => TemplatesService.ts} (93%)
 rename scripts/apps/translations/directives/{TranslationDropdown.js => TranslationDropdown.ts} (97%)
 rename scripts/apps/translations/directives/{TranslationReactDropdown.js => TranslationReactDropdown.ts} (84%)
 rename scripts/apps/translations/services/{TranslationService.js => TranslationService.ts} (95%)
 rename scripts/apps/users/controllers/{ChangeAvatarController.js => ChangeAvatarController.ts} (96%)
 rename scripts/apps/users/controllers/{UserListController.js => UserListController.ts} (98%)
 rename scripts/apps/users/directives/{RolesPrivilegesDirective.js => RolesPrivilegesDirective.ts} (98%)
 rename scripts/apps/users/directives/{UserListDirective.js => UserListDirective.ts} (95%)
 rename scripts/apps/users/directives/{UserMentioDirective.js => UserMentioDirective.ts} (98%)
 rename scripts/apps/users/directives/{UserPrivilegesDirective.js => UserPrivilegesDirective.ts} (97%)
 rename scripts/apps/users/import/{import.js => import.ts} (93%)
 rename scripts/apps/users/{index.js => index.ts} (96%)
 rename scripts/apps/users/roles/{RolesService.js => RolesService.ts} (94%)
 rename scripts/apps/users/services/{ProfileService.js => ProfileService.ts} (96%)
 rename scripts/apps/users/services/{UserListService.js => UserListService.ts} (95%)
 rename scripts/apps/users/services/{UserPopupService.js => UserPopupService.ts} (98%)
 rename scripts/apps/users/services/{UsersService.js => UsersService.ts} (97%)
 rename scripts/apps/users/tests/{sdUserPrivileges.spec.js => sdUserPrivileges.spec.ts} (97%)
 rename scripts/apps/users/tests/{users.spec.js => users.spec.ts} (97%)
 rename scripts/apps/workspace/content/services/{ContentService.js => ContentService.ts} (95%)
 rename scripts/apps/workspace/directives/{WorkspaceDropdownDirective.js => WorkspaceDropdownDirective.ts} (99%)
 rename scripts/apps/workspace/helpers/{getLabelForFieldId.js => getLabelForFieldId.ts} (100%)
 rename scripts/core/activity/{activity-list-directive.js => activity-list-directive.ts} (99%)
 rename scripts/core/analytics/{analytics.js => analytics.ts} (84%)
 rename scripts/core/api/{api-service.spec.js => api-service.spec.ts} (99%)
 rename scripts/core/api/{api-service.js => api-service.ts} (94%)
 rename scripts/core/api/{http-endpoint-factory.js => http-endpoint-factory.ts} (99%)
 rename scripts/core/api/{request-service.js => request-service.ts} (100%)
 rename scripts/core/api/{timeout-interceptor.spec.js => timeout-interceptor.spec.ts} (92%)
 rename scripts/core/auth/{basic-auth-adapter.spec.js => basic-auth-adapter.spec.ts} (100%)
 rename scripts/core/{config.js => config.ts} (97%)
 rename scripts/core/datetime/{absdate-directive.js => absdate-directive.ts} (98%)
 rename scripts/core/datetime/{datetime.js => datetime.ts} (98%)
 rename scripts/core/datetime/{group-dates-directive.js => group-dates-directive.ts} (98%)
 rename scripts/core/datetime/{reldate-directive-complex.js => reldate-directive-complex.ts} (98%)
 rename scripts/core/datetime/{reldate-directive.js => reldate-directive.ts} (100%)
 rename scripts/core/directives/{CheckAllDirective.js => CheckAllDirective.ts} (98%)
 rename scripts/core/directives/{DebounceDirective.js => DebounceDirective.ts} (97%)
 rename scripts/core/directives/{PhoneHomeModalDirective.js => PhoneHomeModalDirective.ts} (95%)
 rename scripts/core/directives/{SearchListDirective.js => SearchListDirective.ts} (94%)
 rename scripts/core/directives/{SearchListSingleDirective.js => SearchListSingleDirective.ts} (98%)
 rename scripts/core/directives/{ThrottleDirective.js => ThrottleDirective.ts} (97%)
 rename scripts/core/directives/{WithParamsDirective.js => WithParamsDirective.ts} (93%)
 rename scripts/core/editor2/{add-embed.ctrl.js => add-embed.ctrl.ts} (94%)
 rename scripts/core/editor2/{customAnchor.js => customAnchor.ts} (95%)
 rename scripts/core/editor2/{editor.ctrl.js => editor.ctrl.ts} (85%)
 rename scripts/core/editor2/{editor.js => editor.ts} (97%)
 rename scripts/core/editor3/{directive.js => directive.tsx} (88%)
 rename scripts/core/editor3/helpers/{editor3CustomData.spec.js => editor3CustomData.spec.ts} (89%)
 rename scripts/core/editor3/helpers/{editor3CustomData.js => editor3CustomData.ts} (97%)
 rename scripts/core/editor3/helpers/{handleBeforeInputHighlights.js => handleBeforeInputHighlights.ts} (96%)
 rename scripts/core/editor3/helpers/{htmlComesFromDraftjsEditor.spec.js => htmlComesFromDraftjsEditor.spec.ts} (98%)
 rename scripts/core/editor3/helpers/{inlineStyles.js => inlineStyles.ts} (85%)
 rename scripts/core/editor3/helpers/{insertAtomicBlockWithoutEmptyLines.js => insertAtomicBlockWithoutEmptyLines.ts} (96%)
 rename scripts/core/editor3/helpers/{removeFormat.js => removeFormat.ts} (96%)
 rename scripts/core/editor3/helpers/selection/{selectionIterator.js => selectionIterator.ts} (96%)
 rename scripts/core/editor3/html/from-html/{index.js => index.ts} (97%)
 rename scripts/core/editor3/html/tests/{from-html-snapshot.spec.jsx => from-html-snapshot.spec.tsx} (99%)
 rename scripts/core/editor3/html/tests/{from-html.spec.js => from-html.spec.ts} (96%)
 rename scripts/core/editor3/html/tests/{to-html.spec.js => to-html.spec.ts} (98%)
 rename scripts/core/editor3/html/to-html/{AtomicBlockParser.js => AtomicBlockParser.ts} (97%)
 rename scripts/core/editor3/html/to-html/{BlockEntityWrapper.js => BlockEntityWrapper.ts} (96%)
 rename scripts/core/editor3/html/to-html/{BlockInlineStyleWrapper.js => BlockInlineStyleWrapper.ts} (97%)
 rename scripts/core/editor3/html/to-html/{HTMLGenerator.js => HTMLGenerator.ts} (96%)
 rename scripts/core/editor3/store/{index.js => index.ts} (92%)
 rename scripts/core/elastic/{es.js => es.ts} (96%)
 rename scripts/core/filters/{index.js => index.ts} (98%)
 delete mode 100644 scripts/core/global-fixes/open-external-links-in-new-tab.js
 create mode 100644 scripts/core/global-fixes/open-external-links-in-new-tab.ts
 rename scripts/core/helpers/dom/{onEveryAnimationFrame.js => onEveryAnimationFrame.ts} (95%)
 rename scripts/core/helpers/dom/{stickElementsWithTracking.js => stickElementsWithTracking.ts} (92%)
 rename scripts/core/helpers/{uuid.js => uuid.ts} (80%)
 rename scripts/core/{index.js => index.ts} (99%)
 rename scripts/core/keyboard/{keyboard.js => keyboard.ts} (94%)
 rename scripts/core/keyboard/tests/{keyboard.spec.js => keyboard.spec.ts} (97%)
 rename scripts/core/lang/{index.js => index.ts} (100%)
 rename scripts/core/lang/{missing-translations-strings.js => missing-translations-strings.ts} (98%)
 rename scripts/core/list/{list.js => list.ts} (98%)
 rename scripts/core/menu/notifications/{notifications.js => notifications.ts} (94%)
 rename scripts/core/notification/{notification.js => notification.ts} (99%)
 rename scripts/core/services/{data.js => data.ts} (96%)
 rename scripts/core/services/{entity.js => entity.ts} (99%)
 rename scripts/core/services/{permissionsService.js => permissionsService.ts} (99%)
 rename scripts/core/services/{preferencesService.js => preferencesService.ts} (95%)
 rename scripts/core/services/{server.js => server.ts} (95%)
 rename scripts/core/services/{serverConfig.js => serverConfig.ts} (96%)
 rename scripts/core/services/{translate.js => translate.ts} (98%)
 rename scripts/core/services/{workflowService.js => workflowService.ts} (97%)
 rename scripts/core/spellcheck/{spellcheck.js => spellcheck.ts} (96%)
 rename scripts/core/ui/{ui.js => ui.ts} (99%)
 rename scripts/core/upload/{crop-directive.js => crop-directive.ts} (88%)
 rename scripts/core/upload/{sdImageModify.js => sdImageModify.ts} (87%)
 rename scripts/core/upload/{video-capture-directive.js => video-capture-directive.ts} (87%)
 rename scripts/{index.js => index.ts} (93%)
 rename scripts/{tests.js => tests.ts} (100%)

diff --git a/jsconfig.json b/jsconfig.json
index 67faa8c54e..743b9147fb 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -5,17 +5,17 @@
         "jsx": "preserve",
         "paths": {
             "apps/*": [
-                "./scripts/apps/*",
+                "./scripts/apps/*"
             ],
             "core/*": [
-                "./scripts/core/*",
-            ],
+                "./scripts/core/*"
+            ]
         },
-        "baseUrl": ".",
+        "baseUrl": "."
     },
     "exclude": [
         "node_modules",
         "bower_components",
-        "po",
+        "po"
     ]
-}
\ No newline at end of file
+}
diff --git a/karma.conf.js b/karma.conf.js
index 20aff0a75a..aebe04e0f4 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,5 +1,3 @@
-
-
 var grunt = require('grunt');
 var makeConfig = require('./webpack.config.js');
 
@@ -25,7 +23,7 @@ module.exports = function(config) {
 
         preprocessors: {
             '**/*.html': ['ng-html2js'],
-            'scripts/tests.js': ['webpack', 'sourcemap'],
+            'scripts/tests.ts': ['webpack', 'sourcemap'],
         },
 
         webpack: webpackConfig,
@@ -40,7 +38,7 @@ module.exports = function(config) {
         },
 
         files: [
-            'scripts/tests.js',
+            'scripts/tests.ts',
             'scripts/**/*.html',
         ],
 
@@ -69,5 +67,10 @@ module.exports = function(config) {
 
         // Seams default 10s is not enough for CI sometime, so let's try 30s
         browserNoActivityTimeout: 30000,
+
+        // Allow typescript files
+        mime: {
+            'text/x-typescript': ['ts', 'tsx'],
+        },
     });
 };
diff --git a/package.json b/package.json
index 5915d28399..02fea1f5d0 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
   "main": "scripts/index.js",
   "dependencies": {
     "@types/angular": "1.6.50",
-    "@types/draft-js": "0.10.25",
+    "@types/draft-js": "0.10.29",
     "@types/lodash": "4.14.117",
     "@types/react": "16.4.9",
     "@types/react-dom": "16.8.0",
@@ -111,6 +111,9 @@
     "webpack-dev-server": "2.11.1"
   },
   "devDependencies": {
+    "@types/moment": "^2.13.0",
+    "@types/moment-timezone": "^0.5.12",
+    "@types/webpack-env": "^1.13.9",
     "btoa": "^1.1.2",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
diff --git a/scripts/apps/archive/controllers/ArchiveListController.js b/scripts/apps/archive/controllers/ArchiveListController.ts
similarity index 100%
rename from scripts/apps/archive/controllers/ArchiveListController.js
rename to scripts/apps/archive/controllers/ArchiveListController.ts
diff --git a/scripts/apps/archive/controllers/BaseListController.js b/scripts/apps/archive/controllers/BaseListController.ts
similarity index 90%
rename from scripts/apps/archive/controllers/BaseListController.js
rename to scripts/apps/archive/controllers/BaseListController.ts
index d44810e8f3..fbb156f72b 100644
--- a/scripts/apps/archive/controllers/BaseListController.js
+++ b/scripts/apps/archive/controllers/BaseListController.ts
@@ -1,4 +1,11 @@
+import _ from 'lodash';
+
 export class BaseListController {
+    lastQueryParams: any;
+    $location: any;
+    search: any;
+    desks: any;
+
     constructor($scope, $location, search, desks) {
         this.lastQueryParams = {};
         this.$location = $location;
@@ -11,7 +18,7 @@ export class BaseListController {
             const source = this.getQuery(null, $scope.repo.archive || false);
 
             source.from = from;
-            this.fetchItems(this.getCriteria(source), true);
+            this.fetchItems(this.getCriteria(source));
         };
 
         $scope.$on('$routeUpdate', (e, data) => {
@@ -55,12 +62,13 @@ export class BaseListController {
         return query;
     }
 
-    fetchItems(criteria) {
+    fetchItems(criteria, next?) {
         console.warn('No API defined.');
     }
 
     fetchItem(id) {
         console.warn('no api defined');
+        return Promise.resolve();
     }
 
     refresh(filterDesk) {
diff --git a/scripts/apps/archive/directives/ArchivedItemKill.js b/scripts/apps/archive/directives/ArchivedItemKill.ts
similarity index 94%
rename from scripts/apps/archive/directives/ArchivedItemKill.js
rename to scripts/apps/archive/directives/ArchivedItemKill.ts
index e9737d629b..4169043463 100644
--- a/scripts/apps/archive/directives/ArchivedItemKill.js
+++ b/scripts/apps/archive/directives/ArchivedItemKill.ts
@@ -18,7 +18,7 @@ export function ArchivedItemKill(authoring, api, notify) {
             api.remove(itemToDelete, {}, 'archived').then(
                 (response) => {
                     var fields = _.union(_.keys(authoring.getContentFieldDefaults()), ['_id', 'versioncreated']);
-                    var itemForTemplate = {template_name: scope.action, item: _.pick(scope.item, fields)};
+                    let itemForTemplate: any = {template_name: scope.action, item: _.pick(scope.item, fields)};
 
                     api.save('content_templates_apply', {}, itemForTemplate, {}).then((result) => {
                         itemForTemplate = _.pick(result, _.keys(authoring.getContentFieldDefaults()));
@@ -38,7 +38,7 @@ export function ArchivedItemKill(authoring, api, notify) {
                     } else {
                         notify.error(gettext('Unknown Error: Cannot kill the item'));
                     }
-                }
+                },
             );
 
             scope.kill = function() {
diff --git a/scripts/apps/archive/directives/ContentResults.js b/scripts/apps/archive/directives/ContentResults.ts
similarity index 99%
rename from scripts/apps/archive/directives/ContentResults.js
rename to scripts/apps/archive/directives/ContentResults.ts
index ce0fb3f148..1d7383d510 100644
--- a/scripts/apps/archive/directives/ContentResults.js
+++ b/scripts/apps/archive/directives/ContentResults.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 ContentResults.$inject = ['$location', 'preferencesService', 'packages', 'tags', 'asset', 'search'];
 
 /*
diff --git a/scripts/apps/archive/directives/Export.js b/scripts/apps/archive/directives/Export.ts
similarity index 96%
rename from scripts/apps/archive/directives/Export.js
rename to scripts/apps/archive/directives/Export.ts
index b489d262cf..32316cbab6 100644
--- a/scripts/apps/archive/directives/Export.js
+++ b/scripts/apps/archive/directives/Export.ts
@@ -1,4 +1,15 @@
+import _ from 'lodash';
+
 class LinkFunction {
+    api: any;
+    config: any;
+    multi: any;
+    notify: any;
+    storage: any;
+    session: any;
+    urls: any;
+    scope: any;
+
     constructor(api, config, multi, notify, storage, session, urls, scope) {
         this.api = api;
         this.config = config;
diff --git a/scripts/apps/archive/directives/ItemCrops.js b/scripts/apps/archive/directives/ItemCrops.ts
similarity index 95%
rename from scripts/apps/archive/directives/ItemCrops.js
rename to scripts/apps/archive/directives/ItemCrops.ts
index 0f60c9d1b3..784d1ac896 100644
--- a/scripts/apps/archive/directives/ItemCrops.js
+++ b/scripts/apps/archive/directives/ItemCrops.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 /**
  * @ngdoc directive
  * @module superdesk.apps.archive
@@ -32,7 +34,7 @@ export function ItemCrops(metadata) {
             scope.showCrops = () => (
                 _.includes(['picture', 'graphic'], scope.item.type) && _.get(metadata, 'values.crop_sizes') &&
                 metadata.values.crop_sizes.some(
-                    (crop) => scope.item.renditions && scope.item.renditions[crop.name]
+                    (crop) => scope.item.renditions && scope.item.renditions[crop.name],
                 )
             );
         },
diff --git a/scripts/apps/archive/directives/ItemLock.js b/scripts/apps/archive/directives/ItemLock.ts
similarity index 98%
rename from scripts/apps/archive/directives/ItemLock.js
rename to scripts/apps/archive/directives/ItemLock.ts
index bf67417509..d82684ddaa 100644
--- a/scripts/apps/archive/directives/ItemLock.js
+++ b/scripts/apps/archive/directives/ItemLock.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 ItemLock.$inject = ['api', 'lock', 'privileges', 'desks'];
 export function ItemLock(api, lock, privileges, desks) {
     return {
diff --git a/scripts/apps/archive/directives/MarkedItemTitle.js b/scripts/apps/archive/directives/MarkedItemTitle.ts
similarity index 97%
rename from scripts/apps/archive/directives/MarkedItemTitle.js
rename to scripts/apps/archive/directives/MarkedItemTitle.ts
index 81f3ca51a7..39fdca2cf4 100644
--- a/scripts/apps/archive/directives/MarkedItemTitle.js
+++ b/scripts/apps/archive/directives/MarkedItemTitle.ts
@@ -1,4 +1,15 @@
+import _ from 'lodash';
+
 class LinkFunction {
+    scope: any;
+    desks: any;
+    authoring: any;
+    highlightsService: any;
+    filter: any;
+    location: any;
+    timeout: any;
+    elem: any;
+
     constructor(desks, authoring, highlightsService, $filter, $location, $timeout, scope, elem) {
         this.desks = desks;
         this.authoring = authoring;
diff --git a/scripts/apps/archive/directives/MediaMetadata.js b/scripts/apps/archive/directives/MediaMetadata.ts
similarity index 95%
rename from scripts/apps/archive/directives/MediaMetadata.js
rename to scripts/apps/archive/directives/MediaMetadata.ts
index 7d5c9f0783..63abc875cc 100644
--- a/scripts/apps/archive/directives/MediaMetadata.js
+++ b/scripts/apps/archive/directives/MediaMetadata.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 MediaMetadata.$inject = ['userList', 'archiveService', 'metadata'];
 
 export function MediaMetadata(userList, archiveService, metadata) {
@@ -38,7 +40,7 @@ export function MediaMetadata(userList, archiveService, metadata) {
             }
 
             scope.getLocaleName = function(terms, scheme) {
-                const term = terms.find((elem) => elem.scheme === scheme);
+                const term = terms.find((element) => element.scheme === scheme);
 
                 if (!term) {
                     return 'None';
diff --git a/scripts/apps/archive/directives/MediaPreview.js b/scripts/apps/archive/directives/MediaPreview.ts
similarity index 99%
rename from scripts/apps/archive/directives/MediaPreview.js
rename to scripts/apps/archive/directives/MediaPreview.ts
index 3bb1ef7dc0..39eeb7fb45 100644
--- a/scripts/apps/archive/directives/MediaPreview.js
+++ b/scripts/apps/archive/directives/MediaPreview.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 /**
  * @ngdoc directive
  * @module superdesk.apps.archive
diff --git a/scripts/apps/archive/directives/MediaUsed.js b/scripts/apps/archive/directives/MediaUsed.ts
similarity index 96%
rename from scripts/apps/archive/directives/MediaUsed.js
rename to scripts/apps/archive/directives/MediaUsed.ts
index 3eb4fe5b06..327a2a20a7 100644
--- a/scripts/apps/archive/directives/MediaUsed.js
+++ b/scripts/apps/archive/directives/MediaUsed.ts
@@ -1,4 +1,9 @@
 class LinkFunction {
+    scope: any;
+    superdesk: any;
+    api: any;
+    familyService: any;
+
     constructor(superdesk, api, familyService, scope) {
         this.scope = scope;
         this.superdesk = superdesk;
diff --git a/scripts/apps/archive/directives/MediaView.js b/scripts/apps/archive/directives/MediaView.ts
similarity index 99%
rename from scripts/apps/archive/directives/MediaView.js
rename to scripts/apps/archive/directives/MediaView.ts
index 3fcc57ac96..4d0e34483c 100644
--- a/scripts/apps/archive/directives/MediaView.js
+++ b/scripts/apps/archive/directives/MediaView.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 MediaView.$inject = ['keyboardManager', 'packages'];
 
 export function MediaView(keyboardManager, packages) {
diff --git a/scripts/apps/archive/directives/ResendItem.js b/scripts/apps/archive/directives/ResendItem.ts
similarity index 94%
rename from scripts/apps/archive/directives/ResendItem.js
rename to scripts/apps/archive/directives/ResendItem.ts
index 07beea6ee8..4e1f25fdb2 100644
--- a/scripts/apps/archive/directives/ResendItem.js
+++ b/scripts/apps/archive/directives/ResendItem.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 ResendItem.$inject = ['subscribersService', 'authoring', 'api', 'notify'];
@@ -14,8 +15,8 @@ export function ResendItem(subscribersService, authoring, api, notify) {
                     subscribersService.fetchTargetableSubscribers().then((items) => {
                         scope.customSubscribers = [];
                         scope.subscribers = items._items;
-                        _.each(items, (item) => {
-                            scope.customSubscribers.push({qcode: item._id, name: item.name});
+                        _.each(items, (_item) => {
+                            scope.customSubscribers.push({qcode: _item._id, name: _item.name});
                         });
                     });
                 }
diff --git a/scripts/apps/archive/index.js b/scripts/apps/archive/index.ts
similarity index 99%
rename from scripts/apps/archive/index.js
rename to scripts/apps/archive/index.ts
index 48f2384d74..a19d9d3628 100644
--- a/scripts/apps/archive/index.js
+++ b/scripts/apps/archive/index.ts
@@ -2,7 +2,7 @@
 import './styles/related-item.scss';
 import './styles/assignment.scss';
 import './styles/html-preview.scss';
-import {get} from 'lodash';
+import {get, includes} from 'lodash';
 
 // scripts
 import './related-item-widget/relatedItem';
@@ -392,7 +392,7 @@ function spikeActivity(spike, data, modal, $location, $q, multi, privileges,
     authoringWorkspace, confirm, autosave, config) {
     // For the sake of keyboard shortcut to work consistently,
     // if the item is multi-selected, let multibar controller handle its spike
-    if (!data.item || multi.count > 0 && _.includes(multi.getIds(), data.item._id)) {
+    if (!data.item || multi.count > 0 && includes(multi.getIds(), data.item._id)) {
         return;
     }
 
diff --git a/scripts/apps/archive/services/ArchiveService.js b/scripts/apps/archive/services/ArchiveService.ts
similarity index 92%
rename from scripts/apps/archive/services/ArchiveService.js
rename to scripts/apps/archive/services/ArchiveService.ts
index 0e07621b73..559a761af6 100644
--- a/scripts/apps/archive/services/ArchiveService.js
+++ b/scripts/apps/archive/services/ArchiveService.ts
@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import moment from 'moment';
 
 ArchiveService.$inject = ['desks', 'session', 'api', '$q', 'search', '$location', 'config'];
 export function ArchiveService(desks, session, api, $q, search, $location, config) {
@@ -81,7 +82,7 @@ export function ArchiveService(desks, session, api, $q, search, $location, confi
     this.getRelatedItems = function(item, fromDateTime) {
         var beforeDateTime = fromDateTime || moment().subtract(1, 'days')
             .format(config.view.dateformat);
-        var params = {};
+        var params: any = {};
 
         params.q = 'slugline.phrase:"' + _.trim(item.slugline) + '"'; // exact match
         params.ignoreKilled = true;
@@ -93,7 +94,7 @@ export function ArchiveService(desks, session, api, $q, search, $location, confi
         query.size(200);
 
         if (_.get(item, '_id')) {
-            let filter = {
+            let filter: any = {
                 bool: {
                     must_not: [
                         {bool: {must: [{term: {_id: item._id}}, {term: {_type: 'archive'}}]}},
@@ -132,11 +133,11 @@ export function ArchiveService(desks, session, api, $q, search, $location, confi
      * Returns versions of the item.
      *
      * @param {Object} item
-     * @param {Object} desks deskService
+     * @param {Object} deskService
      * @param {String} versionType one of versions, operations
      * @return list of object where each object is a version of the item
      */
-    this.getVersions = function(item, desks, versionType) {
+    this.getVersions = function(item, deskService, versionType) {
         if (this.isLegal(item)) {
             return api.find('legal_archive', item._id, {version: 'all', max_results: 200})
                 .then((result) => {
@@ -165,18 +166,19 @@ export function ArchiveService(desks, session, api, $q, search, $location, confi
                 _.each(result._items, (version) => {
                     if (version.task) {
                         if (version.task.desk) {
-                            var versiondesk = desks.deskLookup[version.task.desk];
+                            var versiondesk = deskService.deskLookup[version.task.desk];
 
                             version.desk = versiondesk && versiondesk.name;
                         }
                         if (version.task.stage) {
-                            var versionstage = desks.stageLookup[version.task.stage];
+                            var versionstage = deskService.stageLookup[version.task.stage];
 
                             version.stage = versionstage && versionstage.name;
                         }
                     }
                     if (version.version_creator || version.original_creator) {
-                        var versioncreator = desks.userLookup[version.version_creator || version.original_creator];
+                        var versioncreator =
+                            deskService.userLookup[version.version_creator || version.original_creator];
 
                         version.creator = versioncreator && versioncreator.display_name || 'System';
                     }
@@ -208,6 +210,8 @@ export function ArchiveService(desks, session, api, $q, search, $location, confi
             return _.find(versions, {_current_version: item._latest_version});
         }
 
-        return _.max(versions, (version) => version._current_version || version.version);
+        const versionsMap = versions.map((v) => v._current_version || v.version);
+
+        return _.max(versionsMap);
     };
 }
diff --git a/scripts/apps/archive/services/FamilyService.js b/scripts/apps/archive/services/FamilyService.ts
similarity index 96%
rename from scripts/apps/archive/services/FamilyService.js
rename to scripts/apps/archive/services/FamilyService.ts
index 574b349dc8..e2306e359d 100644
--- a/scripts/apps/archive/services/FamilyService.js
+++ b/scripts/apps/archive/services/FamilyService.ts
@@ -1,4 +1,4 @@
-import {get} from 'lodash';
+import _, {get} from 'lodash';
 
 /**
  * @ngdoc service
@@ -13,7 +13,6 @@ FamilyService.$inject = ['api', 'desks'];
 export function FamilyService(api, desks) {
     const repo = 'archive,published';
 
-
     /**
      * @ngdoc method
      * @name family#fetchItems
@@ -24,7 +23,7 @@ export function FamilyService(api, desks) {
      * @returns {Object}
      */
     this.fetchItems = (familyId, excludeItem) => {
-        let filter = [
+        let filter: Array<any> = [
             {not: {term: {state: 'spiked'}}},
             {term: {family_id: familyId}},
         ];
@@ -64,8 +63,8 @@ export function FamilyService(api, desks) {
      * @param {Object} queryString
      * @returns {Object}
      */
-    const query = (filter, sortField, order, queryString) => {
-        let params = {
+    const query = (filter: any, sortField: string, order: string, queryString?: string) => {
+        let params: any = {
             repo: repo,
             source: {
                 query: {filtered: {filter: {
@@ -115,7 +114,7 @@ export function FamilyService(api, desks) {
      * @returns {Object}
      */
     this.fetchRelatableItems = (keyword, sluglineMatch, item, modificationDateAfter) => {
-        let filter = [
+        let filter: Array<any> = [
             {not: {term: {state: 'spiked'}}},
             {not: {term: {event_id: item.event_id}}},
             {not: {term: {type: 'composite'}}},
@@ -142,7 +141,7 @@ export function FamilyService(api, desks) {
 
         // process creation date
         if (modificationDateAfter) {
-            let dateQuery = {};
+            let dateQuery: any = {};
 
             dateQuery.versioncreated = {
                 gte: modificationDateAfter,
diff --git a/scripts/apps/archive/services/MultiService.js b/scripts/apps/archive/services/MultiService.ts
similarity index 99%
rename from scripts/apps/archive/services/MultiService.js
rename to scripts/apps/archive/services/MultiService.ts
index fc3eb64b43..ffdc916b28 100644
--- a/scripts/apps/archive/services/MultiService.js
+++ b/scripts/apps/archive/services/MultiService.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 /**
  * @ngdoc service
  * @module superdesk.apps.archive
diff --git a/scripts/apps/archive/tests/archive.spec.js b/scripts/apps/archive/tests/archive.spec.ts
similarity index 97%
rename from scripts/apps/archive/tests/archive.spec.js
rename to scripts/apps/archive/tests/archive.spec.ts
index a9fad044f5..803bb0da43 100644
--- a/scripts/apps/archive/tests/archive.spec.js
+++ b/scripts/apps/archive/tests/archive.spec.ts
@@ -2,7 +2,7 @@
 import {DuplicateController} from '../controllers';
 
 describe('content', () => {
-    var item = {_id: 1};
+    var item: any = {_id: 1};
 
     beforeEach(window.module('superdesk.templates-cache'));
     beforeEach(window.module('superdesk.mocks'));
@@ -273,7 +273,7 @@ describe('content', () => {
             inject(($rootScope, superdesk, activityService, privileges, modal, $q, spike) => {
                 privileges.privileges = {planning: 1};
 
-                let item = {
+                let itemObject = {
                     _id: 'foo1',
                     _type: 'archive',
                     task: {desk: 'desk1', stage: 'stage1'},
@@ -284,7 +284,7 @@ describe('content', () => {
                 spyOn(modal, 'confirm').and.returnValue($q.when({}));
                 spyOn(spike, 'spike').and.returnValue($q.when({}));
 
-                activityService.start(superdesk.activities.spike, {data: {item: item}});
+                activityService.start(superdesk.activities.spike, {data: {item: itemObject}});
                 $rootScope.$digest();
 
                 expect(modal.confirm).toHaveBeenCalledWith('This item is linked to in-progress ' +
@@ -296,7 +296,7 @@ describe('content', () => {
             inject(($rootScope, superdesk, activityService, privileges, modal, $q, spike) => {
                 privileges.privileges = {planning: 1};
 
-                let item = {
+                let itemObject = {
                     _id: 'foo1',
                     _type: 'archive',
                     task: {desk: 'desk1', stage: 'stage1'},
@@ -306,7 +306,7 @@ describe('content', () => {
                 spyOn(modal, 'confirm').and.returnValue($q.when({}));
                 spyOn(spike, 'spike').and.returnValue($q.when({}));
 
-                activityService.start(superdesk.activities.spike, {data: {item: item}});
+                activityService.start(superdesk.activities.spike, {data: {item: itemObject}});
                 $rootScope.$digest();
 
                 expect(modal.confirm).toHaveBeenCalledWith('Are you sure you want to spike the item?', 'Confirm');
@@ -315,7 +315,7 @@ describe('content', () => {
 
         it('spike action does prompts user if planning component not activated',
             inject(($rootScope, superdesk, activityService, privileges, modal, $q, spike) => {
-                let item = {
+                let itemObject = {
                     _id: 'foo1',
                     _type: 'archive',
                     task: {desk: 'desk1', stage: 'stage1'},
@@ -325,7 +325,7 @@ describe('content', () => {
                 spyOn(modal, 'confirm').and.returnValue($q.when({}));
                 spyOn(spike, 'spike').and.returnValue($q.when({}));
 
-                activityService.start(superdesk.activities.spike, {data: {item: item}});
+                activityService.start(superdesk.activities.spike, {data: {item: itemObject}});
                 $rootScope.$digest();
 
                 expect(modal.confirm).toHaveBeenCalledWith('Are you sure you want to spike the item?', 'Confirm');
@@ -334,14 +334,14 @@ describe('content', () => {
 
         it('spike action prompts user if item has unsaved changes',
             inject((activityService, superdesk, autosave, confirm, $q, $rootScope, spike, modal) => {
-                const item = {_id: 'foo', lock_user: 'foo'};
+                const itemObject = {_id: 'foo', lock_user: 'foo'};
 
                 spyOn(autosave, 'get').and.returnValue($q.when());
                 spyOn(confirm, 'reopen').and.returnValue($q.reject());
                 spyOn(modal, 'confirm').and.returnValue($q.when());
                 spyOn(spike, 'spike');
 
-                activityService.start(superdesk.activities.spike, {data: {item: item}});
+                activityService.start(superdesk.activities.spike, {data: {item: itemObject}});
                 $rootScope.$digest();
 
                 expect(autosave.get).toHaveBeenCalled();
diff --git a/scripts/apps/authoring/attachments/attachments.spec.ts b/scripts/apps/authoring/attachments/attachments.spec.ts
index 3a5f205a2e..facd30332f 100644
--- a/scripts/apps/authoring/attachments/attachments.spec.ts
+++ b/scripts/apps/authoring/attachments/attachments.spec.ts
@@ -70,6 +70,7 @@ describe('attachments', () => {
             $rootScope.$digest();
 
             const state = store.getState();
+
             expect(state.edit).toBe(null);
             expect(state.files[0].title).toBe(file.title);
             expect(state.files[0].description).toBe(updates.description);
diff --git a/scripts/apps/authoring/authoring/article-url-fields.tsx b/scripts/apps/authoring/authoring/article-url-fields.tsx
index c59d243d2c..1a91e71f94 100644
--- a/scripts/apps/authoring/authoring/article-url-fields.tsx
+++ b/scripts/apps/authoring/authoring/article-url-fields.tsx
@@ -74,7 +74,7 @@ export class ArticleUrlFields extends React.Component<IProps, IState> {
                                 <i className="icon-remove-sign" style={{display: 'block'}} />
                             </button>
                         </div>
-                        <textarea type="text"
+                        <textarea
                             style={{marginTop: 0.5 + 'em'}}
                             disabled={!editable}
                             className="sd-editor__default-input"
diff --git a/scripts/apps/authoring/authoring/authoring.spec.js b/scripts/apps/authoring/authoring/authoring.spec.ts
similarity index 93%
rename from scripts/apps/authoring/authoring/authoring.spec.js
rename to scripts/apps/authoring/authoring/authoring.spec.ts
index e799f32079..faa1a02bc4 100644
--- a/scripts/apps/authoring/authoring/authoring.spec.js
+++ b/scripts/apps/authoring/authoring/authoring.spec.ts
@@ -1,5 +1,7 @@
+/* eslint-disable max-len */
+/* tslint:disable:max-line-length */
 import {onChange} from 'core/editor3/store/index';
-import {convertFromRaw} from 'draft-js';
+import {convertFromRaw, RawDraftContentState} from 'draft-js';
 
 describe('authoring', () => {
     beforeEach(window.module('superdesk.apps.vocabularies'));
@@ -11,7 +13,7 @@ describe('authoring', () => {
         inject(($httpBackend, $q, $rootScope, $compile, vocabularies, archiveService, content, $templateCache) => {
             $templateCache.put(
                 'scripts/apps/authoring/views/authoring-header.html',
-                '<div>{{scope.item}}</div>'
+                '<div>{{scope.item}}</div>',
             );
 
             var vocabulariesData = [
@@ -59,11 +61,10 @@ describe('authoring', () => {
         }));
 
     it('generates annotations field from the editor state', inject((authoring) => {
-        // eslint-disable-next-line max-len
         var contentStateRaw = {blocks: [{key: 'ak77o', text: 'test', type: 'unstyled', depth: 0, inlineStyleRanges: [{offset: 1, length: 2, style: 'ANNOTATION-1'}], entityRanges: [], data: {MULTIPLE_HIGHLIGHTS: {highlightsData: {'ANNOTATION-1': {data: {msg: '{"blocks":[{"key":"7f13c","text":"123","type":"unstyled","depth":0,"inlineStyleRanges":[],"entityRanges":[],"data":{}}],"entityMap":{}}', email: 'a@a.com', annotationType: 'regular:001', authorId: '59c222237300870c9a7863b2', date: '2018-05-21T04:14:45.074Z', author: 'Andrew Powers', avatar: 'https://sd-master.test.superdesk.org/api/upload-raw/2018022710028/e5bc36e933881f6ad79962a085844b8616aecea0a87908db20033ac129d88cf2.jpg'}, type: 'ANNOTATION'}}, lastHighlightIds: {SPLIT_PARAGRAPH_SUGGESTION: 0, DELETE_SUGGESTION: 0, TOGGLE_BOLD_SUGGESTION: 0, MERGE_PARAGRAPHS_SUGGESTION: 0, ADD_SUGGESTION: 0, ADD_LINK_SUGGESTION: 0, ANNOTATION: 1, COMMENT: 0, BLOCK_STYLE_SUGGESTION: 0, TOGGLE_SUPERSCRIPT_SUGGESTION: 0, TOGGLE_SUBSCRIPT_SUGGESTION: 0, TOGGLE_UNDERLINE_SUGGESTION: 0, TOGGLE_STRIKETHROUGH_SUGGESTION: 0, CHANGE_LINK_SUGGESTION: 0, TOGGLE_ITALIC_SUGGESTION: 0, REMOVE_LINK_SUGGESTION: 0}, highlightsStyleMap: {'ANNOTATION-1': {borderBottom: '4px solid rgba(100, 205, 0, 0.6)'}}}, __PUBLIC_API__comments: []}}], entityMap: {}};
-        var contentState = convertFromRaw(contentStateRaw);
+        var contentState = convertFromRaw(contentStateRaw as RawDraftContentState);
 
-        var context = {
+        var context: any = {
             pathToValue: 'body_html',
             item: {
                 body_html: '<p>t<span annotation-id="1">es</span>t</p>',
@@ -127,7 +128,7 @@ describe('authoring', () => {
                 },
             },
         };
-        const contentState = convertFromRaw(contentStateRaw);
+        const contentState = convertFromRaw(contentStateRaw as RawDraftContentState);
 
         const context = {
             pathToValue: 'body_html',
@@ -151,7 +152,7 @@ describe('authoring', () => {
 
         onChange.call(context, contentState);
         expect(context.item.associations.foo).toEqual({foo: 1});
-        expect(context.item.associations.editor_0).toEqual(entity1);
+        expect(context.item.associations['editor_0']).toEqual(entity1);
         expect(context.item.associations.editor_1).toEqual(entity2);
         expect(context.item.associations.editor_2).toBe(null);
     }));
@@ -163,7 +164,7 @@ describe('authoring', () => {
             expect($window.open)
                 .toHaveBeenCalledWith(
                     'http://server/#/workspace/monitoring?item=foo&action=edit&popup',
-                    'foo'
+                    'foo',
                 );
         }));
     });
diff --git a/scripts/apps/authoring/authoring/constants.js b/scripts/apps/authoring/authoring/constants.ts
similarity index 99%
rename from scripts/apps/authoring/authoring/constants.js
rename to scripts/apps/authoring/authoring/constants.ts
index c99584b1b3..5e15963eb5 100644
--- a/scripts/apps/authoring/authoring/constants.js
+++ b/scripts/apps/authoring/authoring/constants.ts
@@ -9,4 +9,4 @@ export const AUTHORING_MENU_GROUPS = [
     {_id: 'packaging'},
     {_id: 'highlights'},
     {_id: 'corrections'},
-];
\ No newline at end of file
+];
diff --git a/scripts/apps/authoring/authoring/controllers/AssociationController.ts b/scripts/apps/authoring/authoring/controllers/AssociationController.ts
index 9473f95f9f..308e132562 100644
--- a/scripts/apps/authoring/authoring/controllers/AssociationController.ts
+++ b/scripts/apps/authoring/authoring/controllers/AssociationController.ts
@@ -166,10 +166,11 @@ export function AssociationController(config, send, api, $q, superdesk,
         scope.rel = rel;
 
         let promise;
+
         if (!authoring.isPublished(scope.item) && updated && !autosave) {
             promise = scope.save();
         } else {
-            promise = scope.onchange({ item: scope.item, data });
+            promise = scope.onchange({item: scope.item, data: data});
         }
 
         if (callback) {
diff --git a/scripts/apps/authoring/authoring/directives/ArticleEditDirective.js b/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts
similarity index 99%
rename from scripts/apps/authoring/authoring/directives/ArticleEditDirective.js
rename to scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts
index 3e499c6a7c..67b2a2c9df 100644
--- a/scripts/apps/authoring/authoring/directives/ArticleEditDirective.js
+++ b/scripts/apps/authoring/authoring/directives/ArticleEditDirective.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {FIELD_KEY_SEPARATOR} from 'core/editor3/helpers/fieldsMeta';
 import {getLabelNameResolver} from 'apps/workspace/helpers/getLabelForFieldId';
 import {MEDIA_TYPES} from 'apps/vocabularies/constants';
@@ -54,7 +55,7 @@ export function ArticleEditDirective(
     history,
     $interpolate,
     suggest,
-    renditions
+    renditions,
 ) {
     return {
         templateUrl: 'scripts/apps/authoring/views/article-edit.html',
@@ -306,7 +307,7 @@ export function ArticleEditDirective(
                             defaultTab: defaultTab,
                             tabs: showTabs,
                             showMetadata: true,
-                        }
+                        },
                     )
                         .then((picture) => {
                             scope.item._etag = picture._etag;
diff --git a/scripts/apps/authoring/authoring/directives/AuthoringDirective.js b/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts
similarity index 98%
rename from scripts/apps/authoring/authoring/directives/AuthoringDirective.js
rename to scripts/apps/authoring/authoring/directives/AuthoringDirective.ts
index 8a93cf4c2e..ed19c1d13f 100644
--- a/scripts/apps/authoring/authoring/directives/AuthoringDirective.js
+++ b/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts
@@ -271,7 +271,7 @@ export function AuthoringDirective(superdesk, superdeskFlags, authoringWorkspace
                     modal.confirm(gettext('You have unsaved changes, do you want to continue?'))
                         .then(() => {
                             _exportHighlight(item._id);
-                        }
+                        },
                         );
                 } else {
                     _exportHighlight(item._id);
@@ -328,7 +328,7 @@ export function AuthoringDirective(superdesk, superdeskFlags, authoringWorkspace
                     timePartOfTS,
                     timestamp,
                     timezone,
-                    fieldName
+                    fieldName,
                 );
 
                 if (!errors) {
@@ -383,7 +383,6 @@ export function AuthoringDirective(superdesk, superdeskFlags, authoringWorkspace
                         gettext('Publish Schedule'));
                 }
 
-
                 if (errorMessage) {
                     notify.error(errorMessage);
                     return false;
@@ -541,10 +540,10 @@ export function AuthoringDirective(superdesk, superdeskFlags, authoringWorkspace
 
             $scope.runTansa = function() {
                 if (window.RunTansaProofing) {
-                    const editor = editorResolver.get();
+                    const _editor = editorResolver.get();
 
-                    if (editor && editor.version() === '3') {
-                        $('#editor3Tansa').html(editor.getHtmlForTansa());
+                    if (_editor && _editor.version() === '3') {
+                        $('#editor3Tansa').html(_editor.getHtmlForTansa());
                     }
 
                     switch ($scope.item.language) {
@@ -567,10 +566,10 @@ export function AuthoringDirective(superdesk, superdeskFlags, authoringWorkspace
             };
 
             function afterTansa(e, isCancelled) {
-                const editor = editorResolver.get();
+                const _editor = editorResolver.get();
 
-                if (editor && editor.version() === '3') {
-                    editor.setHtmlFromTansa($('#editor3Tansa').html());
+                if (_editor && _editor.version() === '3') {
+                    _editor.setHtmlFromTansa($('#editor3Tansa').html());
                 }
             }
 
@@ -583,7 +582,7 @@ export function AuthoringDirective(superdesk, superdeskFlags, authoringWorkspace
                     modal.alert({
                         headerText: gettext('Resolving suggestions'),
                         bodyText: gettext(
-                            'Article cannot be published. Please accept or reject all suggestions first.'
+                            'Article cannot be published. Please accept or reject all suggestions first.',
                         ),
                     });
 
@@ -595,7 +594,7 @@ export function AuthoringDirective(superdesk, superdeskFlags, authoringWorkspace
                         bodyText: gettext(
                             'This article contains unresolved comments.'
                             + 'Click on Cancel to go back to editing to'
-                            + 'resolve those comments or OK to ignore and proceed with publishing'
+                            + 'resolve those comments or OK to ignore and proceed with publishing',
                         ),
                         headerText: gettext('Resolving comments'),
                         okText: gettext('Ok'),
@@ -612,7 +611,7 @@ export function AuthoringDirective(superdesk, superdeskFlags, authoringWorkspace
                             return modal.confirm({
                                 bodyText: gettext(
                                     'There are unpublished related items that won\'t be sent out as related items.'
-                        + ' Do you want to publish the article anyway?'
+                        + ' Do you want to publish the article anyway?',
                                 ),
                             }).then((ok) => ok ? performPublish() : false);
                         }
@@ -1002,7 +1001,7 @@ export function AuthoringDirective(superdesk, superdeskFlags, authoringWorkspace
                 if (data.item === $scope.item._id) {
                     notify.error(gettext(
                         'No formatters found for {{formats}} while publishing item having unique name.',
-                        {formats: data.formats.join(','), name: data.unique_name}
+                        {formats: data.formats.join(','), name: data.unique_name},
                     ));
                 }
             });
@@ -1035,7 +1034,7 @@ export function AuthoringDirective(superdesk, superdeskFlags, authoringWorkspace
              */
             function isMediaField(fieldId) {
                 var parts = mediaIdGenerator.getFieldParts(fieldId);
-                var field = _.find($scope.fields, (field) => field._id === parts[0]);
+                var field = _.find($scope.fields, (_field) => _field._id === parts[0]);
 
                 return field && field.field_type === 'media';
             }
@@ -1051,14 +1050,14 @@ export function AuthoringDirective(superdesk, superdeskFlags, authoringWorkspace
             function computeMediaFieldVersions(fieldId) {
                 $scope.mediaFieldVersions[fieldId] = [];
 
-                var field = _.find($scope.fields, (field) => field._id === fieldId);
+                var field = _.find($scope.fields, (_field) => _field._id === fieldId);
 
                 if (field) {
                     var multipleItems = _.get(field, 'field_options.multiple_items.enabled');
                     var maxItems = !multipleItems ? 1 : _.get(field, 'field_options.multiple_items.max_items');
 
                     if (!maxItems || !mediaFields[fieldId] || mediaFields[fieldId].length < maxItems) {
-                        addMediaFieldVersion(fieldId, $scope.getNewMediaFieldId(fieldId), null);
+                        addMediaFieldVersion(fieldId, $scope.getNewMediaFieldId(fieldId));
                     }
                     _.forEach(mediaFields[fieldId], (version) => {
                         addMediaFieldVersion(fieldId, mediaIdGenerator.getFieldVersionName(fieldId, version));
@@ -1137,7 +1136,7 @@ export function AuthoringDirective(superdesk, superdeskFlags, authoringWorkspace
              * @return {String}
              */
             $scope.getNewMediaFieldId = (fieldId) => {
-                var field = _.find($scope.fields, (field) => field._id === fieldId);
+                var field = _.find($scope.fields, (_field) => _field._id === fieldId);
                 var multipleItems = field ? _.get(field, 'field_options.multiple_items.enabled') : false;
                 var parts = mediaIdGenerator.getFieldParts(fieldId);
                 var newIndex = multipleItems ? 1 : null;
diff --git a/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.js b/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts
similarity index 93%
rename from scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.js
rename to scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts
index ca8231c43f..36ca69d3ec 100644
--- a/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.js
+++ b/scripts/apps/authoring/authoring/directives/AuthoringEmbeddedDirective.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import * as helpers from 'apps/authoring/authoring/helpers';
 import {gettext} from 'core/utils';
 
@@ -37,7 +38,7 @@ export function AuthoringEmbeddedDirective(api, notify, $filter, config, deployC
                 // kill template is applied on the item.
                 // task is required to get the desk name.
                 var fields = _.union(_.keys(helpers.CONTENT_FIELDS_DEFAULTS), ['_id', 'versioncreated', 'task']);
-                var item = {
+                var item: any = {
                     template_name: scope.action, item: _.pick(scope.item, fields),
                 };
 
@@ -54,9 +55,9 @@ export function AuthoringEmbeddedDirective(api, notify, $filter, config, deployC
                 deployConfig.all({
                     override: 'override_ednote_for_corrections',
                     template: 'override_ednote_template',
-                }).then((config) => {
-                    if (config.override) {
-                        overrideEdnote(config.template);
+                }).then((_config) => {
+                    if (_config.override) {
+                        overrideEdnote(_config.template);
                     }
                     scope.origItem = scope.item;
                 });
diff --git a/scripts/apps/authoring/authoring/directives/FullPreviewDirective.js b/scripts/apps/authoring/authoring/directives/FullPreviewDirective.ts
similarity index 99%
rename from scripts/apps/authoring/authoring/directives/FullPreviewDirective.js
rename to scripts/apps/authoring/authoring/directives/FullPreviewDirective.ts
index 7305b4c986..cd135bf877 100644
--- a/scripts/apps/authoring/authoring/directives/FullPreviewDirective.js
+++ b/scripts/apps/authoring/authoring/directives/FullPreviewDirective.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 FullPreviewDirective.$inject = ['api', '$timeout', 'config', 'content', '$sce'];
 export function FullPreviewDirective(api, $timeout, config, content, $sce) {
     return {
diff --git a/scripts/apps/authoring/authoring/directives/ItemActionsByIntentDirective.js b/scripts/apps/authoring/authoring/directives/ItemActionsByIntentDirective.ts
similarity index 98%
rename from scripts/apps/authoring/authoring/directives/ItemActionsByIntentDirective.js
rename to scripts/apps/authoring/authoring/directives/ItemActionsByIntentDirective.ts
index d57815ff13..08b28dca2e 100644
--- a/scripts/apps/authoring/authoring/directives/ItemActionsByIntentDirective.js
+++ b/scripts/apps/authoring/authoring/directives/ItemActionsByIntentDirective.ts
@@ -21,7 +21,7 @@ export function ItemActionsByIntentDirective(superdesk, activityService, workflo
         templateUrl: 'scripts/apps/authoring/views/item-actions-by-intent.html',
         link: function($scope, elem, attrs) {
             function getMenuGroups() {
-                let intent = {};
+                let intent: any = {};
 
                 if (_.get(attrs, 'sdIntentType')) {
                     intent.type = _.get(attrs, 'sdIntentType');
@@ -63,4 +63,4 @@ export function ItemActionsByIntentDirective(superdesk, activityService, workflo
             }, true);
         },
     };
-}
\ No newline at end of file
+}
diff --git a/scripts/apps/authoring/authoring/directives/ItemCarouselDirective.js b/scripts/apps/authoring/authoring/directives/ItemCarouselDirective.ts
similarity index 93%
rename from scripts/apps/authoring/authoring/directives/ItemCarouselDirective.js
rename to scripts/apps/authoring/authoring/directives/ItemCarouselDirective.ts
index e7ec5a2142..dffe9f7fa2 100644
--- a/scripts/apps/authoring/authoring/directives/ItemCarouselDirective.js
+++ b/scripts/apps/authoring/authoring/directives/ItemCarouselDirective.ts
@@ -1,12 +1,12 @@
 /* global _ */
 
 import 'owl.carousel';
+import _ from 'lodash';
 import * as ctrl from '../controllers';
 import {waitForImagesToLoad, waitForAudioAndVideoToLoadMetadata} from 'core/helpers/waitForMediaToBeReady';
 import {getSuperdeskType} from 'core/utils';
 import {gettext} from 'core/utils';
 
-
 const carouselContainerSelector = '.sd-media-carousel__content';
 
 /**
@@ -36,7 +36,7 @@ export function ItemCarouselDirective($timeout, notify) {
         templateUrl: 'scripts/apps/authoring/views/item-carousel.html',
         controller: ctrl.AssociationController,
         controllerAs: 'associations',
-        link: function(scope, elem, attr, ctrl) {
+        link: function(scope, elem, attr, controller) {
             let carousel;
             let previousItemsString;
             const allowed = {picture: scope.allowPicture, video: scope.allowVideo, audio: scope.allowAudio};
@@ -44,7 +44,6 @@ export function ItemCarouselDirective($timeout, notify) {
                 .filter((key) => allowed[key] === true)
                 .map((key) => 'application/superdesk.item.' + key);
 
-
             /*
              * Initialize carousel after all content is loaded
              * otherwise carousel height is messed up
@@ -64,9 +63,8 @@ export function ItemCarouselDirective($timeout, notify) {
 
                 scope.rel = field ? field.fieldId : null;
 
-                scope.carouselItems = _.sortBy(_.filter(items, (item) => item[item.fieldId]),
-                    [(item) => item[item.fieldId].order]);
-
+                scope.carouselItems = _.sortBy(_.filter(items, (item: any) => item[item.fieldId]),
+                    [(item: any) => item[item.fieldId].order]);
 
                 scope.$applyAsync(() => {
                     // waiting for angular to render items
@@ -78,8 +76,8 @@ export function ItemCarouselDirective($timeout, notify) {
                     const carouselImages = Array.from(elem.get(0).querySelectorAll(`${carouselContainerSelector} img`));
                     const carouselAudiosAndVideos = Array.from(
                         elem.get(0).querySelectorAll(
-                            `${carouselContainerSelector} video, ${carouselContainerSelector} audio`
-                        )
+                            `${carouselContainerSelector} video, ${carouselContainerSelector} audio`,
+                        ),
                     );
 
                     if (items.length < 1 || (carouselImages.length + carouselAudiosAndVideos.length < 1)) {
@@ -138,16 +136,15 @@ export function ItemCarouselDirective($timeout, notify) {
 
                     const item = angular.fromJson(event.originalEvent.dataTransfer.getData(type));
 
-
                     const itemAlreadyAddedAsMediaGallery = mediaItemsForCurrentField.some(
-                        (mediaItem) => mediaItem._id === item._id
+                        (mediaItem) => mediaItem._id === item._id,
                     );
 
                     if (currentUploads >= scope.maxUploads) {
                         notify.error(
                             gettext(
-                                'Media item was not added, because the field reached the limit of allowed media items.'
-                            )
+                                'Media item was not added, because the field reached the limit of allowed media items.',
+                            ),
                         );
                         return;
                     }
@@ -157,7 +154,7 @@ export function ItemCarouselDirective($timeout, notify) {
                         return;
                     }
 
-                    ctrl.initializeUploadOnDrop(scope, event);
+                    controller.initializeUploadOnDrop(scope, event);
                 } else {
                     const allowedTypeNames = [
                         (scope.allowPicture === true ? gettext('image') : ''),
@@ -178,7 +175,7 @@ export function ItemCarouselDirective($timeout, notify) {
              */
             scope.upload = function() {
                 if (scope.editable) {
-                    ctrl.uploadAndCropImages(scope);
+                    controller.uploadAndCropImages(scope);
                 }
             };
 
@@ -190,7 +187,7 @@ export function ItemCarouselDirective($timeout, notify) {
              * @param {Object} item Item object
              */
             scope.remove = function(item) {
-                ctrl.updateItemAssociation(scope, null, item.fieldId);
+                controller.updateItemAssociation(scope, null, item.fieldId);
             };
 
             /**
@@ -215,7 +212,7 @@ export function ItemCarouselDirective($timeout, notify) {
                     start: (event, ui) => {
                         ui.item.data('start_index',
                             ui.item.parent().find('.sd-media-carousel__thumb-strip-item')
-                                .index(ui.item)
+                                .index(ui.item),
                         );
                     },
                     stop: (event, ui) => {
diff --git a/scripts/apps/authoring/authoring/directives/ReadingTime.js b/scripts/apps/authoring/authoring/directives/ReadingTime.ts
similarity index 91%
rename from scripts/apps/authoring/authoring/directives/ReadingTime.js
rename to scripts/apps/authoring/authoring/directives/ReadingTime.ts
index d97bc4cdb1..6500557d10 100644
--- a/scripts/apps/authoring/authoring/directives/ReadingTime.js
+++ b/scripts/apps/authoring/authoring/directives/ReadingTime.ts
@@ -38,7 +38,7 @@ export function ReadingTime(deployConfig) {
 
     function getReadingTime(input, language) {
         if (language && language.startsWith('ja')) {
-            return filter(input, (x) => trim(x)).length / deployConfig.getSync('japanese_characters_per_minute', 600);
+            return filter(input, (x) => !!trim(x)).length / deployConfig.getSync('japanese_characters_per_minute', 600);
         }
 
         const numWords = compact(input.split(/\s+/)).length || 0;
@@ -47,4 +47,4 @@ export function ReadingTime(deployConfig) {
     }
 }
 
-ReadingTime.$inject = ['deployConfig'];
\ No newline at end of file
+ReadingTime.$inject = ['deployConfig'];
diff --git a/scripts/apps/authoring/authoring/directives/SendItem.js b/scripts/apps/authoring/authoring/directives/SendItem.tsx
similarity index 98%
rename from scripts/apps/authoring/authoring/directives/SendItem.js
rename to scripts/apps/authoring/authoring/directives/SendItem.tsx
index 2076d29a72..c130758dd7 100644
--- a/scripts/apps/authoring/authoring/directives/SendItem.js
+++ b/scripts/apps/authoring/authoring/directives/SendItem.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import {PreviewModal} from '../previewModal';
 import {gettext} from 'core/utils';
 
-
 SendItem.$inject = ['$q', 'api', 'search', 'desks', 'notify', 'authoringWorkspace',
     'superdeskFlags', '$location', 'macros', '$rootScope', 'deployConfig',
     'authoring', 'send', 'editorResolver', 'confirm', 'archiveService',
@@ -80,13 +79,13 @@ export function SendItem($q, api, search, desks, notify, authoringWorkspace,
                     });
             };
 
-            function activateConfig(config, oldConfig) {
-                if (scope.mode !== 'authoring' && config !== oldConfig) {
-                    scope.isActive = !!config;
+            function activateConfig(_config, oldConfig) {
+                if (scope.mode !== 'authoring' && _config !== oldConfig) {
+                    scope.isActive = !!_config;
                     scope.item = scope.isActive ? {} : null;
                     scope.multiItems = multi.count ? multi.getItems() : null;
-                    scope.config = config;
-                    scope.isPackage = config != null && config.isPackage;
+                    scope.config = _config;
+                    scope.isPackage = _config != null && _config.isPackage;
                     activate();
                 }
             }
@@ -115,11 +114,11 @@ export function SendItem($q, api, search, desks, notify, authoringWorkspace,
                                     (subscriber) => {
                                         subscriber.destinations = subscriber.destinations.filter(
                                             (destination) => typeof destination.preview_endpoint_url === 'string'
-                                                && destination.preview_endpoint_url.length > 0
+                                                && destination.preview_endpoint_url.length > 0,
                                         );
 
                                         return subscriber;
-                                    }
+                                    },
                                 )
                                 .filter((subscriber) => subscriber.destinations.length > 0);
                         });
@@ -136,7 +135,7 @@ export function SendItem($q, api, search, desks, notify, authoringWorkspace,
                     modal.alert({
                         headerText: gettext('Preview'),
                         bodyText: gettext(
-                            'In order to preview the item, save the changes first.'
+                            'In order to preview the item, save the changes first.',
                         ),
                     });
                 } else {
@@ -148,7 +147,7 @@ export function SendItem($q, api, search, desks, notify, authoringWorkspace,
                                     documentId={scope.item._id}
                                     urls={urls}
                                     closeModal={closeModal}
-                                />
+                                />,
                             );
                         });
                 }
@@ -433,7 +432,7 @@ export function SendItem($q, api, search, desks, notify, authoringWorkspace,
              * @returns {Boolean}
              */
             scope.canSendItem = function() {
-                var itemType = [], typesList;
+                var itemType: any = [], typesList;
 
                 if (scope.multiItems) {
                     angular.forEach(scope.multiItems, (item) => {
@@ -551,7 +550,7 @@ export function SendItem($q, api, search, desks, notify, authoringWorkspace,
                         })
                         .finally(() => {
                             scope.loading = false;
-                        })
+                        }),
                     );
             };
 
@@ -574,7 +573,7 @@ export function SendItem($q, api, search, desks, notify, authoringWorkspace,
                     gettext('The package contains published items which can\'t be moved.'),
                     gettext('Warning'),
                     gettext('Continue'),
-                    gettext('Cancel')
+                    gettext('Cancel'),
                 );
 
             const containsPublishedItems = (items) => {
diff --git a/scripts/apps/authoring/authoring/directives/TansaScopeSyncDirective.js b/scripts/apps/authoring/authoring/directives/TansaScopeSyncDirective.ts
similarity index 91%
rename from scripts/apps/authoring/authoring/directives/TansaScopeSyncDirective.js
rename to scripts/apps/authoring/authoring/directives/TansaScopeSyncDirective.ts
index e4e6cd75ee..3c6cdbf1d6 100644
--- a/scripts/apps/authoring/authoring/directives/TansaScopeSyncDirective.js
+++ b/scripts/apps/authoring/authoring/directives/TansaScopeSyncDirective.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 /*
  * TansaScopeSync synchornises any changes caused by tansa to the DOM with the ng-model of the host
  */
@@ -23,7 +25,7 @@ export function TansaScopeSyncDirective($rootScope) {
                 }
 
                 var txt = $(node).find('.text-editor');
-                var tag = _.find(txt, (elem) => $(elem).is(':visible'));
+                var tag = _.find(txt, (_elem) => $(_elem).is(':visible'));
 
                 if (tag) {
                     return tag.innerHTML;
diff --git a/scripts/apps/authoring/authoring/helpers.js b/scripts/apps/authoring/authoring/helpers.ts
similarity index 94%
rename from scripts/apps/authoring/authoring/helpers.js
rename to scripts/apps/authoring/authoring/helpers.ts
index 00e96a46bf..fd278cfc20 100644
--- a/scripts/apps/authoring/authoring/helpers.js
+++ b/scripts/apps/authoring/authoring/helpers.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {stripHtmlTags} from 'core/utils';
 import {META_FIELD_NAME, fieldsMetaKeys, getFieldMetadata} from 'core/editor3/helpers/fieldsMeta';
 import {isSuggestion, isComment} from 'core/editor3/highlightsConfig';
@@ -174,7 +175,6 @@ export function removeWhitespaces(data) {
         .trim();
 }
 
-
 /**
  * Removes whitespaces for fields
  * @param item
@@ -189,7 +189,6 @@ export function stripWhitespaces(item) {
     });
 }
 
-
 /**
  * Check if the item has at least one style of type suggestion
  */
@@ -199,8 +198,8 @@ export function itemHasUnresolvedHighlight(item, isHighlightFn) {
         .filter((draftjsState) => draftjsState != null)
         .some((draftjsState) => (draftjsState.blocks || [])
             .some((block) => (block.inlineStyleRanges || [])
-                .some((inlineStyleRange) => isHighlightFn(inlineStyleRange.style))
-            )
+                .some((inlineStyleRange) => isHighlightFn(inlineStyleRange.style)),
+            ),
         );
 }
 
@@ -212,7 +211,6 @@ export function itemHasUnresolvedComments(item) {
     return itemHasUnresolvedHighlight(item, isComment);
 }
 
-
 /**
  * Removes renditions from previously used image(s)
  * @param {object} update
@@ -248,17 +246,17 @@ export function cutoffPreviousRenditions(update, origItem) {
         // image was changed
         if (updateRenditions.original.href !== origRenditions.original.href) {
             // walk through all renditions
-            Object.keys(origRenditions).forEach((key) => {
+            Object.keys(origRenditions).forEach((_key) => {
                 // ignore default renditions, because all images have default renditions
-                if (!(key in defaultRenditions) &&
-                    key in updateRenditions &&
-                    origRenditions[key] !== null &&
+                if (!(_key in defaultRenditions) &&
+                    _key in updateRenditions &&
+                    origRenditions[_key] !== null &&
                     // image was changed, but rendition(s) still equal
-                    origRenditions[key].href === updateRenditions[key].href) {
+                    origRenditions[_key].href === updateRenditions[_key].href) {
                     // remove rendition from previously used image
-                    delete updateRenditions[key];
+                    delete updateRenditions[_key];
                 }
             });
         }
     });
-}
\ No newline at end of file
+}
diff --git a/scripts/apps/authoring/authoring/preview-test-server/server.js b/scripts/apps/authoring/authoring/preview-test-server/server.js
index 7b894d6bd7..0dbd80a7d9 100644
--- a/scripts/apps/authoring/authoring/preview-test-server/server.js
+++ b/scripts/apps/authoring/authoring/preview-test-server/server.js
@@ -1,8 +1,8 @@
 // npm install express cors body-parser
 
-const express = require('express');
-var cors = require('cors');
-const bodyParser = require('body-parser');
+import express from 'express';
+import cors from 'cors';
+import bodyParser from 'body-parser';
 
 const app = express();
 
diff --git a/scripts/apps/authoring/authoring/services/AuthoringService.js b/scripts/apps/authoring/authoring/services/AuthoringService.ts
similarity index 98%
rename from scripts/apps/authoring/authoring/services/AuthoringService.js
rename to scripts/apps/authoring/authoring/services/AuthoringService.ts
index ed4b3f7280..d848ec47d4 100644
--- a/scripts/apps/authoring/authoring/services/AuthoringService.js
+++ b/scripts/apps/authoring/authoring/services/AuthoringService.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import * as helpers from 'apps/authoring/authoring/helpers';
 import {gettext} from 'core/utils';
 
@@ -376,7 +377,7 @@ export function AuthoringService($q, $location, api, lock, autosave, confirm, pr
      * @param {Object} item
      * @param {string} userId
      */
-    this.lock = function lock(item, userId) {
+    this.lock = function(item, userId) {
         autosave.stop(item);
         api.find('users', userId).then((user) => {
             item.lock_user = user;
@@ -396,7 +397,7 @@ export function AuthoringService($q, $location, api, lock, autosave, confirm, pr
         var action = angular.extend({}, helpers.DEFAULT_ACTIONS);
         var itemOnReadOnlyStage = item && item.task && item.task.stage && desks.isReadOnlyStage(item.task.stage);
         var isUndefinedOperation = angular.isUndefined(currentItem) || angular.isUndefined(userPrivileges);
-        const isKilledItem = (item) => _.get(item, 'state') === 'killed' || _.get(item, 'state') === 'recalled';
+        const isKilledItem = (_item) => _.get(_item, 'state') === 'killed' || _.get(_item, 'state') === 'recalled';
 
         action = this._updateActionsForContentApi(currentItem, action);
 
@@ -444,10 +445,10 @@ export function AuthoringService($q, $location, api, lock, autosave, confirm, pr
 
     this._updateActionsForContentApi = function(item, action) {
         if (this.isContentApiItem(item)) {
-            let action = angular.extend({}, helpers.DEFAULT_ACTIONS);
+            let _action = angular.extend({}, helpers.DEFAULT_ACTIONS);
 
-            action.view = false;
-            return action;
+            _action.view = false;
+            return _action;
         }
 
         return action;
@@ -565,7 +566,6 @@ export function AuthoringService($q, $location, api, lock, autosave, confirm, pr
 
             var desk = _.find(userDesks, {_id: currentItem.task.desk});
 
-
             if (!desk) {
                 action = angular.extend({}, helpers.DEFAULT_ACTIONS);
                 // user can action `update` even if the user is not a member.
@@ -612,7 +612,7 @@ export function AuthoringService($q, $location, api, lock, autosave, confirm, pr
         var now = moment();
         var schedule = moment.tz(
             timestamp.replace('+0000', '').replace('Z', ''), // avoid timezone info here
-            timezone || config.defaultTimezone
+            timezone || config.defaultTimezone,
         );
 
         if (!schedule.isValid()) {
diff --git a/scripts/apps/authoring/authoring/services/AuthoringThemesService.js b/scripts/apps/authoring/authoring/services/AuthoringThemesService.ts
similarity index 98%
rename from scripts/apps/authoring/authoring/services/AuthoringThemesService.js
rename to scripts/apps/authoring/authoring/services/AuthoringThemesService.ts
index c70d057ca1..ecd9fc1ac4 100644
--- a/scripts/apps/authoring/authoring/services/AuthoringThemesService.js
+++ b/scripts/apps/authoring/authoring/services/AuthoringThemesService.ts
@@ -1,6 +1,6 @@
 AuthoringThemesService.$inject = ['storage', 'preferencesService'];
 export function AuthoringThemesService(storage, preferencesService) {
-    var service = {};
+    var service: any = {};
 
     var PREFERENCES_KEY = 'editor:theme';
 
diff --git a/scripts/apps/authoring/authoring/services/AutosaveService.js b/scripts/apps/authoring/authoring/services/AutosaveService.ts
similarity index 98%
rename from scripts/apps/authoring/authoring/services/AutosaveService.js
rename to scripts/apps/authoring/authoring/services/AutosaveService.ts
index 7846fc080b..73784f0703 100644
--- a/scripts/apps/authoring/authoring/services/AutosaveService.js
+++ b/scripts/apps/authoring/authoring/services/AutosaveService.ts
@@ -6,6 +6,8 @@ const RESOURCE = 'archive_autosave',
 let $q, $timeout, api;
 
 export class AutosaveService {
+    timeouts: any;
+
     constructor(_$q, _$timeout, _api) {
         $q = _$q;
         $timeout = _$timeout;
diff --git a/scripts/apps/authoring/compare-versions/CompareVersionsController.js b/scripts/apps/authoring/compare-versions/CompareVersionsController.ts
similarity index 96%
rename from scripts/apps/authoring/compare-versions/CompareVersionsController.js
rename to scripts/apps/authoring/compare-versions/CompareVersionsController.ts
index 58df9d8248..1b93379a5d 100644
--- a/scripts/apps/authoring/compare-versions/CompareVersionsController.js
+++ b/scripts/apps/authoring/compare-versions/CompareVersionsController.ts
@@ -9,6 +9,10 @@
  * provides set of convenience functions used by compare-versions screen.
  */
 export default class CompareVersionsController {
+    compareVersions: any;
+    lock: any;
+    $scope: any;
+
     constructor($scope, compareVersions, lock) {
         this.compareVersions = compareVersions;
         this.lock = lock;
diff --git a/scripts/apps/authoring/compare-versions/CompareVersionsService.js b/scripts/apps/authoring/compare-versions/CompareVersionsService.ts
similarity index 96%
rename from scripts/apps/authoring/compare-versions/CompareVersionsService.js
rename to scripts/apps/authoring/compare-versions/CompareVersionsService.ts
index b7ed223f37..1348d45033 100644
--- a/scripts/apps/authoring/compare-versions/CompareVersionsService.js
+++ b/scripts/apps/authoring/compare-versions/CompareVersionsService.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 /**
  * @ngdoc service
  * @module superdesk.apps.authoring.compare_versions
@@ -14,6 +16,15 @@
 const MIN_BOARDS = 2; // at least two boards to display for versions comparision.
 
 export default class CompareVersionsService {
+    superdesk: any;
+    authoringWorkspace: any;
+    referrer: any;
+    desks: any;
+    archiveService: any;
+    $location: any;
+    items: any;
+    versions: any;
+
     constructor(superdesk, authoringWorkspace, referrer, desks, archiveService, $location) {
         this.superdesk = superdesk;
         this.authoringWorkspace = authoringWorkspace;
@@ -35,7 +46,7 @@ export default class CompareVersionsService {
          * @ngdoc property
          * @name compareVersions#versions
          * @type {Array<object>}
-         * @description Maintains array of object that contains all available versions of an opened article.
+
          */
         this.versions = [];
     }
@@ -144,7 +155,6 @@ export default class CompareVersionsService {
         return {article: itemVersion};
     }
 
-
     init(item) {
         this.desks.initialize()
             .then(() => this.archiveService.getVersions(item, this.desks, 'versions'))
diff --git a/scripts/apps/authoring/compare-versions/directives/CompareVersionsArticleDirective.js b/scripts/apps/authoring/compare-versions/directives/CompareVersionsArticleDirective.ts
similarity index 97%
rename from scripts/apps/authoring/compare-versions/directives/CompareVersionsArticleDirective.js
rename to scripts/apps/authoring/compare-versions/directives/CompareVersionsArticleDirective.ts
index 7eb275e576..943343a763 100644
--- a/scripts/apps/authoring/compare-versions/directives/CompareVersionsArticleDirective.js
+++ b/scripts/apps/authoring/compare-versions/directives/CompareVersionsArticleDirective.ts
@@ -1,7 +1,16 @@
 import DiffMatchPatch from 'diff-match-patch';
 import shortid from 'shortid';
+import _ from 'lodash';
 
 class LinkFunction {
+    compareVersions: any;
+    content: any;
+    lock: any;
+    $timeout: any;
+    scope: any;
+    elem: any;
+    diffMatchPatch: any;
+
     constructor(compareVersions, content, lock, $timeout, scope, elem) {
         this.compareVersions = compareVersions;
         this.content = content;
@@ -98,7 +107,7 @@ class LinkFunction {
                     if (item.extra[field._id] || oldItem.extra[field._id]) {
                         item.extra[field._id] = this.highlightDifferences(
                             item.extra[field._id],
-                            oldItem.extra[field._id]
+                            oldItem.extra[field._id],
                         );
                     }
                 });
@@ -108,7 +117,7 @@ class LinkFunction {
                 oldItem.associations && oldItem.associations.featuremedia) {
                 item.associations.featuremedia.description_text = this.highlightDifferences(
                     item.associations.featuremedia.description_text,
-                    oldItem.associations.featuremedia.description_text
+                    oldItem.associations.featuremedia.description_text,
                 );
             }
         });
@@ -171,7 +180,7 @@ class LinkFunction {
         _.map(Object.keys(mapWords), (key) => {
             result = result.replace(
                 new RegExp(key.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'),
-                ' ' + mapWords[key] + ' '
+                ' ' + mapWords[key] + ' ',
             );
         });
 
diff --git a/scripts/apps/authoring/compare-versions/directives/CompareVersionsDropdownDirective.js b/scripts/apps/authoring/compare-versions/directives/CompareVersionsDropdownDirective.ts
similarity index 96%
rename from scripts/apps/authoring/compare-versions/directives/CompareVersionsDropdownDirective.js
rename to scripts/apps/authoring/compare-versions/directives/CompareVersionsDropdownDirective.ts
index 2bad745ead..39b132f427 100644
--- a/scripts/apps/authoring/compare-versions/directives/CompareVersionsDropdownDirective.js
+++ b/scripts/apps/authoring/compare-versions/directives/CompareVersionsDropdownDirective.ts
@@ -1,4 +1,12 @@
+import _ from 'lodash';
+
 class LinkFunction {
+    compareVersions: any;
+    desks: any;
+    archiveService: any;
+    scope: any;
+    elem: any;
+
     constructor(compareVersions, desks, archiveService, scope, elem) {
         this.compareVersions = compareVersions;
         this.desks = desks;
@@ -52,7 +60,6 @@ class LinkFunction {
             });
     }
 
-
     /**
      * @ngdoc method
      * @name sdCompareVersionsDropdown#toggle
diff --git a/scripts/apps/authoring/compare-versions/directives/CompareVersionsDropdownInnerDirective.js b/scripts/apps/authoring/compare-versions/directives/CompareVersionsDropdownInnerDirective.ts
similarity index 90%
rename from scripts/apps/authoring/compare-versions/directives/CompareVersionsDropdownInnerDirective.js
rename to scripts/apps/authoring/compare-versions/directives/CompareVersionsDropdownInnerDirective.ts
index 93183ee731..eff9131826 100644
--- a/scripts/apps/authoring/compare-versions/directives/CompareVersionsDropdownInnerDirective.js
+++ b/scripts/apps/authoring/compare-versions/directives/CompareVersionsDropdownInnerDirective.ts
@@ -1,4 +1,12 @@
+import _ from 'lodash';
+
 class LinkFunction {
+    compareVersions: any;
+    scope: any;
+    elem: any;
+    attrs: any;
+    compareVersionsItems: any;
+
     constructor(compareVersions, scope, elem, attrs) {
         this.compareVersions = compareVersions;
         this.scope = scope;
@@ -32,7 +40,7 @@ class LinkFunction {
     // provides unselected versions to fill in inner dropdown
     filter() {
         this.scope.items = _.reject(this.compareVersions.versions, (item) =>
-            _.find(this.compareVersionsItems, {id: item._id, version: item._current_version}));
+            !!_.find(this.compareVersionsItems, {id: item._id, version: item._current_version}));
     }
 
     /**
diff --git a/scripts/apps/authoring/editor/find-replace.js b/scripts/apps/authoring/editor/find-replace.ts
similarity index 97%
rename from scripts/apps/authoring/editor/find-replace.js
rename to scripts/apps/authoring/editor/find-replace.ts
index de712482ed..33aaf5ff6f 100644
--- a/scripts/apps/authoring/editor/find-replace.js
+++ b/scripts/apps/authoring/editor/find-replace.ts
@@ -10,7 +10,6 @@
 
 import {gettext} from 'core/utils';
 
-
 FindReplaceDirective.$inject = ['editorResolver', 'macros'];
 /**
  * using directive here so that it can return focus
@@ -57,7 +56,7 @@ function FindReplaceDirective(editorResolver, macros) {
             };
 
             scope.$watch('from', (needle) => {
-                var input = document.getElementById('find-replace-what');
+                var input: any = document.getElementById('find-replace-what');
                 var selectionStart = input.selectionStart;
                 var selectionEnd = input.selectionEnd;
 
diff --git a/scripts/apps/authoring/macros/macros.js b/scripts/apps/authoring/macros/macros.ts
similarity index 99%
rename from scripts/apps/authoring/macros/macros.js
rename to scripts/apps/authoring/macros/macros.ts
index 85f32ad79d..84dbad066b 100644
--- a/scripts/apps/authoring/macros/macros.js
+++ b/scripts/apps/authoring/macros/macros.ts
@@ -9,6 +9,7 @@
  */
 
 import {gettext} from 'core/utils';
+import _ from 'lodash';
 
 MacrosService.$inject = ['api', 'notify'];
 function MacrosService(api, notify) {
@@ -73,7 +74,7 @@ function MacrosService(api, notify) {
 
     this.call = triggerMacro;
 
-    function triggerMacro(macro, item, commit) {
+    function triggerMacro(macro, item, commit?) {
         return api.save('macros', {
             macro: macro.name,
             item: item,
diff --git a/scripts/apps/authoring/metadata/metadata.js b/scripts/apps/authoring/metadata/metadata.ts
similarity index 98%
rename from scripts/apps/authoring/metadata/metadata.js
rename to scripts/apps/authoring/metadata/metadata.ts
index 42b0c12c63..2694b24c49 100644
--- a/scripts/apps/authoring/metadata/metadata.js
+++ b/scripts/apps/authoring/metadata/metadata.ts
@@ -135,7 +135,7 @@ function MetadataCtrl(
                 $scope.item.publish_schedule = datetimeHelper.mergeDateTime(
                     $scope.item.publish_schedule_date,
                     $scope.item.publish_schedule_time,
-                    $scope.item.time_zone
+                    $scope.item.time_zone,
                 );
                 setTimeZone();
             } else {
@@ -170,7 +170,7 @@ function MetadataCtrl(
                 $scope.item.embargo = datetimeHelper.mergeDateTime(
                     $scope.item.embargo_date,
                     $scope.item.embargo_time,
-                    $scope.item.time_zone
+                    $scope.item.time_zone,
                 );
                 setTimeZone();
             } else {
@@ -545,9 +545,9 @@ function MetaWordsListDirective() {
              * @param {Object} item selected word object
              */
             scope.select = function(item) {
-                var keyword = item ? item.qcode : scope.selectedTerm;
-                var t = _.clone(scope.item[scope.field]) || [];
-                var index = _.findIndex(t, (word) => word.toLowerCase() === keyword.toLowerCase());
+                var keyword: any = item ? item.qcode : scope.selectedTerm;
+                var t: any = _.clone(scope.item[scope.field]) || [];
+                var index = _.findIndex(t, (word: any) => word.toLowerCase() === keyword.toLowerCase());
 
                 if (index < 0) {
                     t.push(keyword);
@@ -638,7 +638,7 @@ function MetaTermsDirective(metadata, $filter, $timeout, preferencesService, des
                     return;
                 }
 
-                var tree = {}, updates = {};
+                var tree: any = {}, updates = {};
 
                 if (scope.cv && scope.cv.dependent) {
                     updates[scope.field] = [];
@@ -705,8 +705,8 @@ function MetaTermsDirective(metadata, $filter, $timeout, preferencesService, des
                 if ($event.altKey) {
                     let activeTree = scope.tree[term ? term[scope.uniqueField] : null];
 
-                    return angular.forEach(activeTree, (term) => {
-                        scope.selectTerm(term, $event);
+                    return angular.forEach(activeTree, (_term) => {
+                        scope.selectTerm(_term, $event);
                     });
                 }
 
@@ -794,11 +794,11 @@ function MetaTermsDirective(metadata, $filter, $timeout, preferencesService, des
                     }
 
                     if (scope.cv && scope.cv.selection_type === SINGLE_SELECTION) {
-                        t = _.filter(t, (term) => term.scheme !== scope.cv._id);
+                        t = _.filter(t, (_term) => _term.scheme !== scope.cv._id);
                     }
 
                     // build object
-                    var o = {};
+                    var o: any = {};
 
                     if (term.language && scope.setLanguage) {
                         o.language = term.language;
@@ -818,8 +818,8 @@ function MetaTermsDirective(metadata, $filter, $timeout, preferencesService, des
                     addTerm(term);
 
                     if (includeParent) {
-                        scope.termPath.forEach((term) => {
-                            addTerm(term);
+                        scope.termPath.forEach((_term) => {
+                            addTerm(_term);
                         });
                     }
 
@@ -1094,10 +1094,10 @@ function MetadataService(api, subscribersService, config, vocabularies, $rootSco
                 });
                 self.cvs = result;
                 self.values.regions = _.sortBy(self.values.geographical_restrictions,
-                    (target) => target.value && target.value.toLowerCase() === 'all' ? '' : target.name
+                    (target) => target.value && target.value.toLowerCase() === 'all' ? '' : target.name,
                 );
                 self.values.subscriberTypes = _.sortBy(self.values.subscriber_types,
-                    (target) => target.value && target.value.toLowerCase() === 'all' ? '' : target.name
+                    (target) => target.value && target.value.toLowerCase() === 'all' ? '' : target.name,
                 );
 
                 if (self.values.urgency) {
@@ -1236,7 +1236,7 @@ function MetadataService(api, subscribersService, config, vocabularies, $rootSco
         getCustomVocabulariesForArticleHeader: function(qcodes, editor, schema) {
             return this.getFilteredCustomVocabularies(qcodes)
                 .then(
-                    (cvs) => cvs.filter((cv) => cv.terms.length && (editor[cv._id] || schema[cv._id]))
+                    (cvs) => cvs.filter((cv) => cv.terms.length && (editor[cv._id] || schema[cv._id])),
                 );
         },
         /**
@@ -1249,11 +1249,11 @@ function MetadataService(api, subscribersService, config, vocabularies, $rootSco
         getAllCustomVocabulariesForArticleHeader: function(editor, schema) {
             return this.fetchMetadataValues().then(() => {
                 const customVocabulariesForArticleHeader = this.cvs.filter(
-                    (cv) => cv.items.length && cv.service && (editor[cv._id] || schema[cv._id])
+                    (cv) => cv.items.length && cv.service && (editor[cv._id] || schema[cv._id]),
                 );
 
                 const customTextAndDateVocabularies = this.cvs.filter(
-                    (cv) => cv.field_type === 'text' || cv.field_type === 'date'
+                    (cv) => cv.field_type === 'text' || cv.field_type === 'date',
                 );
 
                 return {customVocabulariesForArticleHeader, customTextAndDateVocabularies};
@@ -1310,7 +1310,6 @@ function MetadataListItem() {
     };
 }
 
-
 angular.module('superdesk.apps.authoring.metadata', [
     'superdesk.apps.authoring.widgets',
     'superdesk.apps.publish',
diff --git a/scripts/apps/authoring/multiedit/multiedit.js b/scripts/apps/authoring/multiedit/multiedit.ts
similarity index 99%
rename from scripts/apps/authoring/multiedit/multiedit.js
rename to scripts/apps/authoring/multiedit/multiedit.ts
index 0a05b68fed..30557f7cf1 100644
--- a/scripts/apps/authoring/multiedit/multiedit.js
+++ b/scripts/apps/authoring/multiedit/multiedit.ts
@@ -9,7 +9,7 @@
  */
 
 import {gettext} from 'core/utils';
-
+import _ from 'lodash';
 
 MultieditService.$inject = ['storage', 'superdesk', 'authoringWorkspace', 'referrer', '$location'];
 function MultieditService(storage, superdesk, authoringWorkspace, referrer, $location) {
@@ -271,7 +271,7 @@ function MultieditFloatMenuDirective($document) {
             function getPosition(crdL, crdT) {
                 var docHeight = $document.height();
                 var docWidth = $document.width();
-                var position = {
+                var position: any = {
                     right: docWidth - crdL,
                 };
 
diff --git a/scripts/apps/authoring/packages/packages.js b/scripts/apps/authoring/packages/packages.ts
similarity index 98%
rename from scripts/apps/authoring/packages/packages.js
rename to scripts/apps/authoring/packages/packages.ts
index be7e4c0f2e..df3a2fc5c4 100644
--- a/scripts/apps/authoring/packages/packages.js
+++ b/scripts/apps/authoring/packages/packages.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 PackagesCtrl.$inject = ['$scope', 'superdesk', 'api', 'search'];
diff --git a/scripts/apps/authoring/suggest/SuggestController.js b/scripts/apps/authoring/suggest/SuggestController.ts
similarity index 98%
rename from scripts/apps/authoring/suggest/SuggestController.js
rename to scripts/apps/authoring/suggest/SuggestController.ts
index 33c068eaa7..2b123376f9 100644
--- a/scripts/apps/authoring/suggest/SuggestController.js
+++ b/scripts/apps/authoring/suggest/SuggestController.ts
@@ -9,6 +9,9 @@
  * @see sdSuggest
  */
 export default class SuggestController {
+    desks: any;
+    scope: any;
+
     constructor(desks, scope) {
         this.desks = desks;
         this.scope = scope;
diff --git a/scripts/apps/authoring/suggest/SuggestDirective.js b/scripts/apps/authoring/suggest/SuggestDirective.ts
similarity index 97%
rename from scripts/apps/authoring/suggest/SuggestDirective.js
rename to scripts/apps/authoring/suggest/SuggestDirective.ts
index 5fe3770781..ed644a1fbb 100644
--- a/scripts/apps/authoring/suggest/SuggestDirective.js
+++ b/scripts/apps/authoring/suggest/SuggestDirective.ts
@@ -1,6 +1,10 @@
 import SuggestController from './SuggestController';
 
 class LinkFunction {
+    suggest: any;
+    scope: any;
+    elem: any;
+
     constructor(suggest, scope, elem) {
         this.suggest = suggest;
         this.scope = scope;
diff --git a/scripts/apps/authoring/suggest/SuggestService.js b/scripts/apps/authoring/suggest/SuggestService.ts
similarity index 97%
rename from scripts/apps/authoring/suggest/SuggestService.js
rename to scripts/apps/authoring/suggest/SuggestService.ts
index 45fbfa44c8..0d73f1deb6 100644
--- a/scripts/apps/authoring/suggest/SuggestService.js
+++ b/scripts/apps/authoring/suggest/SuggestService.ts
@@ -9,6 +9,11 @@
  * suggestions panel, as well as set it as active or inactive.
  */
 export default class SuggestService {
+    api: any;
+    autosave: any;
+    active: any;
+    _listener: any;
+
     constructor(api, autosave) {
         this.autosave = autosave;
         this.api = api;
diff --git a/scripts/apps/authoring/tests/authoring.spec.js b/scripts/apps/authoring/tests/authoring.spec.ts
similarity index 99%
rename from scripts/apps/authoring/tests/authoring.spec.js
rename to scripts/apps/authoring/tests/authoring.spec.ts
index bd7cd9189e..2b92855691 100644
--- a/scripts/apps/authoring/tests/authoring.spec.js
+++ b/scripts/apps/authoring/tests/authoring.spec.ts
@@ -1,7 +1,7 @@
 describe('authoring', () => {
     var GUID = 'urn:tag:superdesk-1';
     var USER = 'user:1';
-    var ITEM = {guid: GUID};
+    var ITEM: any = {guid: GUID};
 
     beforeEach(window.module(($provide) => {
         $provide.constant('lodash', _);
@@ -66,7 +66,7 @@ describe('authoring', () => {
 
     it('does lock item only once',
         inject((superdesk, api, lock, autosave, session, $injector, $q, $rootScope) => {
-            var lockedItem = ITEM;
+            var lockedItem: any = ITEM;
 
             lockedItem.lock_user = USER;
             lockedItem.lock_session = session.sessionId;
@@ -577,14 +577,14 @@ describe('authoring', () => {
                 timestamp.slice(0, 10),
                 timestamp.slice(11, 19),
                 timestamp,
-                'America/Toronto' // anything before utc
+                'America/Toronto', // anything before utc
             )).toBeFalsy();
         }));
 
         it('updates orig item on save',
             inject((authoring, $rootScope, $httpBackend, api, $q, urls) => {
                 var item = {headline: 'foo'};
-                var orig = {_links: {self: {href: 'archive/foo'}}};
+                var orig: any = {_links: {self: {href: 'archive/foo'}}};
 
                 spyOn(urls, 'item').and.returnValue($q.when(orig._links.self.href));
                 $httpBackend.expectPATCH(orig._links.self.href, item)
@@ -678,7 +678,7 @@ describe('Item Crops directive', () => {
             scope.$digest();
 
             expect(iScope.showCrops()).toBe(true);
-        })
+        }),
     );
 });
 
@@ -713,7 +713,7 @@ describe('autosave', () => {
         }));
 
     it('can create an autosave', inject((autosave, api, $q, $timeout, $rootScope) => {
-        var orig = {_id: 1, _etag: 'x', _locked: true, _editable: true};
+        var orig: any = {_id: 1, _etag: 'x', _locked: true, _editable: true};
         var item = Object.create(orig);
 
         item.headline = 'test';
@@ -1179,7 +1179,7 @@ describe('authoring actions', () => {
 
     it('Can perform resend on rewritten item',
         inject((privileges, desks, authoring, $q, $rootScope) => {
-            var item = {
+            var item: any = {
                 _id: 'test',
                 state: 'published',
                 flags: {marked_for_not_publication: false},
diff --git a/scripts/apps/authoring/tests/changeImage.spec.js b/scripts/apps/authoring/tests/changeImage.spec.ts
similarity index 98%
rename from scripts/apps/authoring/tests/changeImage.spec.js
rename to scripts/apps/authoring/tests/changeImage.spec.ts
index f8e14f0ff8..9ab436f4e5 100644
--- a/scripts/apps/authoring/tests/changeImage.spec.js
+++ b/scripts/apps/authoring/tests/changeImage.spec.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {ChangeImageController} from '../authoring/controllers/ChangeImageController';
 import {gettext} from 'core/utils';
 
@@ -54,7 +55,7 @@ describe('authoring ChangeImageController', () => {
             ChangeImageController(scope, notify, _, api, $rootScope, deployConfig, $q, config);
             scope.saveAreaOfInterest(croppingData);
             expect(notify.error).toHaveBeenCalledWith(
-                gettext('Original size cannot be less than the required crop sizes.')
+                gettext('Original size cannot be less than the required crop sizes.'),
             );
         }));
 
@@ -92,7 +93,7 @@ describe('authoring ChangeImageController', () => {
             $rootScope.$digest();
 
             expect(notify.error).toHaveBeenCalledWith(
-                gettext('Failed to save the area of interest: Failed to call picture_crop.')
+                gettext('Failed to save the area of interest: Failed to call picture_crop.'),
             );
 
             expect(scope.loaderForAoI).toBeFalsy();
@@ -126,7 +127,7 @@ describe('authoring ChangeImageController', () => {
             $rootScope.$digest();
 
             expect(notify.error).toHaveBeenCalledWith(
-                gettext('Failed to save the area of interest: Failed to call picture_renditions.')
+                gettext('Failed to save the area of interest: Failed to call picture_renditions.'),
             );
 
             expect(scope.loaderForAoI).toBeFalsy();
@@ -204,7 +205,7 @@ describe('authoring ChangeImageController', () => {
 
                 expect(scope.data.poi).toEqual({x: 0.5, y: 0.5});
                 expect(scope.data.metadata.poi).toBeFalsy();
-            })
+            }),
         );
 
         it('No error thrown if poi is specified', inject((api, $rootScope, $q, notify, config) => {
diff --git a/scripts/apps/authoring/translations/index.js b/scripts/apps/authoring/translations/index.ts
similarity index 98%
rename from scripts/apps/authoring/translations/index.js
rename to scripts/apps/authoring/translations/index.ts
index bc3a072a93..7b03d6dabf 100644
--- a/scripts/apps/authoring/translations/index.js
+++ b/scripts/apps/authoring/translations/index.ts
@@ -40,4 +40,4 @@ angular.module('superdesk.apps.authoring.translations', [
                 },
             });
     }])
-    .component('translationsWidget', reactToAngular1(TranslationsWidget, ['item']));
\ No newline at end of file
+    .component('translationsWidget', reactToAngular1(TranslationsWidget, ['item']));
diff --git a/scripts/apps/authoring/versioning/history/HistoryController.js b/scripts/apps/authoring/versioning/history/HistoryController.ts
similarity index 98%
rename from scripts/apps/authoring/versioning/history/HistoryController.js
rename to scripts/apps/authoring/versioning/history/HistoryController.ts
index 93c1b6c03f..a8a443f155 100644
--- a/scripts/apps/authoring/versioning/history/HistoryController.js
+++ b/scripts/apps/authoring/versioning/history/HistoryController.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 HistoryController.$inject = [
     '$scope',
     'desks',
@@ -64,7 +66,7 @@ export function HistoryController(
                     // Filter out item_lock and item_unlock history entries
                     if ($scope.historyItems && $scope.historyItems.length > 0) {
                         $scope.historyItems = $scope.historyItems.filter(
-                            (entry) => !entry.operation || ['item_lock', 'item_unlock'].indexOf(entry.operation) < 0
+                            (entry) => !entry.operation || ['item_lock', 'item_unlock'].indexOf(entry.operation) < 0,
                         );
                     }
                 })
@@ -180,6 +182,5 @@ export function HistoryController(
         h.fieldsUpdated = h.update ? Object.keys(h.update).join(', ') : null;
     };
 
-
     $scope.$watchGroup(['item._id', 'item._latest_version'], fetchHistory);
-}
\ No newline at end of file
+}
diff --git a/scripts/apps/authoring/versioning/history/TransmissionDetailsDirective.js b/scripts/apps/authoring/versioning/history/TransmissionDetailsDirective.ts
similarity index 96%
rename from scripts/apps/authoring/versioning/history/TransmissionDetailsDirective.js
rename to scripts/apps/authoring/versioning/history/TransmissionDetailsDirective.ts
index 6adf510b6d..f7225784f4 100644
--- a/scripts/apps/authoring/versioning/history/TransmissionDetailsDirective.js
+++ b/scripts/apps/authoring/versioning/history/TransmissionDetailsDirective.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 TransmissionDetailsDirective.$inject = ['api'];
 export function TransmissionDetailsDirective(api) {
     return {
@@ -33,7 +35,7 @@ export function TransmissionDetailsDirective(api) {
                 scope.show_transmission_details = !scope.show_transmission_details;
 
                 if (scope.show_transmission_details) {
-                    var criteria = {max_results: 20};
+                    var criteria: any = {max_results: 20};
 
                     criteria.where = JSON.stringify({
                         $and: [{item_id: scope.item.item_id}, {item_version: scope.item.version}],
@@ -60,4 +62,4 @@ export function TransmissionDetailsDirective(api) {
             };
         },
     };
-}
\ No newline at end of file
+}
diff --git a/scripts/apps/authoring/widgets/widgets.ts b/scripts/apps/authoring/widgets/widgets.ts
index 0c222d095a..52c9ac23b0 100644
--- a/scripts/apps/authoring/widgets/widgets.ts
+++ b/scripts/apps/authoring/widgets/widgets.ts
@@ -1,6 +1,6 @@
 import {debounce} from 'lodash';
-import {IContentProfile} from "superdesk-interfaces/ContentProfile";
-import {isWidgetVisibleForContentProfile} from "apps/workspace/content/components/WidgetsConfig";
+import {IContentProfile} from 'superdesk-interfaces/ContentProfile';
+import {isWidgetVisibleForContentProfile} from 'apps/workspace/content/components/WidgetsConfig';
 import {gettext} from 'core/utils';
 
 function AuthoringWidgetsProvider() {
diff --git a/scripts/apps/contacts/controllers/ContactsController.js b/scripts/apps/contacts/controllers/ContactsController.ts
similarity index 94%
rename from scripts/apps/contacts/controllers/ContactsController.js
rename to scripts/apps/contacts/controllers/ContactsController.ts
index 78a0fef51b..f898ff8351 100644
--- a/scripts/apps/contacts/controllers/ContactsController.js
+++ b/scripts/apps/contacts/controllers/ContactsController.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {FILTER_FIELDS} from '../constants';
 import {gettext} from 'core/utils';
 
@@ -15,7 +16,13 @@ import {gettext} from 'core/utils';
  * @description ContactsController
  */
 export class ContactsController {
-    constructor($scope, $location, pageTitle, preferencesService, metadata, privileges, contacts, _) {
+    $scope: any;
+    $location: any;
+    contacts: any;
+    preferencesService: any;
+    preferencesUpdate: any;
+
+    constructor($scope, $location, pageTitle, preferencesService, metadata, privileges, contacts) {
         this.$scope = $scope;
         this.$location = $location;
         this.contacts = contacts;
@@ -117,4 +124,4 @@ export class ContactsController {
     }
 }
 ContactsController.$inject = ['$scope', '$location', 'pageTitle',
-    'preferencesService', 'metadata', 'privileges', 'contacts', 'lodash'];
+    'preferencesService', 'metadata', 'privileges', 'contacts'];
diff --git a/scripts/apps/contacts/directives/ContactList.js b/scripts/apps/contacts/directives/ContactList.ts
similarity index 96%
rename from scripts/apps/contacts/directives/ContactList.js
rename to scripts/apps/contacts/directives/ContactList.ts
index bb556eceb0..04689bf799 100644
--- a/scripts/apps/contacts/directives/ContactList.js
+++ b/scripts/apps/contacts/directives/ContactList.ts
@@ -2,6 +2,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
+import _ from 'lodash';
 
 import {ItemList as ItemListComponent} from 'apps/contacts/components';
 
@@ -35,7 +36,7 @@ export function ContactList(
     search,
     datetime,
     Keys,
-    $rootScope
+    $rootScope,
 ) {
     // contains all the injected services to be passed down to child
     // components via props
@@ -143,8 +144,8 @@ export function ContactList(
              * @param {Element} elem
              * @return {Boolean}
              */
-            function isListEnd(elem) {
-                return elem.scrollTop + elem.offsetHeight + 200 >= elem.scrollHeight;
+            function isListEnd(element) {
+                return element.scrollTop + element.offsetHeight + 200 >= element.scrollHeight;
             }
 
             elem.on('keydown', listComponent.handleKey);
diff --git a/scripts/apps/contacts/directives/ContactsSearchPanelDirective.js b/scripts/apps/contacts/directives/ContactsSearchPanelDirective.tsx
similarity index 96%
rename from scripts/apps/contacts/directives/ContactsSearchPanelDirective.js
rename to scripts/apps/contacts/directives/ContactsSearchPanelDirective.tsx
index 080d118a24..0d4e15d364 100644
--- a/scripts/apps/contacts/directives/ContactsSearchPanelDirective.js
+++ b/scripts/apps/contacts/directives/ContactsSearchPanelDirective.tsx
@@ -5,8 +5,13 @@ import {URL_PARAMETERS} from '../constants';
 import {SelectFieldSearchInput} from '../../contacts/components/Form';
 import {gettext} from 'core/utils';
 
-
 class LinkFunction {
+    scope: any;
+    elem: any;
+    orgField: any;
+    contacts: any;
+    $location: any;
+
     constructor(contacts, $location, scope, elem) {
         this.scope = scope;
         this.elem = elem;
@@ -21,7 +26,7 @@ class LinkFunction {
         this.scope.searchField = this.searchField.bind(this);
         this.scope.isSearchDifferent = this.isSearchDifferent.bind(this);
         this.handleOnChange = this.handleOnChange.bind(this);
-        this.init(true);
+        this.init();
 
         this.scope.$on('$locationChangeSuccess', () => {
             if (this.scope.query !== this.$location.search().q || this.scope.isSearchDifferent()) {
@@ -71,7 +76,7 @@ class LinkFunction {
         this.renderSearchField(field, false);
     }
 
-    renderSearchField(field, initValue) {
+    renderSearchField(field, initValue?) {
         let fieldElement;
         let fieldLabel;
         let querySearch = false;
@@ -95,11 +100,10 @@ class LinkFunction {
                 dataList={this.scope.filteredList[field]}
                 initValue={initValue}
             />
-            , fieldElement
+            , fieldElement,
         );
     }
 
-
     /**
      * @ngdoc method
      * @name sdContactsSearchPanel#setQueryString
@@ -177,7 +181,6 @@ class LinkFunction {
     }
 }
 
-
 /**
  * @ngdoc directive
  * @module superdesk.apps.contacts
diff --git a/scripts/apps/contacts/directives/ContactsSearchResultsDirective.js b/scripts/apps/contacts/directives/ContactsSearchResultsDirective.ts
similarity index 90%
rename from scripts/apps/contacts/directives/ContactsSearchResultsDirective.js
rename to scripts/apps/contacts/directives/ContactsSearchResultsDirective.ts
index 9975c1912b..8480c8a22e 100644
--- a/scripts/apps/contacts/directives/ContactsSearchResultsDirective.js
+++ b/scripts/apps/contacts/directives/ContactsSearchResultsDirective.ts
@@ -1,7 +1,18 @@
+import _ from 'lodash';
 import {URL_PARAMETERS} from '../constants';
 import {gettext} from 'core/utils';
 
 class LinkFunction {
+    scope: any;
+    elem: any;
+    containerElem: any;
+    notify: any;
+    $location: any;
+    $timeout: any;
+    contacts: any;
+    search: any;
+    criteria: any;
+
     constructor(contacts, search, notify, $location, $timeout, scope, elem) {
         this.scope = scope;
         this.elem = elem;
@@ -54,7 +65,7 @@ class LinkFunction {
      * @description Function for fetching the items.
      * @return {promise}
      */
-    queryItems(event, data) {
+    queryItems(event?, data?) {
         this.criteria = this.contacts.getCriteria();
 
         if (!(data && data.force) && this.scope.items && this.scope.items._items.length > this.criteria.max_results) {
@@ -97,12 +108,12 @@ class LinkFunction {
      * @param {boolean} force - initialize and refresh the list to display.
      * @description Fetch the items from backend and display the items.
      */
-    render(items, next, force) {
+    render(items, next, force?) {
         this.scope.loading = true;
 
-        const setScopeItems = (items, force) => {
-            this.scope.items = this.search.mergeItems(items, this.scope.items, next, force);
-            this.scope.total = items._meta.total;
+        const setScopeItems = (_items, _force) => {
+            this.scope.items = this.search.mergeItems(_items, this.scope.items, next, _force);
+            this.scope.total = _items._meta.total;
             this.scope.loading = false;
         };
 
diff --git a/scripts/apps/contacts/directives/ContactsSortBarDirective.js b/scripts/apps/contacts/directives/ContactsSortBarDirective.ts
similarity index 97%
rename from scripts/apps/contacts/directives/ContactsSortBarDirective.js
rename to scripts/apps/contacts/directives/ContactsSortBarDirective.ts
index 8e7d2089b7..30ce88260c 100644
--- a/scripts/apps/contacts/directives/ContactsSortBarDirective.js
+++ b/scripts/apps/contacts/directives/ContactsSortBarDirective.ts
@@ -1,6 +1,8 @@
 import {BaseSortBar} from 'apps/search/directives/BaseSortBar';
 
 class LinkFunction extends BaseSortBar {
+    contacts: any;
+
     constructor(contacts, sort, scope, elem) {
         super(scope, elem, sort);
         this.contacts = contacts;
diff --git a/scripts/apps/contacts/helpers.js b/scripts/apps/contacts/helpers.ts
similarity index 98%
rename from scripts/apps/contacts/helpers.js
rename to scripts/apps/contacts/helpers.ts
index b9a61d2870..d2ffd24660 100644
--- a/scripts/apps/contacts/helpers.js
+++ b/scripts/apps/contacts/helpers.ts
@@ -1,9 +1,9 @@
 import React from 'react';
+import _ from 'lodash';
 import {DEFAULT_LIST_CONFIG, LOOKUP_FIELDS, FB_URL, IG_URL} from './constants';
 import * as fields from './components/fields';
 
-
-export const onEventCapture = (event) => {
+export const onEventCapture = (event?) => {
     if (event) {
         event.preventDefault();
         event.stopPropagation();
@@ -61,7 +61,6 @@ export function validateRequiredFormFields(contact) {
     return validateRequiredField(contact) && validateMinRequiredField(contact);
 }
 
-
 export function validateRequiredField(contact) {
     const REQUIRED_CONTACT_FIELDS = getContactType(contact) === 'person' ?
         ['first_name', 'last_name'] : ['organisation'];
diff --git a/scripts/apps/contacts/services/ContactsService.js b/scripts/apps/contacts/services/ContactsService.ts
similarity index 95%
rename from scripts/apps/contacts/services/ContactsService.js
rename to scripts/apps/contacts/services/ContactsService.ts
index f03c2dafbc..457700f4f9 100644
--- a/scripts/apps/contacts/services/ContactsService.js
+++ b/scripts/apps/contacts/services/ContactsService.ts
@@ -14,6 +14,15 @@ const DEFAULT_PAGE_SIZE = 50;
  * @description Handles retrieval of data from contacts api
  */
 export class ContactsService {
+    api: any;
+    $location: any;
+    sort: any;
+    sortOptions: any;
+    search: any;
+    twitterPattern: any;
+    privacyOptions: any;
+    statusOptions: any;
+
     constructor(api, $location, sort, search) {
         this.api = api;
         this.$location = $location;
@@ -51,7 +60,7 @@ export class ContactsService {
      * @return {object}
      */
     getCriteria(param) {
-        let criteria = {};
+        let criteria: any = {};
         let params = param || this.$location.search();
         let sort = this.sort.getSort(this.sortOptions);
         let filters = [];
diff --git a/scripts/apps/content-api/controllers/ContentAPIController.js b/scripts/apps/content-api/controllers/ContentAPIController.ts
similarity index 94%
rename from scripts/apps/content-api/controllers/ContentAPIController.js
rename to scripts/apps/content-api/controllers/ContentAPIController.ts
index c21d544099..152a83df48 100644
--- a/scripts/apps/content-api/controllers/ContentAPIController.js
+++ b/scripts/apps/content-api/controllers/ContentAPIController.ts
@@ -12,6 +12,11 @@ import {gettext} from 'core/utils';
  * @description ContentAPIController
  */
 export class ContentAPIController {
+    $scope: any;
+    $location: any;
+    preferencesService: any;
+    preferencesUpdate: any;
+
     constructor($scope, $location, pageTitle, preferencesService) {
         this.$scope = $scope;
         this.$location = $location;
@@ -66,4 +71,4 @@ export class ContentAPIController {
     }
 }
 
-ContentAPIController.$inject = ['$scope', '$location', 'pageTitle', 'preferencesService'];
\ No newline at end of file
+ContentAPIController.$inject = ['$scope', '$location', 'pageTitle', 'preferencesService'];
diff --git a/scripts/apps/content-api/directives/ContentAPISearchPanelDirective.js b/scripts/apps/content-api/directives/ContentAPISearchPanelDirective.ts
similarity index 96%
rename from scripts/apps/content-api/directives/ContentAPISearchPanelDirective.js
rename to scripts/apps/content-api/directives/ContentAPISearchPanelDirective.ts
index 086d25ef74..b16c758fa3 100644
--- a/scripts/apps/content-api/directives/ContentAPISearchPanelDirective.js
+++ b/scripts/apps/content-api/directives/ContentAPISearchPanelDirective.ts
@@ -1,5 +1,9 @@
 
 class LinkFunction {
+    scope: any;
+    elem: any;
+    $location: any;
+
     constructor($location, scope, elem) {
         this.scope = scope;
         this.elem = elem;
@@ -35,7 +39,6 @@ class LinkFunction {
     }
 }
 
-
 /**
  * @ngdoc directive
  * @module superdesk.apps.content-api
diff --git a/scripts/apps/content-api/directives/ContentAPISearchResultsDirective.js b/scripts/apps/content-api/directives/ContentAPISearchResultsDirective.ts
similarity index 89%
rename from scripts/apps/content-api/directives/ContentAPISearchResultsDirective.js
rename to scripts/apps/content-api/directives/ContentAPISearchResultsDirective.ts
index da67cd7708..6c410722b2 100644
--- a/scripts/apps/content-api/directives/ContentAPISearchResultsDirective.js
+++ b/scripts/apps/content-api/directives/ContentAPISearchResultsDirective.ts
@@ -1,6 +1,16 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 class LinkFunction {
+    scope: any;
+    elem: any;
+    containerElem: any;
+    notify: any;
+    $location: any;
+    contentApiSearch: any;
+    search: any;
+    criteria: any;
+
     constructor(contentApiSearch, search, notify, $location, scope, elem) {
         this.scope = scope;
         this.elem = elem;
@@ -28,7 +38,6 @@ class LinkFunction {
         });
     }
 
-
     /**
      * @ngdoc method
      * @name sdContentApiSearchResults#_getAggregations
@@ -56,7 +65,7 @@ class LinkFunction {
      * @description Function for fetching the items in case of first time.
      * @return {promise}
      */
-    queryItems(event, data) {
+    queryItems(event?, data?) {
         this.criteria = this.contentApiSearch.getCriteria();
         this._getAggregations();
 
@@ -96,13 +105,13 @@ class LinkFunction {
      * @param {boolean} force - initialize and refresh the list to display.
      * @description Fetch the items from backend and display the items.
      */
-    render(items, next, force) {
+    render(items, next, force?) {
         this.scope.loading = true;
 
-        const setScopeItems = (items, force) => {
-            this.scope.items = this.search.mergeItems(items, this.scope.items, next, force);
-            this.scope.items._aggregations = items._aggregations;
-            this.scope.total = items._meta.total;
+        const setScopeItems = (_items, _force) => {
+            this.scope.items = this.search.mergeItems(_items, this.scope.items, next, _force);
+            this.scope.items._aggregations = _items._aggregations;
+            this.scope.total = _items._meta.total;
             this.scope.loading = false;
         };
 
diff --git a/scripts/apps/content-api/directives/ContentAPISortBarDirective.js b/scripts/apps/content-api/directives/ContentAPISortBarDirective.ts
similarity index 97%
rename from scripts/apps/content-api/directives/ContentAPISortBarDirective.js
rename to scripts/apps/content-api/directives/ContentAPISortBarDirective.ts
index 2d552b1006..ee90bef25a 100644
--- a/scripts/apps/content-api/directives/ContentAPISortBarDirective.js
+++ b/scripts/apps/content-api/directives/ContentAPISortBarDirective.ts
@@ -1,6 +1,8 @@
 import {BaseSortBar} from 'apps/search/directives/BaseSortBar';
 
 class LinkFunction extends BaseSortBar {
+    contentApiSearch: any;
+
     constructor(contentApiSearch, sort, scope, elem) {
         super(scope, elem, sort);
         this.contentApiSearch = contentApiSearch;
diff --git a/scripts/apps/content-api/services/ContentAPISearchService.js b/scripts/apps/content-api/services/ContentAPISearchService.ts
similarity index 76%
rename from scripts/apps/content-api/services/ContentAPISearchService.js
rename to scripts/apps/content-api/services/ContentAPISearchService.ts
index 6822665e2b..5edc79627d 100644
--- a/scripts/apps/content-api/services/ContentAPISearchService.js
+++ b/scripts/apps/content-api/services/ContentAPISearchService.ts
@@ -14,6 +14,12 @@ const DEFAULT_PAGE_SIZE = 25;
  * @description Handles retrieval of data from content api
  */
 export class ContentAPISearchService {
+    api: any;
+    $location: any;
+    sort: any;
+    sortOptions: any;
+    search: any;
+
     constructor(api, $location, sort, search) {
         this.api = api;
         this.$location = $location;
@@ -86,7 +92,7 @@ export class ContentAPISearchService {
      * @return {object}
      */
     getCriteria(param) {
-        let criteria = {};
+        let criteria: any = {};
         let params = param || this.$location.search();
         let sort = this.sort.getSort(this.sortOptions);
 
@@ -94,39 +100,42 @@ export class ContentAPISearchService {
         criteria.sort = this.sort.formatSort(sort.field, sort.dir);
         criteria.page = 1;
 
-        const buildRangeFilter = (params, filters) => {
+        const buildRangeFilter = (paramsObject, _filters) => {
             // created & modified date filters
-            let hasParams = params.beforefirstcreated || params.afterfirstcreated ||
-                params.beforeversioncreated || params.afterversioncreated;
+            let hasParams = paramsObject.beforefirstcreated || paramsObject.afterfirstcreated ||
+                paramsObject.beforeversioncreated || paramsObject.afterversioncreated;
             let zeroHourSuffix = 'T00:00:00',
                 midnightSuffix = 'T23:59:59';
 
             if (hasParams) {
-                let range = {firstcreated: {}, versioncreated: {}};
+                let range: any = {firstcreated: {}, versioncreated: {}};
 
-                if (params.beforefirstcreated) {
-                    range.firstcreated.lte = this.search.formatDate(params.beforefirstcreated, midnightSuffix);
+                if (paramsObject.beforefirstcreated) {
+                    range.firstcreated.lte = this.search.formatDate(paramsObject.beforefirstcreated, midnightSuffix);
                 }
 
-                if (params.afterfirstcreated) {
-                    range.firstcreated.gte = this.search.formatDate(params.afterfirstcreated, zeroHourSuffix);
+                if (paramsObject.afterfirstcreated) {
+                    range.firstcreated.gte = this.search.formatDate(paramsObject.afterfirstcreated, zeroHourSuffix);
                 }
 
-                if (params.beforeversioncreated) {
-                    range.versioncreated.lte = this.search.formatDate(params.beforeversioncreated, midnightSuffix);
+                if (paramsObject.beforeversioncreated) {
+                    range.versioncreated.lte =
+                        this.search.formatDate(paramsObject.beforeversioncreated, midnightSuffix);
                 }
 
-                if (params.afterversioncreated) {
-                    range.versioncreated.gte = this.search.formatDate(params.afterversioncreated, zeroHourSuffix);
+                if (paramsObject.afterversioncreated) {
+                    range.versioncreated.gte = this.search.formatDate(paramsObject.afterversioncreated, zeroHourSuffix);
                 }
 
-                filters.push({range: range});
-            } else if (params.after) {
-                let range = {firstcreated: {}};
+                return [..._filters, {range}];
+            } else if (paramsObject.after) {
+                let range: any = {firstcreated: {}};
 
-                range.firstcreated.gte = params.after;
-                filters.push({range: range});
+                range.firstcreated.gte = paramsObject.after;
+                return [..._filters, {range}];
             }
+
+            return _filters;
         };
 
         if (params.subscriber) {
@@ -140,7 +149,7 @@ export class ContentAPISearchService {
 
         let filters = this._getFilters(params);
 
-        buildRangeFilter(params, filters);
+        filters = buildRangeFilter(params, filters);
 
         if (filters.length > 0) {
             criteria.filter = JSON.stringify(filters);
diff --git a/scripts/apps/content-filters/controllers/FilterConditionsController.js b/scripts/apps/content-filters/controllers/FilterConditionsController.ts
similarity index 99%
rename from scripts/apps/content-filters/controllers/FilterConditionsController.js
rename to scripts/apps/content-filters/controllers/FilterConditionsController.ts
index 42973842d3..6b27bcdd8a 100644
--- a/scripts/apps/content-filters/controllers/FilterConditionsController.js
+++ b/scripts/apps/content-filters/controllers/FilterConditionsController.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {getLabelNameResolver} from 'apps/workspace/helpers/getLabelForFieldId';
 import {gettext} from 'core/utils';
 
@@ -90,7 +91,7 @@ export function FilterConditionsController($scope, contentFilters, notify, modal
                         } else {
                             notify.error(gettext('Error: Failed to save filter condition.'));
                         }
-                    }
+                    },
                 )
                 .then(fetchFilterConditions);
         };
diff --git a/scripts/apps/content-filters/controllers/ManageContentFiltersController.js b/scripts/apps/content-filters/controllers/ManageContentFiltersController.ts
similarity index 99%
rename from scripts/apps/content-filters/controllers/ManageContentFiltersController.js
rename to scripts/apps/content-filters/controllers/ManageContentFiltersController.ts
index 248f31fdac..3bf942887f 100644
--- a/scripts/apps/content-filters/controllers/ManageContentFiltersController.js
+++ b/scripts/apps/content-filters/controllers/ManageContentFiltersController.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {getLabelNameResolver} from 'apps/workspace/helpers/getLabelForFieldId';
 import {gettext} from 'core/utils';
 
@@ -66,7 +67,7 @@ export function ManageContentFiltersController($scope, contentFilters, notify, m
                         } else {
                             notify.error(gettext('Error: Failed to test content filter.'));
                         }
-                    }
+                    },
                 )
                 .then(fetchContentFilters);
         };
@@ -134,7 +135,7 @@ export function ManageContentFiltersController($scope, contentFilters, notify, m
                         } else {
                             notify.error(gettext('Error: Failed to save content filter.'));
                         }
-                    }
+                    },
                 );
         };
 
diff --git a/scripts/apps/content-filters/controllers/ProductionTestController.js b/scripts/apps/content-filters/controllers/ProductionTestController.ts
similarity index 98%
rename from scripts/apps/content-filters/controllers/ProductionTestController.js
rename to scripts/apps/content-filters/controllers/ProductionTestController.ts
index e7e5103268..d32109cbe4 100644
--- a/scripts/apps/content-filters/controllers/ProductionTestController.js
+++ b/scripts/apps/content-filters/controllers/ProductionTestController.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 /**
@@ -104,7 +105,7 @@ export function ProductionTestController($scope, contentFilters, notify, $locati
     var fetchProductionTestResult = function() {
         contentFilters.testContentFilter({
             filter_id: $scope.selectedfilter,
-            return_matching: $scope.$eval($scope.model.selectedType
+            return_matching: $scope.$eval($scope.model.selectedType,
             )}).then(
             (result) => {
                 $scope.testResult = result.match_results;
@@ -117,7 +118,7 @@ export function ProductionTestController($scope, contentFilters, notify, $locati
                 } else {
                     notify.error(gettext('Error: Failed to fetch production test results.'));
                 }
-            }
+            },
         );
     };
 }
diff --git a/scripts/apps/dashboard/closed-desk/DeskRoutingInfoDirective.js b/scripts/apps/dashboard/closed-desk/DeskRoutingInfoDirective.ts
similarity index 100%
rename from scripts/apps/dashboard/closed-desk/DeskRoutingInfoDirective.js
rename to scripts/apps/dashboard/closed-desk/DeskRoutingInfoDirective.ts
diff --git a/scripts/apps/dashboard/closed-desk/index.js b/scripts/apps/dashboard/closed-desk/index.ts
similarity index 93%
rename from scripts/apps/dashboard/closed-desk/index.js
rename to scripts/apps/dashboard/closed-desk/index.ts
index 48f90f6057..0e51196ea9 100644
--- a/scripts/apps/dashboard/closed-desk/index.js
+++ b/scripts/apps/dashboard/closed-desk/index.ts
@@ -3,8 +3,8 @@ import {gettext} from 'core/utils';
 
 import './styles.scss';
 
-RoutingWidgetController.$inject = ['desks', 'privileges', 'api', 'notify', 'gettext', '$scope'];
-function RoutingWidgetController(desks, privileges, api, notify, gettext, $scope) {
+RoutingWidgetController.$inject = ['desks', 'privileges', 'api', 'notify', '$scope'];
+function RoutingWidgetController(desks, privileges, api, notify, $scope) {
     this.canManage = privileges.privileges.desk_routing;
 
     desks.initialize().then(() => {
@@ -51,7 +51,9 @@ function RoutingWidgetController(desks, privileges, api, notify, gettext, $scope
     $scope.$on('desks:closed', (event, extra) => {
         // update open/close status for routedFrom
         this.routedFrom.forEach((desk) => {
-            desk._id === extra._id && angular.extend(desk, {is_closed: extra.is_closed});
+            if (desk._id === extra._id) {
+                angular.extend(desk, {is_closed: extra.is_closed});
+            }
         });
 
         // update open/close status for current desk
@@ -64,7 +66,6 @@ function RoutingWidgetController(desks, privileges, api, notify, gettext, $scope
     });
 }
 
-
 TopMenuInfoDirective.$inject = ['desks', '$timeout'];
 function TopMenuInfoDirective(desks, $timeout) {
     return {
@@ -74,7 +75,9 @@ function TopMenuInfoDirective(desks, $timeout) {
                 const desk = desks.getCurrentDesk();
                 const selected = document.getElementById('selected-desk');
 
-                selected && selected.classList.remove('desk--closed');
+                if (selected) {
+                    selected.classList.remove('desk--closed');
+                }
                 scope.routingFrom = scope.routingTo = null;
 
                 if (!desk) {
@@ -84,7 +87,9 @@ function TopMenuInfoDirective(desks, $timeout) {
                 scope.$applyAsync(() => { // using debounce, so it must trigger angular rendering
                     if (desk.is_closed) {
                         scope.routingTo = get(desks.deskLookup[desk.closed_destination], 'name', '');
-                        selected && selected.classList.add('desk--closed');
+                        if (selected) {
+                            selected.classList.add('desk--closed');
+                        }
                     } else {
                         scope.routingFrom = getRoutingFrom(desk);
                     }
diff --git a/scripts/apps/dashboard/controllers/ConfigController.js b/scripts/apps/dashboard/controllers/ConfigController.ts
similarity index 70%
rename from scripts/apps/dashboard/controllers/ConfigController.js
rename to scripts/apps/dashboard/controllers/ConfigController.ts
index 2ae800603c..6aa19ab47b 100644
--- a/scripts/apps/dashboard/controllers/ConfigController.js
+++ b/scripts/apps/dashboard/controllers/ConfigController.ts
@@ -1,7 +1,9 @@
+import {cloneDeep} from 'lodash';
+
 ConfigController.$inject = ['$scope'];
 
 export function ConfigController($scope) {
-    $scope.configuration = _.cloneDeep($scope.widget.configuration);
+    $scope.configuration = cloneDeep($scope.widget.configuration);
 
     $scope.saveConfig = function() {
         $scope.widget.configuration = $scope.configuration;
diff --git a/scripts/apps/dashboard/controllers/DashboardController.js b/scripts/apps/dashboard/controllers/DashboardController.ts
similarity index 99%
rename from scripts/apps/dashboard/controllers/DashboardController.js
rename to scripts/apps/dashboard/controllers/DashboardController.ts
index e94ddb2eb5..171257156d 100644
--- a/scripts/apps/dashboard/controllers/DashboardController.js
+++ b/scripts/apps/dashboard/controllers/DashboardController.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 DashboardController.$inject = ['$scope', 'desks', 'dashboardWidgets', 'api', 'session', 'workspaces',
@@ -126,7 +127,7 @@ export function DashboardController($scope, desks, dashboardWidgets, api, sessio
      */
     this.delete = function() {
         modal.confirm(
-            gettext('Are you sure you want to delete current workspace?')
+            gettext('Are you sure you want to delete current workspace?'),
         )
             .then(() => workspaces.delete(self.current));
     };
diff --git a/scripts/apps/dashboard/index.js b/scripts/apps/dashboard/index.ts
similarity index 98%
rename from scripts/apps/dashboard/index.js
rename to scripts/apps/dashboard/index.ts
index de1bbfca05..7cb9f80f0d 100644
--- a/scripts/apps/dashboard/index.js
+++ b/scripts/apps/dashboard/index.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 // styles
 import './styles/dashboard.scss';
 import './styles/widgets.scss';
diff --git a/scripts/apps/dashboard/services/DashboardWidgets.js b/scripts/apps/dashboard/services/DashboardWidgets.ts
similarity index 91%
rename from scripts/apps/dashboard/services/DashboardWidgets.js
rename to scripts/apps/dashboard/services/DashboardWidgets.ts
index 93063c3481..c19f7e8c0a 100644
--- a/scripts/apps/dashboard/services/DashboardWidgets.js
+++ b/scripts/apps/dashboard/services/DashboardWidgets.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export function DashboardWidgets() {
     var privateWidgets = {};
 
diff --git a/scripts/apps/dashboard/workspace-tasks/tasks.js b/scripts/apps/dashboard/workspace-tasks/tasks.ts
similarity index 98%
rename from scripts/apps/dashboard/workspace-tasks/tasks.js
rename to scripts/apps/dashboard/workspace-tasks/tasks.ts
index c461006b3c..30a150071c 100644
--- a/scripts/apps/dashboard/workspace-tasks/tasks.js
+++ b/scripts/apps/dashboard/workspace-tasks/tasks.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+import moment from 'moment';
 import './styles/tasks.scss';
 import {gettext} from 'core/utils';
 
@@ -391,8 +393,8 @@ angular.module('superdesk.apps.workspace.tasks', ['superdesk.apps.workspace.menu
              * @param {Object} superdesk service
              * @return {Promise}
              */
-                function pickTask(data, superdesk) {
-                    return superdesk.intent('edit', 'item', data.item);
+                function pickTask(data, superdeskService) {
+                    return superdeskService.intent('edit', 'item', data.item);
                 },
             ],
             filters: [{action: superdesk.ACTION_EDIT, type: 'task'}],
diff --git a/scripts/apps/dashboard/workspace-tasks/tests/tasks.spec.js b/scripts/apps/dashboard/workspace-tasks/tests/tasks.spec.ts
similarity index 99%
rename from scripts/apps/dashboard/workspace-tasks/tests/tasks.spec.js
rename to scripts/apps/dashboard/workspace-tasks/tests/tasks.spec.ts
index ba702f7655..375f2a641b 100644
--- a/scripts/apps/dashboard/workspace-tasks/tests/tasks.spec.js
+++ b/scripts/apps/dashboard/workspace-tasks/tests/tasks.spec.ts
@@ -1,3 +1,4 @@
+import moment from 'moment';
 
 describe('tasks', () => {
     beforeEach(window.module('superdesk.apps.desks'));
diff --git a/scripts/apps/dashboard/world-clock/world-clock.js b/scripts/apps/dashboard/world-clock/world-clock.ts
similarity index 99%
rename from scripts/apps/dashboard/world-clock/world-clock.js
rename to scripts/apps/dashboard/world-clock/world-clock.ts
index 21407cd235..f72f3d05c6 100644
--- a/scripts/apps/dashboard/world-clock/world-clock.js
+++ b/scripts/apps/dashboard/world-clock/world-clock.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import './world-clock.scss';
 import d3 from 'd3';
 import {gettext} from 'core/utils';
@@ -70,7 +71,7 @@ angular.module('superdesk.apps.dashboard.world-clock', [
 
             tzdata.$promise.then(() => {
                 moment.tz.add(
-                    _.pick(tzdata, ['zones', 'links'])
+                    _.pick(tzdata, ['zones', 'links']),
                 );
             });
 
diff --git a/scripts/apps/desks/controllers/DeskConfigController.js b/scripts/apps/desks/controllers/DeskConfigController.ts
similarity index 91%
rename from scripts/apps/desks/controllers/DeskConfigController.js
rename to scripts/apps/desks/controllers/DeskConfigController.ts
index 9cda4db337..f429585f14 100644
--- a/scripts/apps/desks/controllers/DeskConfigController.js
+++ b/scripts/apps/desks/controllers/DeskConfigController.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 DeskConfigController.$inject = ['$scope', '$controller', 'notify', 'desks', 'WizardHandler', 'modal'];
@@ -38,7 +39,7 @@ export function DeskConfigController($scope, $controller, notify, desks, WizardH
                 desks.remove(desk).then(
                     (response) => {
                         _.remove($scope.desks._items,
-                            (deskToBeRemoved) => deskToBeRemoved.name.toLowerCase() === desk.name.toLowerCase());
+                            (deskToBeRemoved: any) => deskToBeRemoved.name.toLowerCase() === desk.name.toLowerCase());
                         notify.success(gettext('Desk deleted.'), 3000);
                     },
                     (response) => {
@@ -47,9 +48,9 @@ export function DeskConfigController($scope, $controller, notify, desks, WizardH
                         } else {
                             notify.error(gettext('Unknown Error: There was a problem, desk was not deleted.'));
                         }
-                    }
+                    },
                 );
-            }
+            },
         );
     };
 
diff --git a/scripts/apps/desks/controllers/DeskListController.js b/scripts/apps/desks/controllers/DeskListController.ts
similarity index 98%
rename from scripts/apps/desks/controllers/DeskListController.js
rename to scripts/apps/desks/controllers/DeskListController.ts
index 9384e0b7d8..0692181874 100644
--- a/scripts/apps/desks/controllers/DeskListController.js
+++ b/scripts/apps/desks/controllers/DeskListController.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 DeskListController.$inject = ['$scope', 'desks', 'superdesk', 'privileges', 'tasks', 'api', 'betaService'];
 export function DeskListController($scope, desks, superdesk, privileges, tasks, api, beta) {
     var userDesks;
diff --git a/scripts/apps/desks/directives/ActionPicker.js b/scripts/apps/desks/directives/ActionPicker.ts
similarity index 91%
rename from scripts/apps/desks/directives/ActionPicker.js
rename to scripts/apps/desks/directives/ActionPicker.ts
index 0d1459dfce..d6cac60ec8 100644
--- a/scripts/apps/desks/directives/ActionPicker.js
+++ b/scripts/apps/desks/directives/ActionPicker.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 /**
  * Action picker component
  *
@@ -20,8 +22,8 @@ export function ActionPicker(desks, macros) {
             scope.deskMacros = null;
 
             function updateMacros() {
-                macros.getByDesk(desks.deskLookup[scope.desk].name, true).then((macros) => {
-                    scope.deskMacros = _.filter(macros, {action_type: 'direct'});
+                macros.getByDesk(desks.deskLookup[scope.desk].name, true).then((_macros) => {
+                    scope.deskMacros = _.filter(_macros, {action_type: 'direct'});
                 });
 
                 if (_.findIndex(scope.deskStages[scope.desk], {_id: scope.stage}) === -1) {
diff --git a/scripts/apps/desks/directives/ContentExpiry.js b/scripts/apps/desks/directives/ContentExpiry.ts
similarity index 99%
rename from scripts/apps/desks/directives/ContentExpiry.js
rename to scripts/apps/desks/directives/ContentExpiry.ts
index 83ccc9aff0..f6ce50969d 100644
--- a/scripts/apps/desks/directives/ContentExpiry.js
+++ b/scripts/apps/desks/directives/ContentExpiry.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 /**
  * @ngdoc directive
  * @module superdesk.apps.desks
diff --git a/scripts/apps/desks/directives/DeskSelect.js b/scripts/apps/desks/directives/DeskSelect.ts
similarity index 99%
rename from scripts/apps/desks/directives/DeskSelect.js
rename to scripts/apps/desks/directives/DeskSelect.ts
index 893a007892..560b42b87f 100644
--- a/scripts/apps/desks/directives/DeskSelect.js
+++ b/scripts/apps/desks/directives/DeskSelect.ts
@@ -11,6 +11,8 @@ export function DeskSelect(Keys, _, preferencesService) {
     const DOWN = 1;
 
     class DeskSelectController {
+        active: any;
+
         constructor() {
             this.active = null;
         }
diff --git a/scripts/apps/desks/directives/DeskeditPeople.js b/scripts/apps/desks/directives/DeskeditPeople.ts
similarity index 99%
rename from scripts/apps/desks/directives/DeskeditPeople.js
rename to scripts/apps/desks/directives/DeskeditPeople.ts
index 5c9d2d229a..b60bb7c5a2 100644
--- a/scripts/apps/desks/directives/DeskeditPeople.js
+++ b/scripts/apps/desks/directives/DeskeditPeople.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 DeskeditPeople.$inject = ['WizardHandler', 'desks', '$rootScope'];
diff --git a/scripts/apps/desks/directives/DeskeditStages.js b/scripts/apps/desks/directives/DeskeditStages.ts
similarity index 95%
rename from scripts/apps/desks/directives/DeskeditStages.js
rename to scripts/apps/desks/directives/DeskeditStages.ts
index 3d62f66c6b..17bbdda8db 100644
--- a/scripts/apps/desks/directives/DeskeditStages.js
+++ b/scripts/apps/desks/directives/DeskeditStages.ts
@@ -15,12 +15,12 @@ export function DeskeditStages(api, WizardHandler, tasks, $rootScope, desks, not
             scope.systemExpiry = deployConfig.getSync('content_expiry_minutes');
 
             if (scope.desk.edit && scope.desk.edit.name) {
-                macros.getByDesk(scope.desk.edit.name, true).then((macros) => {
-                    scope.macros = _.reject(macros, {action_type: 'interactive'});
+                macros.getByDesk(scope.desk.edit.name, true).then((_macros) => {
+                    scope.macros = _.reject(_macros, {action_type: 'interactive'});
                 });
             } else {
-                macros.get(true).then((macros) => {
-                    scope.macros = _.reject(macros, {action_type: 'interactive'});
+                macros.get(true).then((_macros) => {
+                    scope.macros = _.reject(_macros, {action_type: 'interactive'});
                 });
             }
 
@@ -73,7 +73,7 @@ export function DeskeditStages(api, WizardHandler, tasks, $rootScope, desks, not
                 orig = stage;
                 scope.editStage = _.create(stage);
                 if (!scope.editStage._id) {
-                    var lastStage = _.last(scope.stages);
+                    var lastStage: any = _.last(scope.stages);
 
                     if (lastStage) {
                         scope.editStage.task_status = lastStage.task_status;
diff --git a/scripts/apps/desks/directives/FocusElement.js b/scripts/apps/desks/directives/FocusElement.ts
similarity index 81%
rename from scripts/apps/desks/directives/FocusElement.js
rename to scripts/apps/desks/directives/FocusElement.ts
index 712c992ced..fd92aeba52 100644
--- a/scripts/apps/desks/directives/FocusElement.js
+++ b/scripts/apps/desks/directives/FocusElement.ts
@@ -1,8 +1,10 @@
+import {defer} from 'lodash';
+
 export function FocusElement() {
     return {
         link: function(scope, elem, attrs) {
             elem.click(() => {
-                _.defer(() => {
+                defer(() => {
                     angular.element(document.querySelector(attrs.target)).focus();
                 });
             });
diff --git a/scripts/apps/desks/directives/UserRoleItemListDirective.js b/scripts/apps/desks/directives/UserRoleItemListDirective.ts
similarity index 97%
rename from scripts/apps/desks/directives/UserRoleItemListDirective.js
rename to scripts/apps/desks/directives/UserRoleItemListDirective.ts
index 9906a4f952..646b8edaec 100644
--- a/scripts/apps/desks/directives/UserRoleItemListDirective.js
+++ b/scripts/apps/desks/directives/UserRoleItemListDirective.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 UserRoleItemListDirective.$inject = ['desks', 'usersService'];
 export function UserRoleItemListDirective(desks, usersService) {
     return {
diff --git a/scripts/apps/desks/directives/UserSelectList.js b/scripts/apps/desks/directives/UserSelectList.ts
similarity index 99%
rename from scripts/apps/desks/directives/UserSelectList.js
rename to scripts/apps/desks/directives/UserSelectList.ts
index 91d86096d4..e2217ea4af 100644
--- a/scripts/apps/desks/directives/UserSelectList.js
+++ b/scripts/apps/desks/directives/UserSelectList.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 UserSelectList.$inject = ['$filter', 'api'];
 export function UserSelectList($filter, api) {
     return {
diff --git a/scripts/apps/desks/services/DesksFactory.js b/scripts/apps/desks/services/DesksFactory.ts
similarity index 99%
rename from scripts/apps/desks/services/DesksFactory.js
rename to scripts/apps/desks/services/DesksFactory.ts
index 033f6a7a36..1c014f9176 100644
--- a/scripts/apps/desks/services/DesksFactory.js
+++ b/scripts/apps/desks/services/DesksFactory.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 /**
@@ -22,7 +23,7 @@ export function DesksFactory($q, api, preferencesService, userList, notify,
     session, $filter, privileges, $rootScope) {
     let _cache = {};
 
-    var _fetchAll = function(endpoint, parent, page = 1, items = []) {
+    var _fetchAll = function(endpoint, parent?, page = 1, items = []) {
         let key;
 
         if (page === 1) {
diff --git a/scripts/apps/desks/tests/sdDeskEditPeople.spec.js b/scripts/apps/desks/tests/sdDeskEditPeople.spec.ts
similarity index 99%
rename from scripts/apps/desks/tests/sdDeskEditPeople.spec.js
rename to scripts/apps/desks/tests/sdDeskEditPeople.spec.ts
index 859c4a7a37..e509060466 100644
--- a/scripts/apps/desks/tests/sdDeskEditPeople.spec.js
+++ b/scripts/apps/desks/tests/sdDeskEditPeople.spec.ts
@@ -134,7 +134,7 @@ describe('sdDeskeditPeople directive', () => {
                 name: 'foo',
                 members: [],
             },
-            {members: [{user: 1}]}
+            {members: [{user: 1}]},
         );
     });
 });
diff --git a/scripts/apps/dictionaries/controllers/DictionaryConfigController.js b/scripts/apps/dictionaries/controllers/DictionaryConfigController.ts
similarity index 98%
rename from scripts/apps/dictionaries/controllers/DictionaryConfigController.js
rename to scripts/apps/dictionaries/controllers/DictionaryConfigController.ts
index 3bb6d1471f..3f763f1944 100644
--- a/scripts/apps/dictionaries/controllers/DictionaryConfigController.js
+++ b/scripts/apps/dictionaries/controllers/DictionaryConfigController.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 DictionaryConfigController.$inject = ['$scope', 'dictionaries', 'session', 'modal', 'notify'];
@@ -91,7 +92,7 @@ export function DictionaryConfigController($scope, dictionaries, session, modal,
                     _.remove($scope.dictionaries, dictionary);
                     notify.success(gettext('Dictionary deleted.'), 3000);
                 });
-            }
+            },
         );
     };
 
diff --git a/scripts/apps/dictionaries/controllers/DictionaryEditController.js b/scripts/apps/dictionaries/controllers/DictionaryEditController.ts
similarity index 99%
rename from scripts/apps/dictionaries/controllers/DictionaryEditController.js
rename to scripts/apps/dictionaries/controllers/DictionaryEditController.ts
index 24b3155d6b..a8c24f7a61 100644
--- a/scripts/apps/dictionaries/controllers/DictionaryEditController.js
+++ b/scripts/apps/dictionaries/controllers/DictionaryEditController.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 DictionaryEditController.$inject = ['$scope', 'dictionaries', 'upload', 'notify',
@@ -43,7 +44,7 @@ export function DictionaryEditController($scope, dictionaries, upload, notify,
             dictionaries.upload($scope.origDictionary, $scope.dictionary, $scope.file,
                 onSuccess, onError, (update) => {
                     $scope.progress.width = Math.round(update.loaded / update.total * 100.0);
-                }
+                },
             );
         } else {
             dictionaries.update($scope.origDictionary, $scope.dictionary, onSuccess, onError);
diff --git a/scripts/apps/dictionaries/services/DictionaryService.js b/scripts/apps/dictionaries/services/DictionaryService.ts
similarity index 99%
rename from scripts/apps/dictionaries/services/DictionaryService.js
rename to scripts/apps/dictionaries/services/DictionaryService.ts
index d6d10b3e1f..5619d38792 100644
--- a/scripts/apps/dictionaries/services/DictionaryService.js
+++ b/scripts/apps/dictionaries/services/DictionaryService.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 DictionaryService.$inject = ['api', 'urls', 'session', 'Upload', '$q'];
 export function DictionaryService(api, urls, session, Upload, $q) {
     this.dictionaries = null;
@@ -34,7 +36,7 @@ export function DictionaryService(api, urls, session, Upload, $q) {
         var hasId = _.has(dictionary, '_id') && dictionary._id !== null;
         var method = hasId ? 'PATCH' : 'POST';
         var headers = hasId ? {'If-Match': dictionary._etag} : {};
-        var sendData = {};
+        var sendData: any = {};
 
         // pick own properties
         angular.forEach(data, (val, key) => {
diff --git a/scripts/apps/highlights/controllers/HighlightsConfig.js b/scripts/apps/highlights/controllers/HighlightsConfig.ts
similarity index 98%
rename from scripts/apps/highlights/controllers/HighlightsConfig.js
rename to scripts/apps/highlights/controllers/HighlightsConfig.ts
index f408cf4f09..1bc03afd73 100644
--- a/scripts/apps/highlights/controllers/HighlightsConfig.js
+++ b/scripts/apps/highlights/controllers/HighlightsConfig.ts
@@ -90,7 +90,7 @@ export function HighlightsConfig($scope, highlightsService, desks, api, notify,
 
     function assignedDesks() {
         return _.map(_.filter($scope.assignedDesks, {included: true}),
-            (desk) => desk._id);
+            (desk: any) => desk._id);
     }
 
     $scope.handleEdit = function($event) {
diff --git a/scripts/apps/highlights/controllers/HighlightsSettings.js b/scripts/apps/highlights/controllers/HighlightsSettings.ts
similarity index 94%
rename from scripts/apps/highlights/controllers/HighlightsSettings.js
rename to scripts/apps/highlights/controllers/HighlightsSettings.ts
index 837dfa6a5c..a1b3ce7e1e 100644
--- a/scripts/apps/highlights/controllers/HighlightsSettings.js
+++ b/scripts/apps/highlights/controllers/HighlightsSettings.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 HighlightsSettings.$inject = ['$scope', 'api', 'desks'];
 export function HighlightsSettings($scope, api, desks) {
     desks.initialize().then(() => {
diff --git a/scripts/apps/highlights/directives/HighlightsLabel.js b/scripts/apps/highlights/directives/HighlightsLabel.ts
similarity index 95%
rename from scripts/apps/highlights/directives/HighlightsLabel.js
rename to scripts/apps/highlights/directives/HighlightsLabel.ts
index 907879c729..15522201be 100644
--- a/scripts/apps/highlights/directives/HighlightsLabel.js
+++ b/scripts/apps/highlights/directives/HighlightsLabel.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 HighlightsLabel.$inject = ['desks', 'highlightsService'];
 export function HighlightsLabel(desks, highlightsService) {
     return {
diff --git a/scripts/apps/highlights/directives/MultiMarkHighlightsDropdown.js b/scripts/apps/highlights/directives/MultiMarkHighlightsDropdown.ts
similarity index 98%
rename from scripts/apps/highlights/directives/MultiMarkHighlightsDropdown.js
rename to scripts/apps/highlights/directives/MultiMarkHighlightsDropdown.ts
index a2eee18670..acdec190fd 100644
--- a/scripts/apps/highlights/directives/MultiMarkHighlightsDropdown.js
+++ b/scripts/apps/highlights/directives/MultiMarkHighlightsDropdown.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 MultiMarkHighlightsDropdown.$inject = ['desks', 'highlightsService', 'multi'];
 export function MultiMarkHighlightsDropdown(desks, highlightsService, multi) {
     return {
diff --git a/scripts/apps/highlights/directives/SearchHighlights.js b/scripts/apps/highlights/directives/SearchHighlights.ts
similarity index 96%
rename from scripts/apps/highlights/directives/SearchHighlights.js
rename to scripts/apps/highlights/directives/SearchHighlights.ts
index 4407bcc89d..74b4d06bbe 100644
--- a/scripts/apps/highlights/directives/SearchHighlights.js
+++ b/scripts/apps/highlights/directives/SearchHighlights.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 SearchHighlights.$inject = ['highlightsService'];
 export function SearchHighlights(highlightsService) {
     return {
diff --git a/scripts/apps/highlights/services/HighlightsService.js b/scripts/apps/highlights/services/HighlightsService.ts
similarity index 98%
rename from scripts/apps/highlights/services/HighlightsService.js
rename to scripts/apps/highlights/services/HighlightsService.ts
index 3af9991077..3245c7fe37 100644
--- a/scripts/apps/highlights/services/HighlightsService.js
+++ b/scripts/apps/highlights/services/HighlightsService.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 /**
@@ -5,7 +6,7 @@ import {gettext} from 'core/utils';
  */
 HighlightsService.$inject = ['api', '$q', '$cacheFactory', 'packages', 'privileges'];
 export function HighlightsService(api, $q, $cacheFactory, packages, privileges) {
-    var service = {};
+    var service: any = {};
     var promise = {};
     var cache = $cacheFactory('highlightList');
 
@@ -100,7 +101,7 @@ export function HighlightsService(api, $q, $cacheFactory, packages, privileges)
      * Create empty highlight package
      */
     service.createEmptyHighlight = function(highlight) {
-        var pkgDefaults = {
+        var pkgDefaults: any = {
             headline: highlight.name,
             highlight: highlight._id,
         };
diff --git a/scripts/apps/highlights/tests/highlights.spec.js b/scripts/apps/highlights/tests/highlights.spec.ts
similarity index 99%
rename from scripts/apps/highlights/tests/highlights.spec.js
rename to scripts/apps/highlights/tests/highlights.spec.ts
index 8449ced374..c628eab138 100644
--- a/scripts/apps/highlights/tests/highlights.spec.js
+++ b/scripts/apps/highlights/tests/highlights.spec.ts
@@ -1,5 +1,4 @@
 
-
 describe('highlights', () => {
     beforeEach(window.module('superdesk.apps.highlights'));
     beforeEach(window.module('superdesk.mocks'));
diff --git a/scripts/apps/ingest/controllers/IngestDashboardController.js b/scripts/apps/ingest/controllers/IngestDashboardController.ts
similarity index 96%
rename from scripts/apps/ingest/controllers/IngestDashboardController.js
rename to scripts/apps/ingest/controllers/IngestDashboardController.ts
index 63885c0ad6..69a2ccf0ba 100644
--- a/scripts/apps/ingest/controllers/IngestDashboardController.js
+++ b/scripts/apps/ingest/controllers/IngestDashboardController.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 IngestDashboardController.$inject = ['$scope', 'api', 'ingestSources', 'preferencesService',
@@ -20,7 +21,7 @@ export function IngestDashboardController($scope, $api, ingestSources, preferenc
         _.forEach(_.filter($scope.items, {dashboard_enabled: true}),
             (item) => {
                 preferences.push(_.pick(item, _.union(['_id'], _.keys(config.ingest.PROVIDER_DASHBOARD_DEFAULTS))));
-            }
+            },
         );
 
         update['dashboard:ingest'] = preferences;
diff --git a/scripts/apps/ingest/controllers/IngestListController.js b/scripts/apps/ingest/controllers/IngestListController.ts
similarity index 98%
rename from scripts/apps/ingest/controllers/IngestListController.js
rename to scripts/apps/ingest/controllers/IngestListController.ts
index c9ed2de9cd..00451ba58f 100644
--- a/scripts/apps/ingest/controllers/IngestListController.js
+++ b/scripts/apps/ingest/controllers/IngestListController.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {BaseListController} from 'apps/archive/controllers';
 
 export class IngestListController extends BaseListController {
diff --git a/scripts/apps/ingest/directives/IngestRoutingAction.js b/scripts/apps/ingest/directives/IngestRoutingAction.ts
similarity index 96%
rename from scripts/apps/ingest/directives/IngestRoutingAction.js
rename to scripts/apps/ingest/directives/IngestRoutingAction.ts
index ada5ca09bf..2f8c6c1442 100644
--- a/scripts/apps/ingest/directives/IngestRoutingAction.js
+++ b/scripts/apps/ingest/directives/IngestRoutingAction.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 IngestRoutingAction.$inject = ['desks', 'macros', 'subscribersService', 'metadata'];
@@ -20,8 +21,8 @@ export function IngestRoutingAction(desks, macros, subscribersService, metadata)
                     scope.stageLookup = desks.stageLookup;
                 });
 
-            macros.get(true).then((macros) => {
-                _.transform(macros, (lookup, macro, idx) => {
+            macros.get(true).then((_macros) => {
+                _.transform(_macros, (lookup, macro: any, idx) => {
                     scope.macroLookup[macro.name] = macro;
                 });
             });
diff --git a/scripts/apps/ingest/directives/IngestRoutingContent.js b/scripts/apps/ingest/directives/IngestRoutingContent.ts
similarity index 95%
rename from scripts/apps/ingest/directives/IngestRoutingContent.js
rename to scripts/apps/ingest/directives/IngestRoutingContent.ts
index dede76a7e6..3cddc25ae3 100644
--- a/scripts/apps/ingest/directives/IngestRoutingContent.js
+++ b/scripts/apps/ingest/directives/IngestRoutingContent.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 /**
@@ -103,7 +104,7 @@ export function IngestRoutingContent(api, notify, modal, contentFilters, $filter
              * @description Pick up rule for preview.
              */
             scope.selectRule = (rule) => {
-                rule.filterName = rule.filter ? _.find(scope.contentFilters, {_id: rule.filter}).name : null;
+                rule.filterName = rule.filter ? (_.find(scope.contentFilters, {_id: rule.filter}) as any).name : null;
                 rule.schedule._allDay = !(_.get(rule, 'schedule.hour_of_day_from', false) ||
                     _.get(rule, 'schedule.hour_of_day_to', false));
 
@@ -134,7 +135,9 @@ export function IngestRoutingContent(api, notify, modal, contentFilters, $filter
                 _origRule = _.clone(rule);
 
                 scope.rule = rule;
-                scope.rule.filterName = rule.filter ? _.find(scope.contentFilters, {_id: rule.filter}).name : null;
+                scope.rule.filterName = rule.filter
+                    ? (_.find(scope.contentFilters, {_id: rule.filter}) as any).name
+                    : null;
                 scope.rule.schedule._allDay = !(_.get(scope.rule, 'schedule.hour_of_day_from', false) ||
                     _.get(scope.rule, 'schedule.hour_of_day_to', false));
             };
@@ -157,8 +160,9 @@ export function IngestRoutingContent(api, notify, modal, contentFilters, $filter
 
                 return api('routing_schemes').save(_orig, diff)
                     .then((result) => {
-                        !scope.editScheme._id ?
-                            scope.schemes.push(_orig) : null;
+                        if (!scope.editScheme._id) {
+                            scope.schemes.push(_orig);
+                        }
 
                         scope.schemes = $filter('sortByName')(scope.schemes);
                         scope.editScheme = _.clone(result);
diff --git a/scripts/apps/ingest/directives/IngestRoutingFilter.js b/scripts/apps/ingest/directives/IngestRoutingFilter.ts
similarity index 94%
rename from scripts/apps/ingest/directives/IngestRoutingFilter.js
rename to scripts/apps/ingest/directives/IngestRoutingFilter.ts
index 7182fd5244..9f00e34705 100644
--- a/scripts/apps/ingest/directives/IngestRoutingFilter.js
+++ b/scripts/apps/ingest/directives/IngestRoutingFilter.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 /**
  * @ngdoc directive
  * @module superdesk.apps.ingest
@@ -29,7 +31,7 @@ export function IngestRoutingFilter() {
      * @return {string} - an escaped version of the given string
      */
     // XXX: should probably be moved into some utils module - but where?
-    RegExp.escape = function(s) {
+    RegExp['escape'] = function(s) {
         return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
     };
 
@@ -66,11 +68,11 @@ export function IngestRoutingFilter() {
              * @param {string} term - the string to search for
              */
             scope.searchFilters = function(term) {
-                var regex = new RegExp(RegExp.escape(term), 'i');
+                var regex = new RegExp(RegExp['escape'](term), 'i');
 
                 scope.matchingFilters = _.filter(
                     scope.filters,
-                    (filter) => regex.test(filter.name)
+                    (filter) => regex.test(filter.name),
                 );
             };
 
diff --git a/scripts/apps/ingest/directives/IngestRoutingGeneral.js b/scripts/apps/ingest/directives/IngestRoutingGeneral.ts
similarity index 83%
rename from scripts/apps/ingest/directives/IngestRoutingGeneral.js
rename to scripts/apps/ingest/directives/IngestRoutingGeneral.ts
index 974cc0bfa2..0a3a8966e2 100644
--- a/scripts/apps/ingest/directives/IngestRoutingGeneral.js
+++ b/scripts/apps/ingest/directives/IngestRoutingGeneral.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 IngestRoutingGeneral.$inject = ['weekdays', 'desks', 'macros'];
 export function IngestRoutingGeneral(weekdays, desks, macros) {
     return {
@@ -15,8 +17,8 @@ export function IngestRoutingGeneral(weekdays, desks, macros) {
                     scope.stageLookup = desks.stageLookup;
                 });
 
-            macros.get().then((macros) => {
-                _.transform(macros, (lookup, macro, idx) => {
+            macros.get().then((_macros) => {
+                _.transform(_macros, (lookup, macro: any, idx) => {
                     scope.macroLookup[macro.name] = macro;
                 });
             });
diff --git a/scripts/apps/ingest/directives/IngestRulesContent.js b/scripts/apps/ingest/directives/IngestRulesContent.ts
similarity index 99%
rename from scripts/apps/ingest/directives/IngestRulesContent.js
rename to scripts/apps/ingest/directives/IngestRulesContent.ts
index 8a882c7dfc..2c20241d58 100644
--- a/scripts/apps/ingest/directives/IngestRulesContent.js
+++ b/scripts/apps/ingest/directives/IngestRulesContent.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 IngestRulesContent.$inject = ['api', 'notify', 'modal', '$filter'];
diff --git a/scripts/apps/ingest/directives/IngestSourcesContent.js b/scripts/apps/ingest/directives/IngestSourcesContent.ts
similarity index 98%
rename from scripts/apps/ingest/directives/IngestSourcesContent.js
rename to scripts/apps/ingest/directives/IngestSourcesContent.ts
index 064157f30d..c791ea4a52 100644
--- a/scripts/apps/ingest/directives/IngestSourcesContent.js
+++ b/scripts/apps/ingest/directives/IngestSourcesContent.ts
@@ -275,10 +275,10 @@ export function IngestSourcesContent(ingestSources, notify, api, $location,
                                         } else {
                                             notify.error(gettext('Error: Unable to delete Ingest Source'));
                                         }
-                                    }
+                                    },
                                 )
                                 .then(fetchProviders);
-                        }
+                        },
                     );
                 };
 
@@ -310,7 +310,7 @@ export function IngestSourcesContent(ingestSources, notify, api, $location,
                             });
 
                             $scope.fieldsNotSelected[field.id] = field.first_field_options.values.filter(
-                                (fieldName) => !(fieldName in aliasObj)
+                                (fieldName) => !(fieldName in aliasObj),
                             );
                         } else if (
                             // preset value in dropdown
@@ -391,7 +391,7 @@ export function IngestSourcesContent(ingestSources, notify, api, $location,
                     });
 
                     $scope.fieldsNotSelected[field.id] = field.first_field_options.values.filter(
-                        (fieldName) => !(fieldName in selectedFields)
+                        (fieldName) => !(fieldName in selectedFields),
                     );
                 };
 
@@ -450,7 +450,7 @@ export function IngestSourcesContent(ingestSources, notify, api, $location,
                     delete $scope.provider.source_errors;
 
                     const originalProvider = $scope.providers._items.find(
-                        (provider) => provider._id === $scope.provider._id
+                        (provider) => provider._id === $scope.provider._id,
                     );
 
                     $scope.loading = true;
@@ -495,7 +495,7 @@ export function IngestSourcesContent(ingestSources, notify, api, $location,
                         });
                     } else {
                         $location.path('/search').search(
-                            {repo: 'ingest', ingest_provider: provider._id}
+                            {repo: 'ingest', ingest_provider: provider._id},
                         );
                     }
                 };
@@ -535,7 +535,7 @@ export function IngestSourcesContent(ingestSources, notify, api, $location,
                  * Initializes the configuration for the selected feeding service.
                  */
                 $scope.initProviderConfig = function() {
-                    var service = getCurrentService();
+                    var service: any = getCurrentService();
 
                     if (service && service.config) {
                         $scope.provider.config = angular.extend({}, service.config);
@@ -557,7 +557,7 @@ export function IngestSourcesContent(ingestSources, notify, api, $location,
                             }
                             $scope.feedParsers = _.filter($scope.feedParsers, (feedParser) =>
                                 $scope.currentFeedingService.parser_restricted_values.includes(
-                                    feedParser.feed_parser)
+                                    feedParser.feed_parser),
                             );
                         } else if ($scope.currentFeedingService.parser_restricted_values === null) {
                             $scope.feedParsers = [];
@@ -571,7 +571,7 @@ export function IngestSourcesContent(ingestSources, notify, api, $location,
                  * @returns {string}
                  */
                 $scope.getConfigTemplateUrl = function() {
-                    var feedingService = getCurrentService();
+                    var feedingService: any = getCurrentService();
 
                     return feedingService ? feedingService.templateUrl : '';
                 };
diff --git a/scripts/apps/ingest/directives/IngestUserDashboard.js b/scripts/apps/ingest/directives/IngestUserDashboard.ts
similarity index 98%
rename from scripts/apps/ingest/directives/IngestUserDashboard.js
rename to scripts/apps/ingest/directives/IngestUserDashboard.ts
index e1d1f83bec..c5b08b3886 100644
--- a/scripts/apps/ingest/directives/IngestUserDashboard.js
+++ b/scripts/apps/ingest/directives/IngestUserDashboard.ts
@@ -44,13 +44,13 @@ export function IngestUserDashboard(api, userList, privileges, config, moment) {
             }
 
             function getLogMessages() {
-                var criteria = {
+                var criteria: any = {
                     max_results: 5,
                     sort: '[(\'_created\',-1)]',
                     embedded: {user: 1},
                 };
 
-                var where = [
+                var where: any = [
                     {resource: 'ingest_providers'},
                     {'data.provider_id': scope.item._id},
                 ];
diff --git a/scripts/apps/ingest/filters/index.js b/scripts/apps/ingest/filters/index.ts
similarity index 96%
rename from scripts/apps/ingest/filters/index.js
rename to scripts/apps/ingest/filters/index.ts
index 6aefc47886..91ad8eb94f 100644
--- a/scripts/apps/ingest/filters/index.js
+++ b/scripts/apps/ingest/filters/index.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export function InsertFilter() {
     return function(input, location, addition = '') {
         let loc = location || input.length;
diff --git a/scripts/apps/ingest/services/IngestProviderService.js b/scripts/apps/ingest/services/IngestProviderService.ts
similarity index 98%
rename from scripts/apps/ingest/services/IngestProviderService.js
rename to scripts/apps/ingest/services/IngestProviderService.ts
index a9240a969e..b2beb17ab7 100644
--- a/scripts/apps/ingest/services/IngestProviderService.js
+++ b/scripts/apps/ingest/services/IngestProviderService.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 
 IngestProviderService.$inject = ['api', '$q', 'preferencesService', '$filter', 'searchProviderService', 'config'];
 export function IngestProviderService(api, $q, preferencesService, $filter, searchProviderService, config) {
@@ -105,7 +106,7 @@ export function IngestProviderService(api, $q, preferencesService, $filter, sear
                     _.forEach(ingestProviders, (provider) => {
                         var userProvider = _.find(
                             _.isArray ? userIngestProviders : [userIngestProviders],
-                            (item) => item._id === provider._id
+                            (item) => item._id === provider._id,
                         );
 
                         provider.dashboard_enabled = !!userProvider;
@@ -127,4 +128,3 @@ export function IngestProviderService(api, $q, preferencesService, $filter, sear
 
     return service;
 }
-
diff --git a/scripts/apps/ingest/services/RemoveIngestedService.js b/scripts/apps/ingest/services/RemoveIngestedService.ts
similarity index 97%
rename from scripts/apps/ingest/services/RemoveIngestedService.js
rename to scripts/apps/ingest/services/RemoveIngestedService.ts
index 878c7ce821..6d4b0f23ab 100644
--- a/scripts/apps/ingest/services/RemoveIngestedService.js
+++ b/scripts/apps/ingest/services/RemoveIngestedService.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 RemoveIngestedService.$inject = ['api', '$rootScope'];
 export function RemoveIngestedService(api, $rootScope) {
     this.canRemove = canRemove;
diff --git a/scripts/apps/ingest/services/SendService.js b/scripts/apps/ingest/services/SendService.ts
similarity index 93%
rename from scripts/apps/ingest/services/SendService.js
rename to scripts/apps/ingest/services/SendService.ts
index 1eef1437ae..02cc382230 100644
--- a/scripts/apps/ingest/services/SendService.js
+++ b/scripts/apps/ingest/services/SendService.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 SendService.$inject = ['desks', 'api', '$q', 'notify', '$injector', 'multi', '$rootScope'];
@@ -39,7 +40,7 @@ export function SendService(desks, api, $q, notify, $injector, multi, $rootScope
                         }
                         notify.error(gettext(message));
                         item.error = response;
-                    }
+                    },
                 )
                 .finally(() => {
                     if (item.actioning) {
@@ -60,7 +61,7 @@ export function SendService(desks, api, $q, notify, $injector, multi, $rootScope
                         item.error = error;
                         notify.error(gettext('Failed to get item.'));
                         return item;
-                    }
+                    },
                 )
                 .finally(() => {
                     if (item.actioning) {
@@ -91,7 +92,7 @@ export function SendService(desks, api, $q, notify, $injector, multi, $rootScope
      * @returns {Promise}
      */
     function sendOneAs(item, config, action) {
-        var data = getData(config);
+        var data: any = getData(config);
 
         if (item._type === 'ingest') {
             return api.save('fetch', {}, data, item).then((archived) => {
@@ -139,29 +140,29 @@ export function SendService(desks, api, $q, notify, $injector, multi, $rootScope
                 });
         } else if (!item.lock_user) {
             return api.save('move', {}, {task: data, allPackageItems: config.sendAllPackageItems}, item)
-                .then((item) => {
-                    $rootScope.$broadcast('item:update', {item: item});
+                .then((_item) => {
+                    $rootScope.$broadcast('item:update', {item: _item});
                     if (config.open) {
-                        $injector.get('authoringWorkspace').edit(item);
+                        $injector.get('authoringWorkspace').edit(_item);
                     }
-                    return item;
+                    return _item;
                 });
         }
 
-        function getData(config) {
-            var data = {
-                desk: config.desk,
+        function getData(_config: any) {
+            var _data: any = {
+                desk: _config.desk,
             };
 
-            if (config.stage) {
-                data.stage = config.stage;
+            if (_config.stage) {
+                _data.stage = _config.stage;
             }
 
-            if (config.macro) {
-                data.macro = config.macro;
+            if (_config.macro) {
+                _data.macro = _config.macro;
             }
 
-            return data;
+            return _data;
         }
     }
 
diff --git a/scripts/apps/ingest/services/SubjectService.js b/scripts/apps/ingest/services/SubjectService.ts
similarity index 98%
rename from scripts/apps/ingest/services/SubjectService.js
rename to scripts/apps/ingest/services/SubjectService.ts
index b2c3a20e88..91d5cdc4cc 100644
--- a/scripts/apps/ingest/services/SubjectService.js
+++ b/scripts/apps/ingest/services/SubjectService.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 SubjectService.$inject = ['api'];
 export function SubjectService(api) {
     var service = {
diff --git a/scripts/apps/ingest/tests/ingest.spec.js b/scripts/apps/ingest/tests/ingest.spec.ts
similarity index 96%
rename from scripts/apps/ingest/tests/ingest.spec.js
rename to scripts/apps/ingest/tests/ingest.spec.ts
index d603f62bc1..7677ba6b85 100644
--- a/scripts/apps/ingest/tests/ingest.spec.js
+++ b/scripts/apps/ingest/tests/ingest.spec.ts
@@ -12,7 +12,7 @@ describe('ingest', () => {
 
         it('can send an ingest item', inject((send, api, $q, $rootScope) => {
             spyOn(api, 'save').and.returnValue($q.when({_created: 'now'}));
-            var item = {_id: '1', _type: 'ingest'};
+            var item: any = {_id: '1', _type: 'ingest'};
 
             expect(send.one(item).then).toBeDefined();
             $rootScope.$digest();
@@ -43,7 +43,7 @@ describe('ingest', () => {
         }));
 
         it('can send an item as', inject((send, api, $q, $rootScope) => {
-            var item = {_id: 1, _type: 'ingest'},
+            var item: any = {_id: 1, _type: 'ingest'},
                 config = {
                     desk: 'desk1',
                     stage: 'stage1',
@@ -86,7 +86,7 @@ describe('ingest', () => {
         it('can send multiple items as', inject((send, api, $q, $rootScope) => {
             spyOn(api, 'save').and.returnValue($q.when({_id: 'foo', _created: 'now'}));
 
-            var items = [{_id: 1, _type: 'ingest'}, {_id: 2, _type: 'ingest'}];
+            var items: any = [{_id: 1, _type: 'ingest'}, {_id: 2, _type: 'ingest'}];
 
             expect(send.config).toBe(null);
 
diff --git a/scripts/apps/legal-archive/controllers/LegalArchiveController.js b/scripts/apps/legal-archive/controllers/LegalArchiveController.ts
similarity index 98%
rename from scripts/apps/legal-archive/controllers/LegalArchiveController.js
rename to scripts/apps/legal-archive/controllers/LegalArchiveController.ts
index 51d4f15e23..9db117c150 100644
--- a/scripts/apps/legal-archive/controllers/LegalArchiveController.js
+++ b/scripts/apps/legal-archive/controllers/LegalArchiveController.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 LegalArchiveController.$inject = ['$scope', '$location', 'legal', 'preferencesService'];
 export function LegalArchiveController($scope, $location, legal, preferencesService) {
     var viewUpdate = {'archive:view': {
diff --git a/scripts/apps/legal-archive/directives/LegalItemSortbar.js b/scripts/apps/legal-archive/directives/LegalItemSortbar.ts
similarity index 98%
rename from scripts/apps/legal-archive/directives/LegalItemSortbar.js
rename to scripts/apps/legal-archive/directives/LegalItemSortbar.ts
index a67c659707..13b4b1efd6 100644
--- a/scripts/apps/legal-archive/directives/LegalItemSortbar.js
+++ b/scripts/apps/legal-archive/directives/LegalItemSortbar.ts
@@ -1,6 +1,8 @@
 import {BaseSortBar} from 'apps/search/directives/BaseSortBar';
 
 class LinkFunction extends BaseSortBar {
+    legal: any;
+
     constructor(legal, sort, scope, elem) {
         super(scope, elem, sort);
         this.legal = legal;
diff --git a/scripts/apps/legal-archive/services/LegalArchiveService.js b/scripts/apps/legal-archive/services/LegalArchiveService.ts
similarity index 97%
rename from scripts/apps/legal-archive/services/LegalArchiveService.js
rename to scripts/apps/legal-archive/services/LegalArchiveService.ts
index 99487af982..c59a05c7b9 100644
--- a/scripts/apps/legal-archive/services/LegalArchiveService.js
+++ b/scripts/apps/legal-archive/services/LegalArchiveService.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 /**
@@ -32,7 +33,7 @@ export function LegalArchiveService(api, $location, config, moment, sortService)
 
     this.getCriteria = function() {
         var params = $location.search(),
-            criteria = {
+            criteria: any = {
                 max_results: Number(params.max_results) || DEFAULT_PER_PAGE,
             };
 
@@ -72,7 +73,7 @@ export function LegalArchiveService(api, $location, config, moment, sortService)
             var val = _.trim(n);
 
             if (val) {
-                var clause = {};
+                var clause: any = {};
 
                 if (key === 'published_after') {
                     clause.versioncreated = {$gte: prepareDate(val, 'T00:00:00')};
diff --git a/scripts/apps/monitoring/controllers/AggregateCtrl.js b/scripts/apps/monitoring/controllers/AggregateCtrl.ts
similarity index 99%
rename from scripts/apps/monitoring/controllers/AggregateCtrl.js
rename to scripts/apps/monitoring/controllers/AggregateCtrl.ts
index faf80e6954..6169e10be3 100644
--- a/scripts/apps/monitoring/controllers/AggregateCtrl.js
+++ b/scripts/apps/monitoring/controllers/AggregateCtrl.ts
@@ -268,7 +268,7 @@ export function AggregateCtrl($scope, api, desks, workspaces, preferencesService
      * @param {boolean} isDesk
      */
     function initSpikeGroups(isDesk) {
-        var spikeDesks = {};
+        var spikeDesks: any = {};
 
         if (self.spikeGroups.length > 0) {
             self.spikeGroups.length = 0;
@@ -297,7 +297,7 @@ export function AggregateCtrl($scope, api, desks, workspaces, preferencesService
             }
         });
 
-        _.each(spikeDesks, (item) => {
+        _.each(spikeDesks, (item: any) => {
             if (item._id === 'personal') {
                 self.spikeGroups.push({_id: item._id, type: 'spike-personal', header: item.name});
             } else {
diff --git a/scripts/apps/monitoring/directives/DeskNotifications.js b/scripts/apps/monitoring/directives/DeskNotifications.ts
similarity index 96%
rename from scripts/apps/monitoring/directives/DeskNotifications.js
rename to scripts/apps/monitoring/directives/DeskNotifications.ts
index 4e293fc4ed..7269d64b9c 100644
--- a/scripts/apps/monitoring/directives/DeskNotifications.js
+++ b/scripts/apps/monitoring/directives/DeskNotifications.ts
@@ -65,7 +65,7 @@ export function DeskNotifications(desks, deskNotifications, authoringWorkspace,
              * @return {boolean} True if the notification is read by any user
              */
             scope.isRead = function(notification) {
-                var recipient = getRecipient(notification);
+                var recipient: any = getRecipient(notification);
 
                 return recipient && recipient.read;
             };
@@ -77,7 +77,7 @@ export function DeskNotifications(desks, deskNotifications, authoringWorkspace,
              * @return {string} Display name of the user
              */
             scope.readBy = function(notification) {
-                var recipient = getRecipient(notification);
+                var recipient: any = getRecipient(notification);
 
                 if (recipient && recipient.read) {
                     return desks.userLookup[recipient.user_id].display_name;
diff --git a/scripts/apps/monitoring/directives/ItemActionsMenu.js b/scripts/apps/monitoring/directives/ItemActionsMenu.ts
similarity index 97%
rename from scripts/apps/monitoring/directives/ItemActionsMenu.js
rename to scripts/apps/monitoring/directives/ItemActionsMenu.ts
index 546784082b..9568726049 100644
--- a/scripts/apps/monitoring/directives/ItemActionsMenu.js
+++ b/scripts/apps/monitoring/directives/ItemActionsMenu.ts
@@ -65,7 +65,7 @@ export function ItemActionsMenu(superdesk, activityService, workflowService, arc
              */
             function getActions(item) {
                 let intent = {action: 'list', type: getType(item)};
-                let groups = {};
+                let groups: any = {};
 
                 superdesk.findActivities(intent, item).forEach((activity) => {
                     if (workflowService.isActionAllowed(scope.item, activity.action)) {
@@ -80,7 +80,7 @@ export function ItemActionsMenu(superdesk, activityService, workflowService, arc
 
                 AUTHORING_MENU_GROUPS.forEach((mg) => {
                     if (groups[mg._id]) {
-                        let group = {...mg};
+                        let group: any = {...mg};
 
                         group.actions = groups[mg._id];
                         menuGroups.push(group);
diff --git a/scripts/apps/monitoring/directives/MonitoringView.js b/scripts/apps/monitoring/directives/MonitoringView.ts
similarity index 97%
rename from scripts/apps/monitoring/directives/MonitoringView.js
rename to scripts/apps/monitoring/directives/MonitoringView.ts
index 0946c6bc77..a081d1de15 100644
--- a/scripts/apps/monitoring/directives/MonitoringView.js
+++ b/scripts/apps/monitoring/directives/MonitoringView.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 /**
@@ -99,8 +100,8 @@ export function MonitoringView($rootScope, authoringWorkspace, pageTitle, $timeo
 
             containerElem.on('scroll', handleContainerScroll);
 
-            function isListEnd(containerElem) {
-                return containerElem.scrollTop + containerElem.offsetHeight + 200 >= containerElem.scrollHeight;
+            function isListEnd(container) {
+                return container.scrollTop + container.offsetHeight + 200 >= container.scrollHeight;
             }
 
             /**
diff --git a/scripts/apps/monitoring/directives/WidgetGroup.js b/scripts/apps/monitoring/directives/WidgetGroup.ts
similarity index 94%
rename from scripts/apps/monitoring/directives/WidgetGroup.js
rename to scripts/apps/monitoring/directives/WidgetGroup.ts
index 10d084a3c3..1b48b7e91b 100644
--- a/scripts/apps/monitoring/directives/WidgetGroup.js
+++ b/scripts/apps/monitoring/directives/WidgetGroup.ts
@@ -1,5 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
+import _ from 'lodash';
 
 import {WidgetItemList as WidgetItemListComponent} from 'apps/search/components';
 
@@ -71,35 +72,35 @@ export function WidgetGroup(search, api, superdesk, desks, cards, $timeout, $q,
                 if (item._type === 'ingest') {
                     var activity = superdesk.findActivities({action: 'list', type: 'ingest'}, item)[0];
 
-                    activityService.start(activity, {data: {item: item}}).then((item) => {
-                        initEdit(item);
+                    activityService.start(activity, {data: {item: item}}).then((_item) => {
+                        initEdit(_item);
                     });
                 } else {
                     initEdit(item);
                 }
 
-                function initEdit(item) {
-                    superdesk.intent('edit', 'item', item).then(null, () => {
-                        superdesk.intent('view', 'item', item);
+                function initEdit(_item) {
+                    superdesk.intent('edit', 'item', _item).then(null, () => {
+                        superdesk.intent('view', 'item', _item);
                     });
                 }
             };
 
-            function getProvider(criteria) {
+            function getProvider(_criteria) {
                 var provider = 'archive';
 
                 if (scope.stage.type && (desks.isOutputType(scope.stage.type) || scope.stage.type === 'search')) {
                     provider = 'search';
                 }
 
-                if (criteria.repo && criteria.repo.indexOf(',') === -1) {
-                    provider = criteria.repo;
+                if (_criteria.repo && _criteria.repo.indexOf(',') === -1) {
+                    provider = _criteria.repo;
                 }
 
                 return provider;
             }
 
-            function queryItems(queryString, params) {
+            function queryItems(queryString?, params?) {
                 if (!scope.fetching) {
                     // page reload disabled when the user scrolls
                     if (container.scrollTop > 20) {
@@ -137,7 +138,7 @@ export function WidgetGroup(search, api, superdesk, desks, cards, $timeout, $q,
 
                         if ($rootScope.config.features.customMonitoringWidget &&
                             !scope.selected && scope.itemIds && scope.itemIds.length) {
-                            scope.selected = scope.itemsById[_.head(scope.itemIds)];
+                            scope.selected = scope.itemsById[(_.head(scope.itemIds) as string)];
                             scope.action({item: scope.selected});
                         }
 
@@ -150,7 +151,6 @@ export function WidgetGroup(search, api, superdesk, desks, cards, $timeout, $q,
                     });
             }
 
-
             scope.updateItem = function(item, gone, schedule) {
                 var itemId;
 
@@ -363,12 +363,12 @@ export function WidgetGroup(search, api, superdesk, desks, cards, $timeout, $q,
                     }
                     if (index === -1) { // selected not in current items, select first
                         container.scrollTop = 0;
-                        clickItem(scope.itemsById[_.head(scope.itemIds)], event);
+                        clickItem(scope.itemsById[(_.head(scope.itemIds) as any)], event);
                     }
                     var nextIndex = _.max([0, _.min([scope.itemIds.length - 1, index + diff])]);
 
                     if (nextIndex < 0) {
-                        clickItem(scope.itemsById[_.last(scope.itemIds)], event);
+                        clickItem(scope.itemsById[(_.last(scope.itemIds) as any)], event);
                     }
                     if (index !== nextIndex) {
                         // scrolling in monitoring widget for ntb is done by keyboard
@@ -426,7 +426,7 @@ export function WidgetGroup(search, api, superdesk, desks, cards, $timeout, $q,
                     select: scope.select,
                     edit: scope.edit,
                     updateCallback: scope.getUpdateCallback,
-                }
+                },
             );
 
             ReactDOM.render(itemList, elem[0]);
diff --git a/scripts/apps/monitoring/services/CardsService.js b/scripts/apps/monitoring/services/CardsService.ts
similarity index 96%
rename from scripts/apps/monitoring/services/CardsService.js
rename to scripts/apps/monitoring/services/CardsService.ts
index 9c151e2f89..d40011704a 100644
--- a/scripts/apps/monitoring/services/CardsService.js
+++ b/scripts/apps/monitoring/services/CardsService.ts
@@ -7,7 +7,7 @@ export function CardsService(api, search, session, desks, config) {
     this.shouldUpdate = shouldUpdate;
 
     function getCriteriaParams(card) {
-        let params = {};
+        let params: any = {};
 
         if (card.type === 'search' && card.search && card.search.filter.query) {
             angular.copy(card.search.filter.query, params);
@@ -109,7 +109,7 @@ export function CardsService(api, search, session, desks, config) {
                 {term: {type: 'composite'}},
             ]};
 
-            var termsFileType = {terms: {type: JSON.parse(card.fileType)}};
+            var termsFileType: any = {terms: {type: JSON.parse(card.fileType)}};
 
             // Normal package
             if (_.includes(JSON.parse(card.fileType), 'composite')) {
@@ -142,7 +142,7 @@ export function CardsService(api, search, session, desks, config) {
     function getCriteria(card, queryString, queryParam) {
         var params = getCriteriaParams(card);
         var query = search.query(setFilters(params));
-        var criteria = {es_highlight: card.query ? search.getElasticHighlight() : 0};
+        var criteria: any = {es_highlight: card.query ? search.getElasticHighlight() : 0};
 
         filterQueryByCardType(query, queryParam, card);
         filterQueryByCardFileType(query, card);
diff --git a/scripts/apps/monitoring/tests/monitoring.spec.js b/scripts/apps/monitoring/tests/monitoring.spec.ts
similarity index 99%
rename from scripts/apps/monitoring/tests/monitoring.spec.js
rename to scripts/apps/monitoring/tests/monitoring.spec.ts
index 0ed3ea862e..df84f3f19d 100644
--- a/scripts/apps/monitoring/tests/monitoring.spec.js
+++ b/scripts/apps/monitoring/tests/monitoring.spec.ts
@@ -22,7 +22,6 @@ describe('monitoring', () => {
             var scope = $rootScope.$new(),
                 ctrl = $controller('Monitoring', {$scope: scope});
 
-
             expect(ctrl.hasSwimlaneView).toBe(1);
             $rootScope.$digest();
 
@@ -38,7 +37,7 @@ describe('monitoring', () => {
             expect(ctrl.columnsLimit).toBe(4);
             expect(preferencesService.update).toHaveBeenCalledWith(
                 {'monitoring:view:session': true},
-                'monitoring:view:session'
+                'monitoring:view:session',
             );
 
             // Switch back to list view
@@ -67,7 +66,7 @@ describe('monitoring', () => {
     it('can hide history tabs when preview externalsource item', inject(($controller, $rootScope) => {
         var scope = $rootScope.$new(),
             ctrl = $controller('Monitoring', {$scope: scope}),
-            item = {};
+            item: any = {};
 
         expect(ctrl.state['with-preview']).toBeFalsy();
 
@@ -142,7 +141,7 @@ describe('monitoring', () => {
 
         it('can get criteria for spike desk', inject((cards, session) => {
             session.identity = {_id: 'foo'};
-            var card = {type: 'spike'};
+            var card: any = {type: 'spike'};
             var criteria = cards.criteria(card);
 
             expect(criteria.source.query.filtered.filter.and).toContain({
@@ -294,7 +293,7 @@ describe('monitoring', () => {
                 scope.$digest();
                 $timeout.flush(2000);
                 expect(search.mergeItems).toHaveBeenCalled();
-            })
+            }),
         );
 
         it('can edit non spiked item', inject(($controller, $rootScope, $compile, authoringWorkspace, session) => {
diff --git a/scripts/apps/packaging/controllers/SearchWidgetCtrl.js b/scripts/apps/packaging/controllers/SearchWidgetCtrl.ts
similarity index 98%
rename from scripts/apps/packaging/controllers/SearchWidgetCtrl.js
rename to scripts/apps/packaging/controllers/SearchWidgetCtrl.ts
index a6a69b3603..6db0284663 100644
--- a/scripts/apps/packaging/controllers/SearchWidgetCtrl.js
+++ b/scripts/apps/packaging/controllers/SearchWidgetCtrl.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 SearchWidgetCtrl.$inject = ['$scope', 'packages', 'api', 'search'];
 export function SearchWidgetCtrl($scope, packages, api, search) {
     $scope.selected = null;
@@ -17,7 +19,7 @@ export function SearchWidgetCtrl($scope, packages, api, search) {
             return;
         }
 
-        var params = {};
+        var params: any = {};
 
         params.q = $scope.query;
         params.ignoreKilled = true;
diff --git a/scripts/apps/packaging/directives/Package.js b/scripts/apps/packaging/directives/Package.ts
similarity index 97%
rename from scripts/apps/packaging/directives/Package.js
rename to scripts/apps/packaging/directives/Package.ts
index c8b0c8c81c..f752e33984 100644
--- a/scripts/apps/packaging/directives/Package.js
+++ b/scripts/apps/packaging/directives/Package.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export function Package() {
     var solveRefs = function(item, groups) {
         var items = {childId: '_items', childData: []};
diff --git a/scripts/apps/packaging/directives/PackageItemPreview.js b/scripts/apps/packaging/directives/PackageItemPreview.ts
similarity index 99%
rename from scripts/apps/packaging/directives/PackageItemPreview.js
rename to scripts/apps/packaging/directives/PackageItemPreview.ts
index 4d55705a73..777997e3b6 100644
--- a/scripts/apps/packaging/directives/PackageItemPreview.js
+++ b/scripts/apps/packaging/directives/PackageItemPreview.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 PackageItemPreview.$inject = ['api', 'lock', 'superdesk', 'authoringWorkspace', '$location', '$sce',
     'desks', 'vocabularies'];
 export function PackageItemPreview(api, lock, superdesk, authoringWorkspace, $location, $sce,
diff --git a/scripts/apps/packaging/directives/PackageItemsEdit.js b/scripts/apps/packaging/directives/PackageItemsEdit.ts
similarity index 91%
rename from scripts/apps/packaging/directives/PackageItemsEdit.js
rename to scripts/apps/packaging/directives/PackageItemsEdit.ts
index 13efe658b8..24dd1fe4ef 100644
--- a/scripts/apps/packaging/directives/PackageItemsEdit.js
+++ b/scripts/apps/packaging/directives/PackageItemsEdit.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 PackageItemsEdit.$inject = ['packages', 'notify', '$rootScope'];
@@ -25,7 +26,7 @@ export function PackageItemsEdit(packages, notify, $rootScope) {
             });
 
             scope.$on('package:updateGroupRef', (event, data) => {
-                var group = _.find(scope.list, {id: data.group.id});
+                var group: any = _.find(scope.list, {id: data.group.id});
 
                 if (group) {
                     var ref = _.find(group.items, {residRef: data.ref.residRef});
@@ -68,7 +69,7 @@ export function PackageItemsEdit(packages, notify, $rootScope) {
             });
 
             ngModel.$formatters.unshift((modelValue) => {
-                var root = _.find(modelValue, {id: 'root'});
+                var root: any = _.find(modelValue, {id: 'root'});
 
                 if (typeof root === 'undefined') {
                     return;
@@ -84,7 +85,7 @@ export function PackageItemsEdit(packages, notify, $rootScope) {
                 });
 
                 function visit(groupId) {
-                    var _group = _.find(modelValue, {id: groupId});
+                    var _group: any = _.find(modelValue, {id: groupId});
                     var items = [];
 
                     _.each(_group.refs, (ref) => {
@@ -105,7 +106,7 @@ export function PackageItemsEdit(packages, notify, $rootScope) {
             });
 
             scope.remove = function(groupId, residRef) {
-                var group = _.find(scope.list, {id: groupId});
+                var group: any = _.find(scope.list, {id: groupId});
                 var item = _.find(group.items, {residRef: residRef});
 
                 _.remove(group.items, {residRef: residRef});
@@ -114,8 +115,8 @@ export function PackageItemsEdit(packages, notify, $rootScope) {
             };
 
             scope.reorder = function(start, end) {
-                var src = _.find(scope.list, {id: start.group});
-                var dest = _.find(scope.list, {id: end.group});
+                var src: any = _.find(scope.list, {id: start.group});
+                var dest: any = _.find(scope.list, {id: end.group});
 
                 if (start.index !== end.index || start.group !== end.group) {
                     var item = src.items.splice(start.index, 1)[0];
diff --git a/scripts/apps/packaging/services/PackagesService.js b/scripts/apps/packaging/services/PackagesService.ts
similarity index 95%
rename from scripts/apps/packaging/services/PackagesService.js
rename to scripts/apps/packaging/services/PackagesService.ts
index ecd29a0d1a..9a11f3289b 100644
--- a/scripts/apps/packaging/services/PackagesService.js
+++ b/scripts/apps/packaging/services/PackagesService.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 PackagesService.$inject = ['api', '$q', 'archiveService', 'lock', 'autosave', 'authoring',
     'authoringWorkspace', 'desks', '$rootScope'];
 export function PackagesService(api, $q, archiveService, lock, autosave, authoring,
@@ -18,7 +20,7 @@ export function PackagesService(api, $q, archiveService, lock, autosave, authori
     this.createPackageFromItems = function(items, defaults) {
         var idRef = 'main';
         var item = items[0];
-        var newPackage = {
+        var newPackage: any = {
             headline: item.headline || item.description_text || '',
             slugline: item.slugline || '',
             description_text: item.description_text || '',
@@ -44,7 +46,7 @@ export function PackagesService(api, $q, archiveService, lock, autosave, authori
     };
 
     this.createEmptyPackage = function(defaults, idRef = 'main') {
-        var newPackage = {
+        var newPackage: any = {
             headline: '',
             slugline: '',
             description_text: '',
@@ -75,7 +77,7 @@ export function PackagesService(api, $q, archiveService, lock, autosave, authori
         var targetGroup = _.find(origGroups, (group) => group.id.toLowerCase() === groupId);
 
         if (!targetGroup) {
-            var rootGroup = _.find(origGroups, {id: 'root'});
+            var rootGroup: any = _.find(origGroups, {id: 'root'});
 
             rootGroup.refs.push({idRef: groupId});
             targetGroup = {
@@ -125,7 +127,7 @@ export function PackagesService(api, $q, archiveService, lock, autosave, authori
 
     function setItemLabel(pkg, item, label) {
         _.forEach(pkg.groups, (group) => {
-            var ref = _.find(group.refs, {residRef: item._id});
+            var ref: any = _.find(group.refs, {residRef: item._id});
 
             if (ref) {
                 ref.label = label ? label.qcode : null;
@@ -152,7 +154,7 @@ export function PackagesService(api, $q, archiveService, lock, autosave, authori
         var isSet = false;
 
         _.forEach(pkg.groups, (group) => {
-            var ref = _.find(group.refs, {guid: item._id});
+            var ref: any = _.find(group.refs, {guid: item._id});
 
             if (ref && ref.label === qcode) {
                 isSet = true;
diff --git a/scripts/apps/products/controllers/ProductsConfigController.js b/scripts/apps/products/controllers/ProductsConfigController.ts
similarity index 99%
rename from scripts/apps/products/controllers/ProductsConfigController.js
rename to scripts/apps/products/controllers/ProductsConfigController.ts
index d56bfd6da2..a08c5d7221 100644
--- a/scripts/apps/products/controllers/ProductsConfigController.js
+++ b/scripts/apps/products/controllers/ProductsConfigController.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 /**
diff --git a/scripts/apps/products/services/ProductsFactory.js b/scripts/apps/products/services/ProductsFactory.ts
similarity index 98%
rename from scripts/apps/products/services/ProductsFactory.js
rename to scripts/apps/products/services/ProductsFactory.ts
index 99a78a02df..84709b9752 100644
--- a/scripts/apps/products/services/ProductsFactory.js
+++ b/scripts/apps/products/services/ProductsFactory.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 ProductsFactory.$inject = ['$q', 'api', 'contentFilters', '$filter'];
 export function ProductsFactory($q, api, contentFilters, $filter) {
     /**
diff --git a/scripts/apps/publish/controllers/PublishQueueController.js b/scripts/apps/publish/controllers/PublishQueueController.ts
similarity index 91%
rename from scripts/apps/publish/controllers/PublishQueueController.js
rename to scripts/apps/publish/controllers/PublishQueueController.ts
index 3547b0003a..7606c65c85 100644
--- a/scripts/apps/publish/controllers/PublishQueueController.js
+++ b/scripts/apps/publish/controllers/PublishQueueController.ts
@@ -161,8 +161,8 @@ export function PublishQueueController($scope, subscribersService, api, $q, noti
         if (angular.isDefined(item)) {
             queueItems.push($scope.buildNewSchedule(item));
         } else if ($scope.multiSelectCount > 0) {
-            _.forEach($scope.selectedQueueItems, (item) => {
-                queueItems.push($scope.buildNewSchedule(item));
+            _.forEach($scope.selectedQueueItems, (_item) => {
+                queueItems.push($scope.buildNewSchedule(_item));
             });
         }
 
@@ -179,7 +179,7 @@ export function PublishQueueController($scope, subscribersService, api, $q, noti
                 } else {
                     notify.error(gettext('Error: Failed to re-schedule'));
                 }
-            }
+            },
         );
     };
 
@@ -189,16 +189,16 @@ export function PublishQueueController($scope, subscribersService, api, $q, noti
         if (angular.isDefined(item)) {
             itemList.push(item);
         } else if ($scope.multiSelectCount > 0) {
-            _.forEach($scope.selectedQueueItems, (item) => {
-                if (item.state === 'pending' || item.state === 'retrying') {
-                    item.state = 'canceled';
-                    itemList.push(item);
+            _.forEach($scope.selectedQueueItems, (_item) => {
+                if (_item.state === 'pending' || _item.state === 'retrying') {
+                    _item.state = 'canceled';
+                    itemList.push(_item);
                 }
             });
         }
 
-        _.forEach(itemList, (item) => {
-            api.publish_queue.update(item, {state: 'canceled'});
+        _.forEach(itemList, (_item) => {
+            api.publish_queue.update(_item, {state: 'canceled'});
         });
         $scope.cancelSelection();
     };
@@ -238,7 +238,7 @@ export function PublishQueueController($scope, subscribersService, api, $q, noti
 
         /* look for any items in states that cannot be resent */
         var idx = _.findIndex($scope.selectedQueueItems,
-            (item) => _.includes(['pending', 'in-progress', 'retrying'], item.state));
+            (item: any) => _.includes(['pending', 'in-progress', 'retrying'], item.state));
 
         /* All selected items can be resent */
         if (idx === -1) {
@@ -248,7 +248,7 @@ export function PublishQueueController($scope, subscribersService, api, $q, noti
         } else {
             /* Find the index of any item that can be resent */
             idx = _.findIndex($scope.selectedQueueItems,
-                (item) => item.state === 'success' || item.state === 'in-progress' || item.state === 'canceled' ||
+                (item: any) => item.state === 'success' || item.state === 'in-progress' || item.state === 'canceled' ||
                     item.state === 'error' || item.state === 'retrying');
             /* Nothing to resend found */
             if (idx === -1) {
@@ -256,7 +256,7 @@ export function PublishQueueController($scope, subscribersService, api, $q, noti
                 $scope.showCancelSelectionBtn = true;
                 /* look for items that can be canceled */
                 idx = _.findIndex($scope.selectedQueueItems,
-                    (item) => item.state === 'pending' || item.state === 'retrying');
+                    (item: any) => item.state === 'pending' || item.state === 'retrying');
                 /* Something can be canceled so show the button */
                 if (idx !== -1) {
                     $scope.showCancelBtn = true;
@@ -295,7 +295,7 @@ export function PublishQueueController($scope, subscribersService, api, $q, noti
     };
 
     function previewItem() {
-        var queueItem = _.find($scope.publish_queue, {_id: $location.search()._id}) || null;
+        var queueItem: any = _.find($scope.publish_queue, {_id: $location.search()._id}) || null;
 
         $scope.selected.extensionPoint = false;
 
diff --git a/scripts/apps/publish/directives/SubscribersDirective.js b/scripts/apps/publish/directives/SubscribersDirective.ts
similarity index 99%
rename from scripts/apps/publish/directives/SubscribersDirective.js
rename to scripts/apps/publish/directives/SubscribersDirective.ts
index 26a2de4343..f534c11b1d 100644
--- a/scripts/apps/publish/directives/SubscribersDirective.js
+++ b/scripts/apps/publish/directives/SubscribersDirective.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 /**
@@ -57,7 +58,7 @@ export function SubscribersDirective(
                 subscribersService.fetchSubscribers().then(
                     (result) => {
                         $scope.subscribers = result;
-                    }
+                    },
                 );
             };
 
@@ -79,7 +80,6 @@ export function SubscribersDirective(
                         _.includes(['api', 'both'], item.product_type || 'both'));
                 });
 
-
             /**
              * Initializes the Global Filters on the selected subscriber.
              */
@@ -184,7 +184,7 @@ export function SubscribersDirective(
                             } else {
                                 notify.error(gettext('Error: Failed to save Subscriber.'));
                             }
-                        }
+                        },
                     )
                     .then(fetchSubscribers);
             };
@@ -220,7 +220,7 @@ export function SubscribersDirective(
                     if (angular.isDefined($scope.subscriber.destinations)
                         && !_.isNull($scope.subscriber.destinations) &&
                         $scope.subscriber.destinations.length > 0) {
-                        $scope.destinations = _.clone($scope.subscriber.destinations, true);
+                        $scope.destinations = _.clone($scope.subscriber.destinations);
                     }
 
                     $scope.subscriberType = $scope.subscriber.subscriber_type || '';
diff --git a/scripts/apps/publish/services/SubscribersService.js b/scripts/apps/publish/services/SubscribersService.ts
similarity index 98%
rename from scripts/apps/publish/services/SubscribersService.js
rename to scripts/apps/publish/services/SubscribersService.ts
index 0883803cde..a982481459 100644
--- a/scripts/apps/publish/services/SubscribersService.js
+++ b/scripts/apps/publish/services/SubscribersService.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 SubscribersService.$inject = ['api', '$q', '$filter'];
 export function SubscribersService(api, $q, $filter) {
     /**
diff --git a/scripts/apps/search-providers/directive.js b/scripts/apps/search-providers/directive.ts
similarity index 97%
rename from scripts/apps/search-providers/directive.js
rename to scripts/apps/search-providers/directive.ts
index 8ad17f085e..7421886376 100644
--- a/scripts/apps/search-providers/directive.js
+++ b/scripts/apps/search-providers/directive.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 export default function SearchProviderConfigDirective(searchProviderService, notify, api, modal) {
@@ -23,7 +24,7 @@ export default function SearchProviderConfigDirective(searchProviderService, not
                 searchProviderService.getSearchProviders().then(
                     (result) => {
                         $scope.providers = result;
-                    }
+                    },
                 );
             }
 
@@ -49,7 +50,7 @@ export default function SearchProviderConfigDirective(searchProviderService, not
                             } else {
                                 notify.error(gettext('Error: Failed to save Search Provider.'));
                             }
-                        }
+                        },
                     )
                     .then(fetchSearchProviders);
             };
@@ -81,10 +82,10 @@ export default function SearchProviderConfigDirective(searchProviderService, not
                                     } else {
                                         notify.error(gettext('Error: Unable to delete Search Provider.'));
                                     }
-                                }
+                                },
                             )
                             .then(fetchSearchProviders);
-                    }
+                    },
                 );
             };
 
diff --git a/scripts/apps/search/components/DesksDropdown.ts b/scripts/apps/search/components/DesksDropdown.ts
index 8b0a2c53b6..2c3cfa309e 100644
--- a/scripts/apps/search/components/DesksDropdown.ts
+++ b/scripts/apps/search/components/DesksDropdown.ts
@@ -69,7 +69,8 @@ export class DesksDropdown extends React.Component<any, any> {
             onMouseLeave: this.close,
         }, React.createElement('ul', {}, desks));
 
-        const icon = ReactDOM.findDOMNode(this).getElementsByClassName('dropdown__toggle')[0];
+        const thisNode = ReactDOM.findDOMNode(this) as HTMLElement;
+        const icon = thisNode.getElementsByClassName('dropdown__toggle')[0];
 
         renderToBody(elem, icon);
     }
diff --git a/scripts/apps/search/components/HighlightsInfo.tsx b/scripts/apps/search/components/HighlightsInfo.tsx
index 945b275009..e87b18aae0 100644
--- a/scripts/apps/search/components/HighlightsInfo.tsx
+++ b/scripts/apps/search/components/HighlightsInfo.tsx
@@ -121,8 +121,10 @@ export class HighlightsInfo extends React.Component<any, any> {
             scope: this.props.scope,
         });
 
-        const icon = ReactDOM.findDOMNode(this).getElementsByClassName('icon-star')[0] ||
-        ReactDOM.findDOMNode(this).getElementsByClassName('icon-multi-star')[0];
+        const thisNode = ReactDOM.findDOMNode(this) as HTMLElement;
+
+        const icon = thisNode.getElementsByClassName('icon-star')[0] ||
+        thisNode.getElementsByClassName('icon-multi-star')[0];
 
         openActionsMenu(elem, icon, this.props.item._id);
     }
diff --git a/scripts/apps/search/components/ListTypeIcon.tsx b/scripts/apps/search/components/ListTypeIcon.tsx
index e7653aa4c7..2c46ee550e 100644
--- a/scripts/apps/search/components/ListTypeIcon.tsx
+++ b/scripts/apps/search/components/ListTypeIcon.tsx
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 
 interface IProps {
     svc: object;
-    selectingDisabled: boolean;
+    selectingDisabled?: boolean;
     onMultiSelect: () => void;
     item: any;
 }
diff --git a/scripts/apps/search/components/MarkedDesksInfo.tsx b/scripts/apps/search/components/MarkedDesksInfo.tsx
index 9c4ae38180..8bb67cc072 100644
--- a/scripts/apps/search/components/MarkedDesksInfo.tsx
+++ b/scripts/apps/search/components/MarkedDesksInfo.tsx
@@ -78,8 +78,10 @@ export class MarkedDesksInfo extends React.Component<any, any> {
             svc: this.props.svc,
         });
 
-        const icon = ReactDOM.findDOMNode(this).getElementsByClassName('icon-bell')[0] ||
-        ReactDOM.findDOMNode(this).getElementsByClassName('icon-bell')[0];
+        const thisNode = ReactDOM.findDOMNode(this) as HTMLElement;
+
+        const icon = thisNode.getElementsByClassName('icon-bell')[0] ||
+        thisNode.getElementsByClassName('icon-bell')[0];
 
         openActionsMenu(elem, icon, this.props.item._id);
     }
diff --git a/scripts/apps/search/components/actions-menu/ActionsMenu.tsx b/scripts/apps/search/components/actions-menu/ActionsMenu.tsx
index 28963b779a..f13edb4411 100644
--- a/scripts/apps/search/components/actions-menu/ActionsMenu.tsx
+++ b/scripts/apps/search/components/actions-menu/ActionsMenu.tsx
@@ -19,7 +19,7 @@ export class ActionsMenu extends React.Component<any, any> {
     toggle(event) {
         this.stopEvent(event);
         closeActionsMenu(this.props.item._id);
-        const icon = ReactDOM.findDOMNode(this)
+        const icon = (ReactDOM.findDOMNode(this) as HTMLElement)
             .getElementsByClassName('icon-dots-vertical')[0];
 
         openActionsMenu(<MenuItems
diff --git a/scripts/apps/search/components/actions-menu/Item.tsx b/scripts/apps/search/components/actions-menu/Item.tsx
index 40a0c09820..5e2a937128 100644
--- a/scripts/apps/search/components/actions-menu/Item.tsx
+++ b/scripts/apps/search/components/actions-menu/Item.tsx
@@ -61,7 +61,8 @@ export default class Item extends React.Component<any, any> {
     }
 
     setPosition() {
-        const targetRect = ReactDOM.findDOMNode(this).getBoundingClientRect();
+        const thisNode = ReactDOM.findDOMNode(this) as HTMLElement;
+        const targetRect = thisNode.getBoundingClientRect();
         const BUFFER = 250;
 
         if (targetRect.left < LEFT_SIDEBAR_WIDTH + BUFFER) {
diff --git a/scripts/apps/search/components/fields/highlights.js b/scripts/apps/search/components/fields/highlights.ts
similarity index 93%
rename from scripts/apps/search/components/fields/highlights.js
rename to scripts/apps/search/components/fields/highlights.ts
index 876379a352..058d989e12 100644
--- a/scripts/apps/search/components/fields/highlights.js
+++ b/scripts/apps/search/components/fields/highlights.ts
@@ -8,7 +8,7 @@ export function highlights(props) {
     }, props));
 }
 
-highlights.propTypes = {
+highlights['propTypes'] = {
     // item is passed through to HighlightsInfo directly via props
     // eslint-disable-next-line react/no-unused-prop-types
     item: PropTypes.any,
diff --git a/scripts/apps/search/components/fields/markedDesks.js b/scripts/apps/search/components/fields/markedDesks.ts
similarity index 93%
rename from scripts/apps/search/components/fields/markedDesks.js
rename to scripts/apps/search/components/fields/markedDesks.ts
index 4d49e23973..715a611801 100644
--- a/scripts/apps/search/components/fields/markedDesks.js
+++ b/scripts/apps/search/components/fields/markedDesks.ts
@@ -8,7 +8,7 @@ export function markedDesks(props) {
     }, props));
 }
 
-markedDesks.propTypes = {
+markedDesks['propTypes'] = {
     // item is passed through to MarkedDesksInfo directly via props
     // eslint-disable-next-line react/no-unused-prop-types
     item: PropTypes.any,
diff --git a/scripts/apps/search/components/fields/slugline.js b/scripts/apps/search/components/fields/slugline.ts
similarity index 90%
rename from scripts/apps/search/components/fields/slugline.js
rename to scripts/apps/search/components/fields/slugline.ts
index 48c16defeb..591a6bf342 100644
--- a/scripts/apps/search/components/fields/slugline.js
+++ b/scripts/apps/search/components/fields/slugline.ts
@@ -7,11 +7,13 @@ export function slugline(props) {
         return React.createElement(
             'span',
             {className: 'keyword', key: 'slugline',
-                dangerouslySetInnerHTML: createMarkUp(props.item.slugline)}
+                dangerouslySetInnerHTML: createMarkUp(props.item.slugline)},
+
         );
     }
 }
 
-slugline.propTypes = {
+slugline['propTypes'] = {
     item: PropTypes.any,
+
 };
diff --git a/scripts/apps/search/components/fields/wordcount.js b/scripts/apps/search/components/fields/wordcount.ts
similarity index 67%
rename from scripts/apps/search/components/fields/wordcount.js
rename to scripts/apps/search/components/fields/wordcount.ts
index c468eac437..434cf64a84 100644
--- a/scripts/apps/search/components/fields/wordcount.js
+++ b/scripts/apps/search/components/fields/wordcount.ts
@@ -1,14 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-export function wordcount(props) {
+export function wordcount(props: any) {
     return React.createElement(
         'span',
         {className: 'word-count', key: 'wordcount'},
-        props.item.word_count
+        props.item.word_count,
     );
 }
 
-wordcount.propTypes = {
+wordcount['propTypes'] = {
     item: PropTypes.any,
 };
diff --git a/scripts/apps/search/directives/BaseSortBar.js b/scripts/apps/search/directives/BaseSortBar.ts
similarity index 94%
rename from scripts/apps/search/directives/BaseSortBar.js
rename to scripts/apps/search/directives/BaseSortBar.ts
index b5de12976d..060323b265 100644
--- a/scripts/apps/search/directives/BaseSortBar.js
+++ b/scripts/apps/search/directives/BaseSortBar.ts
@@ -1,4 +1,7 @@
 export class BaseSortBar {
+    scope: any;
+    sortService: any;
+
     constructor(scope, elem, sortService) {
         this.scope = scope;
         this.sortService = sortService;
diff --git a/scripts/apps/search/directives/ItemList.js b/scripts/apps/search/directives/ItemList.ts
similarity index 98%
rename from scripts/apps/search/directives/ItemList.js
rename to scripts/apps/search/directives/ItemList.ts
index 13697f3f43..7b8ea973dc 100644
--- a/scripts/apps/search/directives/ItemList.js
+++ b/scripts/apps/search/directives/ItemList.ts
@@ -3,6 +3,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
+import _ from 'lodash';
 
 import {ItemList as ItemListComponent} from 'apps/search/components';
 
@@ -99,7 +100,7 @@ export function ItemList(
     storage,
     keyboardManager,
     session,
-    content
+    content,
 ) {
     // contains all the injected services to be passed down to child
     // components via props
@@ -391,7 +392,6 @@ export function ItemList(
                     }
                 });
 
-
                 scope.singleLine = search.singleLine;
 
                 scope.$on('rowview:narrow', () => {
@@ -450,8 +450,8 @@ export function ItemList(
                  * @param {Element} elem
                  * @return {Boolean}
                  */
-                function isListEnd(elem) {
-                    return elem.scrollTop + elem.offsetHeight + 200 >= elem.scrollHeight;
+                function isListEnd(element) {
+                    return element.scrollTop + element.offsetHeight + 200 >= element.scrollHeight;
                 }
 
                 elem.on('keydown', listComponent.handleKey);
diff --git a/scripts/apps/search/directives/ItemSearchbar.js b/scripts/apps/search/directives/ItemSearchbar.ts
similarity index 98%
rename from scripts/apps/search/directives/ItemSearchbar.js
rename to scripts/apps/search/directives/ItemSearchbar.ts
index d6601a91b0..cac68749a1 100644
--- a/scripts/apps/search/directives/ItemSearchbar.js
+++ b/scripts/apps/search/directives/ItemSearchbar.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 ItemSearchbar.$inject = ['$location', '$document', 'asset'];
 
 /**
diff --git a/scripts/apps/search/directives/ItemSortbar.js b/scripts/apps/search/directives/ItemSortbar.ts
similarity index 96%
rename from scripts/apps/search/directives/ItemSortbar.js
rename to scripts/apps/search/directives/ItemSortbar.ts
index c186cffc94..bcc7178bae 100644
--- a/scripts/apps/search/directives/ItemSortbar.js
+++ b/scripts/apps/search/directives/ItemSortbar.ts
@@ -1,6 +1,11 @@
 import {BaseSortBar} from './BaseSortBar';
 
 class LinkFunction extends BaseSortBar {
+    search: any;
+    $location: any;
+    scope: any;
+    repos: any;
+
     constructor(search, $location, sort, scope, elem) {
         super(scope, elem, sort);
         this.search = search;
diff --git a/scripts/apps/search/directives/MultiActionBar.js b/scripts/apps/search/directives/MultiActionBar.ts
similarity index 99%
rename from scripts/apps/search/directives/MultiActionBar.js
rename to scripts/apps/search/directives/MultiActionBar.ts
index 98632ca275..5e69706c78 100644
--- a/scripts/apps/search/directives/MultiActionBar.js
+++ b/scripts/apps/search/directives/MultiActionBar.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 MultiActionBar.$inject = ['asset', 'multi', 'authoringWorkspace', 'superdesk', 'keyboardManager'];
 export function MultiActionBar(asset, multi, authoringWorkspace, superdesk, keyboardManager) {
     return {
diff --git a/scripts/apps/search/directives/SearchFilters.js b/scripts/apps/search/directives/SearchFilters.ts
similarity index 98%
rename from scripts/apps/search/directives/SearchFilters.js
rename to scripts/apps/search/directives/SearchFilters.ts
index 898a53c13e..76ec5ffca6 100644
--- a/scripts/apps/search/directives/SearchFilters.js
+++ b/scripts/apps/search/directives/SearchFilters.ts
@@ -1,7 +1,15 @@
 import _ from 'lodash';
+import moment from 'moment';
 import {getDateFilters} from './DateFilters';
 
 class LinkFunction {
+    scope: any;
+    elem: any;
+    tags: any;
+    $location: any;
+    desks: any;
+    aggregationsMapper: any;
+
     constructor(desks, tags, $location, scope, elem, metadata) {
         this.scope = scope;
         this.elem = elem;
@@ -60,7 +68,6 @@ class LinkFunction {
         }
     }
 
-
     /**
      * @ngdoc method
      * @public
@@ -337,7 +344,6 @@ class LinkFunction {
     }
 }
 
-
 /**
  * @ngdoc directive
  * @module superdesk.apps.content-api
diff --git a/scripts/apps/search/directives/SearchPanel.js b/scripts/apps/search/directives/SearchPanel.ts
similarity index 98%
rename from scripts/apps/search/directives/SearchPanel.js
rename to scripts/apps/search/directives/SearchPanel.ts
index 98f5727b92..82f3100f7e 100644
--- a/scripts/apps/search/directives/SearchPanel.js
+++ b/scripts/apps/search/directives/SearchPanel.ts
@@ -1,4 +1,4 @@
-import {cloneDeep} from 'lodash';
+import _, {cloneDeep} from 'lodash';
 
 /**
  * @ngdoc directive
@@ -39,7 +39,7 @@ export function SearchPanel($location,
     metadata,
     $rootScope,
     session,
-    config
+    config,
 ) {
     desks.initialize();
     return {
diff --git a/scripts/apps/search/directives/SearchParameters.js b/scripts/apps/search/directives/SearchParameters.ts
similarity index 99%
rename from scripts/apps/search/directives/SearchParameters.js
rename to scripts/apps/search/directives/SearchParameters.ts
index 7a7bd11ca3..b3ddb5d512 100644
--- a/scripts/apps/search/directives/SearchParameters.js
+++ b/scripts/apps/search/directives/SearchParameters.ts
@@ -47,7 +47,7 @@ export function SearchParameters($location, asset, tags, metadata, common, desks
 
             const getSearchConfig = () => {
                 if (scope.isContentApi()) {
-                    let searchConfig = _.pick(metadata.search_config, ['slugline', 'headline',
+                    let searchConfig: any = _.pick(metadata.search_config, ['slugline', 'headline',
                         'byline', 'story_text']);
 
                     searchConfig.subscribers = 1;
@@ -64,7 +64,7 @@ export function SearchParameters($location, asset, tags, metadata, common, desks
              * init function to setup the directive initial state and called by $locationChangeSuccess event
              * @param {boolean} loadData.
              */
-            function init(loadData) {
+            function init(loadData?) {
                 var params = $location.search();
 
                 scope.query = params.q;
@@ -143,7 +143,6 @@ export function SearchParameters($location, asset, tags, metadata, common, desks
                     });
             }
 
-
             function fetchSubscribers() {
                 if (scope.repo.search !== 'content-api') {
                     return;
diff --git a/scripts/apps/search/directives/SearchResults.js b/scripts/apps/search/directives/SearchResults.ts
similarity index 96%
rename from scripts/apps/search/directives/SearchResults.js
rename to scripts/apps/search/directives/SearchResults.ts
index e970e1d10e..c152eba923 100644
--- a/scripts/apps/search/directives/SearchResults.js
+++ b/scripts/apps/search/directives/SearchResults.ts
@@ -52,7 +52,7 @@ export function SearchResults(
     $rootScope,
     config,
     superdeskFlags,
-    notify
+    notify,
 ) { // uff - should it use injector instead?
     var preferencesUpdate = {
         'archive:view': {
@@ -105,7 +105,6 @@ export function SearchResults(
             scope.$on('item:duplicate', queryItems);
             scope.$on('item:translate', queryItems);
 
-
             // used by superdesk-fi
             scope.showtags = attr.showtags !== 'false';
 
@@ -166,7 +165,7 @@ export function SearchResults(
             /**
              * Schedule an update if it's not there yet
              */
-            function queryItems(event, data) {
+            function queryItems(event?, data?) {
                 if (!nextUpdate) {
                     if (scope.search.repo.search !== 'local' && !getSearch().q && !(data && data.force)) {
                         return; // ignore updates with external content
@@ -185,7 +184,7 @@ export function SearchResults(
             /**
              * Function for fetching total items and filling scope for the first time.
              */
-            function _queryItems(event, data) {
+            function _queryItems(event?, data?) {
                 criteria = search.query(getSearch()).getCriteria(true);
                 criteria.source.size = 50;
                 var originalQuery;
@@ -309,14 +308,14 @@ export function SearchResults(
             /*
              * Function to get the search endpoint name based on the criteria
              *
-             * @param {Object} criteria
+             * @param {Object} _criteria
              * @returns {string}
              */
-            function getProvider(criteria) {
+            function getProvider(_criteria) {
                 var provider = 'search';
 
-                if (criteria.repo && criteria.repo.indexOf(',') === -1) {
-                    provider = criteria.repo;
+                if (_criteria.repo && _criteria.repo.indexOf(',') === -1) {
+                    provider = _criteria.repo;
                 }
 
                 if (scope.search.repo.search && scope.search.repo.search !== 'local') {
@@ -324,7 +323,7 @@ export function SearchResults(
                 }
 
                 if (isObjectId(provider)) {
-                    criteria.repo = provider;
+                    _criteria.repo = provider;
                     provider = 'search_providers_proxy';
                 }
 
@@ -340,7 +339,7 @@ export function SearchResults(
              *
              * @param {items}
              */
-            function render(items, next, force) {
+            function render(items, next, force?) {
                 scope.loading = true;
                 if (items) {
                     setScopeItems(items, force);
@@ -380,9 +379,9 @@ export function SearchResults(
                     oldQuery = query;
                 }
 
-                function setScopeItems(items, force) {
-                    scope.items = search.mergeItems(items, scope.items, next, force);
-                    scope.total_records = items._meta.total;
+                function setScopeItems(_items, _force) {
+                    scope.items = search.mergeItems(_items, scope.items, next, _force);
+                    scope.total_records = _items._meta.total;
                     scope.loading = false;
                 }
             }
@@ -438,7 +437,7 @@ export function SearchResults(
              * @description If singLine:view preference is set, an item is being previewed, config has narrowView list
              * then, sends rowview event
              */
-            function sendRowViewEvents(item) {
+            function sendRowViewEvents(item?) {
                 let sendEvent = scope.singleLine && superdeskFlags.flags.authoring && config.list
                     && config.list.narrowView;
                 let evnt = item ? 'rowview:narrow' : 'rowview:default';
diff --git a/scripts/apps/search/directives/SearchTags.js b/scripts/apps/search/directives/SearchTags.ts
similarity index 99%
rename from scripts/apps/search/directives/SearchTags.js
rename to scripts/apps/search/directives/SearchTags.ts
index e101edc840..4436e8babf 100644
--- a/scripts/apps/search/directives/SearchTags.js
+++ b/scripts/apps/search/directives/SearchTags.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {PARAMETERS} from 'apps/search/constants';
 
 /**
diff --git a/scripts/apps/search/helpers.ts b/scripts/apps/search/helpers.ts
index 2e4c073090..6f4b26a359 100644
--- a/scripts/apps/search/helpers.ts
+++ b/scripts/apps/search/helpers.ts
@@ -73,7 +73,7 @@ export function openActionsMenu(elem, target, itemId) {
 export function renderToBody(elem, target, zIndex = 1000) {
     // first render it somewhere not visible
     menuHolderElem().style.zIndex = '-1';
-    var node = ReactDOM.findDOMNode(ReactDOM.render(elem, menuHolderElem()));
+    var node = ReactDOM.findDOMNode(ReactDOM.render(elem, menuHolderElem())) as HTMLElement;
     // make sure it's rendered
 
     node.style.display = 'block';
diff --git a/scripts/apps/search/services/SavedSearchService.js b/scripts/apps/search/services/SavedSearchService.ts
similarity index 98%
rename from scripts/apps/search/services/SavedSearchService.js
rename to scripts/apps/search/services/SavedSearchService.ts
index edad8d5f52..c85c6fa3d2 100644
--- a/scripts/apps/search/services/SavedSearchService.js
+++ b/scripts/apps/search/services/SavedSearchService.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 SavedSearchService.$inject = ['api', '$filter', '$q', '$rootScope'];
 
 export function SavedSearchService(api, $filter, $q, $rootScope) {
diff --git a/scripts/apps/search/services/SearchService.js b/scripts/apps/search/services/SearchService.ts
similarity index 92%
rename from scripts/apps/search/services/SearchService.js
rename to scripts/apps/search/services/SearchService.ts
index 235019ca02..44d8a75d91 100644
--- a/scripts/apps/search/services/SearchService.js
+++ b/scripts/apps/search/services/SearchService.ts
@@ -210,7 +210,7 @@ export function SearchService($location, config, session, multi,
             }
             var elementName = queryArrayElement.substring(
                 queryArrayElement.lastIndexOf('(') + 1,
-                queryArrayElement.lastIndexOf(')')
+                queryArrayElement.lastIndexOf(')'),
             );
 
             for (var j = 0, codeListLength = codeList.length; j < codeListLength; j++) {
@@ -269,7 +269,7 @@ export function SearchService($location, config, session, multi,
         var size,
             filters = [],
             postFilters = [],
-            params = {},
+            params: any = {},
             zeroHourSuffix = 'T00:00:00',
             midnightSuffix = 'T23:59:59';
 
@@ -285,46 +285,46 @@ export function SearchService($location, config, session, multi,
             });
         }
 
-        function buildGeneralFilters(params, query) {
-            if (params.urgency) {
-                query.post_filter({terms: {urgency: JSON.parse(params.urgency)}});
+        function buildGeneralFilters(paramsObject, query) {
+            if (paramsObject.urgency) {
+                query.post_filter({terms: {urgency: JSON.parse(paramsObject.urgency)}});
             }
 
-            if (params.priority) {
-                query.post_filter({terms: {priority: JSON.parse(params.priority)}});
+            if (paramsObject.priority) {
+                query.post_filter({terms: {priority: JSON.parse(paramsObject.priority)}});
             }
 
-            if (params.source) {
-                query.post_filter({terms: {source: JSON.parse(params.source)}});
+            if (paramsObject.source) {
+                query.post_filter({terms: {source: JSON.parse(paramsObject.source)}});
             }
 
             // used by aap multimedia datalayer
-            if (params.creditqcode) {
-                query.post_filter({terms: {credit: _.map(JSON.parse(params.creditqcode), 'value')}});
+            if (paramsObject.creditqcode) {
+                query.post_filter({terms: {credit: _.map(JSON.parse(paramsObject.creditqcode), 'value')}});
             }
 
-            if (params.category) {
-                query.post_filter({terms: {'anpa_category.name': JSON.parse(params.category)}});
+            if (paramsObject.category) {
+                query.post_filter({terms: {'anpa_category.name': JSON.parse(paramsObject.category)}});
             }
 
-            if (params.genre) {
-                query.post_filter({terms: {'genre.name': JSON.parse(params.genre)}});
+            if (paramsObject.genre) {
+                query.post_filter({terms: {'genre.name': JSON.parse(paramsObject.genre)}});
             }
 
-            if (params.desk) {
-                query.post_filter({terms: {'task.desk': JSON.parse(params.desk)}});
+            if (paramsObject.desk) {
+                query.post_filter({terms: {'task.desk': JSON.parse(paramsObject.desk)}});
             }
 
-            if (params.legal) {
-                query.post_filter({terms: {'flags.marked_for_legal': JSON.parse(params.legal)}});
+            if (paramsObject.legal) {
+                query.post_filter({terms: {'flags.marked_for_legal': JSON.parse(paramsObject.legal)}});
             }
 
-            if (params.sms) {
-                query.post_filter({terms: {'flags.marked_for_sms': JSON.parse(params.sms)}});
+            if (paramsObject.sms) {
+                query.post_filter({terms: {'flags.marked_for_sms': JSON.parse(paramsObject.sms)}});
             }
 
-            if (params.language) {
-                query.post_filter({terms: {language: JSON.parse(params.language)}});
+            if (paramsObject.language) {
+                query.post_filter({terms: {language: JSON.parse(paramsObject.language)}});
             }
         }
 
@@ -333,13 +333,15 @@ export function SearchService($location, config, session, multi,
           * @param {String} params - search parameters
           * @param {Object} query - Query object
           */
-        function buildFilters(params, query) {
+        function buildFilters(paramsObject: any, query) {
             // date filters start
             var facetrange = {};
 
             // inject custom date field filters { fieldname: 'string(IDateRange)' }
-            if (typeof params.customFields !== 'undefined') {
-                for (let [fieldname, range] of Object.entries(params.customFields)) {
+            if (typeof paramsObject.customFields !== 'undefined') {
+                for (let fieldname of paramsObject.customFields) {
+                    let range = paramsObject.customFields[fieldname];
+
                     if (typeof dateRangesByKey[range] !== 'undefined') {
                         facetrange[fieldname] = dateRangesByKey[range].elasticSearchDateRange;
                     }
@@ -347,25 +349,25 @@ export function SearchService($location, config, session, multi,
             }
 
             getDateFilters().forEach(({fieldname}) => {
-                const dateRangeKey = params[fieldname];
+                const dateRangeKey = paramsObject[fieldname];
 
-                if (params[fieldname] != null && dateRangesByKey[dateRangeKey] != null) {
+                if (paramsObject[fieldname] != null && dateRangesByKey[dateRangeKey] != null) {
                     // handle predefined ranges
                     facetrange[fieldname] = dateRangesByKey[dateRangeKey].elasticSearchDateRange;
                 } else {
                     // handle manual ranges
 
-                    if (params[fieldname + 'to'] != null) {
+                    if (paramsObject[fieldname + 'to'] != null) {
                         if (facetrange[fieldname] == null) {
                             facetrange[fieldname] = {};
                         }
-                        facetrange[fieldname].lte = formatDate(params[fieldname + 'to'], midnightSuffix);
+                        facetrange[fieldname].lte = formatDate(paramsObject[fieldname + 'to'], midnightSuffix);
                     }
-                    if (params[fieldname + 'from'] != null) {
+                    if (paramsObject[fieldname + 'from'] != null) {
                         if (facetrange[fieldname] == null) {
                             facetrange[fieldname] = {};
                         }
-                        facetrange[fieldname].gte = formatDate(params[fieldname + 'from'], zeroHourSuffix);
+                        facetrange[fieldname].gte = formatDate(paramsObject[fieldname + 'from'], zeroHourSuffix);
                     }
                 }
             });
@@ -375,15 +377,15 @@ export function SearchService($location, config, session, multi,
             }
             // date filters end
 
-            if (params.type) {
+            if (paramsObject.type) {
                 var type = {
-                    type: JSON.parse(params.type),
+                    type: JSON.parse(paramsObject.type),
                 };
 
                 query.post_filter({terms: type});
             }
 
-            buildGeneralFilters(params, query);
+            buildGeneralFilters(paramsObject, query);
         }
 
         /**
@@ -394,7 +396,7 @@ export function SearchService($location, config, session, multi,
             let sort = sortService.getSort(sortOptions);
 
             setParameters(filters, params);
-            let criteria = {
+            let criteria: any = {
                 query: {filtered: {filter: {and: filters}}},
                 sort: [_.zipObject([sort.field], [sort.dir])],
             };
@@ -641,7 +643,7 @@ export function SearchService($location, config, session, multi,
         // if fetched items are new or removed then update current scope.items
         // by adding or removing items found in diffToAdd or diffToMinus respectively.
         if (!_.isEmpty(diffToMinus)) {
-            _.remove(scopeItems._items, (item) => _.includes(diffToMinus, item._id));
+            _.remove(scopeItems._items, (item: any) => _.includes(diffToMinus, item._id));
         }
 
         if (!_.isEmpty(diffToAdd)) {
@@ -758,9 +760,9 @@ export function SearchService($location, config, session, multi,
      */
     this.getProjectedFields = function() {
         var uiConfig = config.list || DEFAULT_LIST_CONFIG;
-        var uiFields = _.union(uiConfig.priority, uiConfig.firstLine, uiConfig.secondLine);
+        var uiFields: any = _.union(uiConfig.priority, uiConfig.firstLine, uiConfig.secondLine);
 
-        let projectedFields = [];
+        let projectedFields: any = [];
 
         uiFields.forEach((uiField) => {
             if (uiField in UI_PROJECTED_FIELD_MAPPINGS) {
diff --git a/scripts/apps/search/services/SortService.js b/scripts/apps/search/services/SortService.ts
similarity index 95%
rename from scripts/apps/search/services/SortService.js
rename to scripts/apps/search/services/SortService.ts
index 99e24ed266..b91fc25a2b 100644
--- a/scripts/apps/search/services/SortService.js
+++ b/scripts/apps/search/services/SortService.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 /**
  * @ngdoc service
  * @module superdesk.apps.content-api
@@ -6,6 +8,8 @@
  * @description Parses the $location for sort parameter and set sort parameter
  */
 export class SortService {
+    $location: any;
+
     constructor($location) {
         this.$location = $location;
     }
@@ -41,7 +45,7 @@ export class SortService {
      * @param {object} sortOptions Sort options for the different repo.
      */
     setSort(field, sortOptions) {
-        let option = _.find(sortOptions, {field: field});
+        let option: any = _.find(sortOptions, {field: field});
 
         this.setSortUrlParam(option.field, option.defaultDir || 'desc');
     }
diff --git a/scripts/apps/search/services/TagService.js b/scripts/apps/search/services/TagService.ts
similarity index 97%
rename from scripts/apps/search/services/TagService.js
rename to scripts/apps/search/services/TagService.ts
index a00d3b6267..6eb73a2d59 100644
--- a/scripts/apps/search/services/TagService.js
+++ b/scripts/apps/search/services/TagService.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {PARAMETERS, EXCLUDE_FACETS} from 'apps/search/constants';
 import {getDateFilters, dateRangesByKey} from '../directives/DateFilters';
 import {gettext} from 'core/utils';
@@ -22,7 +23,7 @@ TagService.$inject = ['$location', 'desks', 'userList', 'metadata', 'search',
     'ingestSources', 'subscribersService', '$q'];
 export function TagService($location, desks, userList, metadata, search,
     ingestSources, subscribersService, $q) {
-    var tags = {};
+    var tags: any = {};
 
     tags.selectedFacets = {};
     tags.selectedParameters = [];
@@ -46,7 +47,7 @@ export function TagService($location, desks, userList, metadata, search,
 
     var cvs = search.cvs;
 
-    function tag(label, value) {
+    function tag(label, value?) {
         return {
             label: label,
             value: value || label,
@@ -233,16 +234,16 @@ export function TagService($location, desks, userList, metadata, search,
      */
     function removeFacet(type, key) {
         const dateFilter = getDateFilters().find(
-            ({labelBlock, labelFrom, labelTo}) => [labelBlock, labelFrom, labelTo].includes(type)
+            ({labelBlock, labelFrom, labelTo}) => [labelBlock, labelFrom, labelTo].includes(type),
         );
 
         if (dateFilter != null) {
             removeDateFacet(type, dateFilter);
         } else {
-            var search = $location.search();
+            var _search = $location.search();
 
-            if (search[type]) {
-                var keys = JSON.parse(search[type]);
+            if (_search[type]) {
+                var keys = JSON.parse(_search[type]);
 
                 keys.splice(keys.indexOf(key), 1);
                 if (keys.length > 0) {
@@ -349,7 +350,7 @@ export function TagService($location, desks, userList, metadata, search,
                     tags.selectedFacets.credit = JSON.parse(type);
                 } else {
                     const dateFilter = dateFilters.find(
-                        ({fieldname}) => key === fieldname + 'from' || key === fieldname + 'to'
+                        ({fieldname}) => key === fieldname + 'from' || key === fieldname + 'to',
                     );
 
                     if (dateFilter != null) {
diff --git a/scripts/apps/search/tests/search.spec.js b/scripts/apps/search/tests/search.spec.ts
similarity index 98%
rename from scripts/apps/search/tests/search.spec.js
rename to scripts/apps/search/tests/search.spec.ts
index c535c6509f..548f13112f 100644
--- a/scripts/apps/search/tests/search.spec.js
+++ b/scripts/apps/search/tests/search.spec.ts
@@ -287,7 +287,7 @@ describe('sdSearchPanel directive', () => {
         'superdesk.apps.search',
         'superdesk.core.services.pageTitle',
         'superdesk.templates-cache',
-        'superdesk.apps.searchProviders'
+        'superdesk.apps.searchProviders',
     ));
 
     /**
@@ -332,7 +332,7 @@ describe('sdSearchPanel directive', () => {
      * Mock even more dependencies and compile the directive under test.
      */
     beforeEach(inject((
-        $templateCache, $compile, $rootScope, $q, _desks_, tags, search
+        $templateCache, $compile, $rootScope, $q, _desks_, tags, search,
     ) => {
         var html,
             scope;
@@ -347,7 +347,7 @@ describe('sdSearchPanel directive', () => {
         spyOn(tags, 'initSelectedFacets').and.returnValue(facetsInit.promise);
 
         fakeApi.ingestProviders.query.and.returnValue(
-            $q.when({_items: [{foo: 'bar'}]})
+            $q.when({_items: [{foo: 'bar'}]}),
         );
 
         // directive compilation...
@@ -421,7 +421,7 @@ describe('sdSearchPanel directive', () => {
 
             expect(console.warn).toHaveBeenCalledWith(
                 'Desk (key: abc123) not found in deskLookup, ' +
-                'probable storage inconsistency.'
+                'probable storage inconsistency.',
             );
         });
     });
@@ -433,9 +433,8 @@ describe('sort service', () => {
         {field: 'urgency', label: gettext('Urgency')},
     ];
 
-
     beforeEach(window.module(
-        'superdesk.apps.search'
+        'superdesk.apps.search',
     ));
 
     it('can sort items', inject((sort, $location, $rootScope) => {
diff --git a/scripts/apps/settings/directives/RoleUnique.js b/scripts/apps/settings/directives/RoleUnique.ts
similarity index 94%
rename from scripts/apps/settings/directives/RoleUnique.js
rename to scripts/apps/settings/directives/RoleUnique.ts
index f0bf2ca88e..ef06f9bcbb 100644
--- a/scripts/apps/settings/directives/RoleUnique.js
+++ b/scripts/apps/settings/directives/RoleUnique.ts
@@ -12,7 +12,7 @@ export function RoleUnique(api, $q) {
                 var value = modelValue || viewValue;
 
                 if (value) {
-                    var criteria = {where: {name: value}};
+                    var criteria: any = {where: {name: value}};
 
                     if (!_.isNil(scope.editRole) && !_.isNil(scope.editRole._id)) {
                         criteria.where._id = {$ne: scope.editRole._id};
diff --git a/scripts/apps/stream/controllers/StreamController.js b/scripts/apps/stream/controllers/StreamController.ts
similarity index 89%
rename from scripts/apps/stream/controllers/StreamController.js
rename to scripts/apps/stream/controllers/StreamController.ts
index 81fc06845b..9cad5204b3 100644
--- a/scripts/apps/stream/controllers/StreamController.js
+++ b/scripts/apps/stream/controllers/StreamController.ts
@@ -20,13 +20,13 @@ export function StreamController($scope, api, $rootScope, desks) {
         }
         var previousDate = new Date($scope.activities._items[activity.index - 1]._created);
 
-        return previousDate.getYear() !== $scope.currentDate.getYear() ||
+        return previousDate.getFullYear() !== $scope.currentDate.getFullYear() ||
                previousDate.getMonth() !== $scope.currentDate.getMonth() ||
                previousDate.getDate() !== $scope.currentDate.getDate();
     };
 
     var fetchActivities = function() {
-        var filter = {max_results: $scope.max_results};
+        var filter: any = {max_results: $scope.max_results};
 
         if ($scope.desk) {
             filter.where = {desk: $scope.desk._id};
diff --git a/scripts/apps/templates/directives/TemplateEditorModal.js b/scripts/apps/templates/directives/TemplateEditorModal.ts
similarity index 98%
rename from scripts/apps/templates/directives/TemplateEditorModal.js
rename to scripts/apps/templates/directives/TemplateEditorModal.ts
index abd1bf6d9a..aa3daa73ef 100644
--- a/scripts/apps/templates/directives/TemplateEditorModal.js
+++ b/scripts/apps/templates/directives/TemplateEditorModal.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export function TemplateEditorModal() {
     return {
         templateUrl: 'scripts/apps/templates/views/template-editor-modal.html',
diff --git a/scripts/apps/templates/directives/TemplatesDirective.js b/scripts/apps/templates/directives/TemplatesDirective.ts
similarity index 96%
rename from scripts/apps/templates/directives/TemplatesDirective.js
rename to scripts/apps/templates/directives/TemplatesDirective.ts
index 348f81b54e..04f5cf4c72 100644
--- a/scripts/apps/templates/directives/TemplatesDirective.js
+++ b/scripts/apps/templates/directives/TemplatesDirective.ts
@@ -20,7 +20,7 @@ export function TemplatesDirective(notify, api, templates, modal, desks, weekday
                     (result) => {
                         result._items = $filter('sortByName')(result._items, 'template_name');
                         $scope.content_templates = result;
-                    }
+                    },
                 );
             }
 
@@ -220,7 +220,7 @@ export function TemplatesDirective(notify, api, templates, modal, desks, weekday
                             },
                             (response) => {
                                 notifySaveError(response, notify);
-                            }
+                            },
                         )
                         .then(fetchTemplates);
                 }
@@ -241,7 +241,7 @@ export function TemplatesDirective(notify, api, templates, modal, desks, weekday
 
             $scope.addCronTime = function() {
                 if ($scope.new_time && $scope.new_time.picked && _.findIndex($scope.cron_times,
-                    (t) => t == $scope.new_time.picked.substring(0, 5)) == -1) {
+                    (t) => t.toString() === $scope.new_time.picked.substring(0, 5)) === -1) {
                     $scope.cron_times.push($scope.new_time.picked.substring(0, 5));
                     $scope.cron_times = _.sortBy($scope.cron_times);
                     $scope.new_time = {picked: null};
@@ -300,7 +300,7 @@ export function TemplatesDirective(notify, api, templates, modal, desks, weekday
                 }
             });
 
-            function setupContentType(type) {
+            function setupContentType(type?) {
                 if (type) {
                     $scope.schema = content.schema(type, $scope.item.type);
                     $scope.editor = content.editor(type, $scope.item.type);
@@ -308,15 +308,15 @@ export function TemplatesDirective(notify, api, templates, modal, desks, weekday
             }
 
             $scope.remove = function(template) {
-                const desks = _.filter($scope.desks._items, (desk) =>
+                const _desks = _.filter($scope.desks._items, (desk) =>
                     desk.default_content_template === template._id);
 
-                const deskNames = desks.map((desk) => desk.name).join(', ');
+                const deskNames = _desks.map((desk) => desk.name).join(', ');
 
                 if (deskNames) {
                     return notify.error(
                         gettext('This is a default template of the following desk(s): {{deskNames}}.', {deskNames}) +
-                        ' ' + gettext('Please change the default templates first.')
+                        ' ' + gettext('Please change the default templates first.'),
                     );
                 }
 
@@ -369,9 +369,9 @@ export function TemplatesDirective(notify, api, templates, modal, desks, weekday
 
             // fetch all desks for the current user and add them to
             // the list of filters.
-            desks.fetchDesks().then((desks) => {
+            desks.fetchDesks().then((_desks) => {
                 $scope.filters = $scope.filters.concat(
-                    desks._items.map((d) => ({label: d.name, value: d._id}))
+                    _desks._items.map((d) => ({label: d.name, value: d._id})),
                 );
             });
 
diff --git a/scripts/apps/templates/filters/index.js b/scripts/apps/templates/filters/index.ts
similarity index 98%
rename from scripts/apps/templates/filters/index.js
rename to scripts/apps/templates/filters/index.ts
index 7722dfd684..ef6c364eac 100644
--- a/scripts/apps/templates/filters/index.js
+++ b/scripts/apps/templates/filters/index.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 /**
  * @ngdoc filter
  * @module superdesk.apps.templates
diff --git a/scripts/apps/templates/services/TemplatesService.js b/scripts/apps/templates/services/TemplatesService.ts
similarity index 93%
rename from scripts/apps/templates/services/TemplatesService.js
rename to scripts/apps/templates/services/TemplatesService.ts
index ba4366665c..3fb214b613 100644
--- a/scripts/apps/templates/services/TemplatesService.js
+++ b/scripts/apps/templates/services/TemplatesService.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 TemplatesService.$inject = ['api', 'session', '$q', 'preferencesService', 'privileges', 'desks'];
@@ -73,13 +74,13 @@ export function TemplatesService(api, session, $q, preferencesService, privilege
      * Used in template management screen.
      */
     this.fetchAllTemplates = function(page, pageSize, type, templateName) {
-        var params = {
+        var params: any = {
             page: page || 1,
             max_results: pageSize || PAGE_SIZE,
             sort: 'template_name',
         };
 
-        var criteria = {};
+        var criteria: any = {};
         // in template management only see the templates that are create by the user
 
         criteria.$or = [{user: session.identity._id}];
@@ -98,10 +99,10 @@ export function TemplatesService(api, session, $q, preferencesService, privilege
         } else if (self.isAdmin()) {
             var _criteria = criteria;
 
-            criteria = desks.fetchCurrentUserDesks().then((desks) => {
+            criteria = desks.fetchCurrentUserDesks().then((_desks) => {
                 _criteria.$or.push({
                     is_public: true,
-                    template_desks: {$in: desks.map((desk) => desk._id)},
+                    template_desks: {$in: _desks.map((desk) => desk._id)},
                 });
 
                 return _criteria;
@@ -109,22 +110,22 @@ export function TemplatesService(api, session, $q, preferencesService, privilege
         }
 
         return $q.when(criteria)
-            .then((criteria) => {
+            .then((criteriaReady) => {
                 params.where = JSON.stringify({
-                    $and: [criteria],
+                    $and: [criteriaReady],
                 });
                 return params;
             })
-            .then((params) => api.query('content_templates', params));
+            .then((_params) => api.query('content_templates', _params));
     };
 
     this.fetchTemplatesByDesk = function(desk) {
-        let params = {
+        let params: any = {
             sort: 'template_name',
             max_results: 200,
         };
 
-        let deskCriteria = [
+        let deskCriteria: any = [
             {is_public: true},
         ];
 
@@ -144,19 +145,19 @@ export function TemplatesService(api, session, $q, preferencesService, privilege
     };
 
     this.fetchTemplatesByUserDesk = function(user, desk, page, pageSize, type, templateName) {
-        var params = {
+        var params: any = {
             page: page || 1,
             max_results: pageSize || PAGE_SIZE,
             sort: 'template_name',
         };
 
-        var criteria = {};
+        var criteria: any = {};
 
         if (!user) {
             return $q.when();
         }
 
-        var deskCriteria = [
+        var deskCriteria: any = [
             {template_desks: {$exists: false}, is_public: true},
             {template_desks: [], is_public: true},
         ];
diff --git a/scripts/apps/translations/directives/TranslationDropdown.js b/scripts/apps/translations/directives/TranslationDropdown.ts
similarity index 97%
rename from scripts/apps/translations/directives/TranslationDropdown.js
rename to scripts/apps/translations/directives/TranslationDropdown.ts
index 007be3e217..13c82d8d3e 100644
--- a/scripts/apps/translations/directives/TranslationDropdown.js
+++ b/scripts/apps/translations/directives/TranslationDropdown.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 /**
  * @ngdoc directive
  * @module superdesk.apps.translations
diff --git a/scripts/apps/translations/directives/TranslationReactDropdown.js b/scripts/apps/translations/directives/TranslationReactDropdown.ts
similarity index 84%
rename from scripts/apps/translations/directives/TranslationReactDropdown.js
rename to scripts/apps/translations/directives/TranslationReactDropdown.ts
index f7b5c8f756..112d81e1a4 100644
--- a/scripts/apps/translations/directives/TranslationReactDropdown.js
+++ b/scripts/apps/translations/directives/TranslationReactDropdown.ts
@@ -1,6 +1,5 @@
 /* eslint-disable react/no-multi-comp */
 import React from 'react';
-import PropTypes from 'prop-types';
 
 /**
  * @ngdoc directive
@@ -21,11 +20,16 @@ TranslationReactDropdown.$inject = ['item', 'className', 'TranslationService', '
 export function TranslationReactDropdown(item, className, TranslationService, noLanguagesLabel) {
     var languages = TranslationService.get() || {_items: []};
 
+    interface ITranslateBtnProps {
+        item: any;
+        language: any;
+    }
+
     /*
      * Creates specific language button in list
      * @return {React} Language button
      */
-    class TranslateBtn extends React.Component {
+    class TranslateBtn extends React.Component<ITranslateBtnProps> {
         constructor(props) {
             super(props);
             this.markTranslate = this.markTranslate.bind(this);
@@ -37,9 +41,9 @@ export function TranslationReactDropdown(item, className, TranslationService, no
         }
 
         render() {
-            var item = this.props.item;
+            var _item = this.props.item;
             var language = this.props.language;
-            var isCurrentLang = item.language === language.language;
+            var isCurrentLang = _item.language === language.language;
 
             if (!language.destination) {
                 return false;
@@ -50,16 +54,11 @@ export function TranslationReactDropdown(item, className, TranslationService, no
                     disabled: isCurrentLang,
                     onClick: this.markTranslate,
                 },
-                language.label
+                language.label,
             );
         }
     }
 
-    TranslateBtn.propTypes = {
-        item: PropTypes.object,
-        language: PropTypes.object,
-    };
-
     /*
      * Creates list element for specific language
      * @return {React} Single list element
@@ -68,7 +67,7 @@ export function TranslationReactDropdown(item, className, TranslationService, no
         return React.createElement(
             'li',
             {key: 'language-' + language._id},
-            React.createElement(TranslateBtn, {item: item, language: language})
+            React.createElement(TranslateBtn, {item: item, language: language}),
         );
     };
 
@@ -83,7 +82,7 @@ export function TranslationReactDropdown(item, className, TranslationService, no
             React.createElement(
                 'button',
                 {disabled: true},
-                noLanguagesLabel)
+                noLanguagesLabel),
         );
     };
 
@@ -94,6 +93,6 @@ export function TranslationReactDropdown(item, className, TranslationService, no
     return React.createElement(
         'ul',
         {className: className},
-        languages._items.length ? languages._items.map(createTranslateItem) : React.createElement(noLanguage)
+        languages._items.length ? languages._items.map(createTranslateItem) : React.createElement(noLanguage),
     );
 }
diff --git a/scripts/apps/translations/services/TranslationService.js b/scripts/apps/translations/services/TranslationService.ts
similarity index 95%
rename from scripts/apps/translations/services/TranslationService.js
rename to scripts/apps/translations/services/TranslationService.ts
index 7bc7205248..21a2d09437 100644
--- a/scripts/apps/translations/services/TranslationService.js
+++ b/scripts/apps/translations/services/TranslationService.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 /**
@@ -15,7 +16,7 @@ import {gettext} from 'core/utils';
 
 TranslationService.$inject = ['api', '$rootScope', 'notify', 'authoringWorkspace', 'desks', 'search'];
 export function TranslationService(api, $rootScope, notify, authoringWorkspace, desks, search) {
-    var service = {};
+    var service: any = {};
 
     /**
      * @ngdoc method
@@ -54,8 +55,8 @@ export function TranslationService(api, $rootScope, notify, authoringWorkspace,
             desk: desks.getCurrentDeskId(),
         };
 
-        api.save('translate', params).then((item) => {
-            authoringWorkspace.open(item);
+        api.save('translate', params).then((_item) => {
+            authoringWorkspace.open(_item);
             $rootScope.$broadcast('item:translate');
             notify.success(gettext('Item Translated'));
         });
diff --git a/scripts/apps/users/controllers/ChangeAvatarController.js b/scripts/apps/users/controllers/ChangeAvatarController.ts
similarity index 96%
rename from scripts/apps/users/controllers/ChangeAvatarController.js
rename to scripts/apps/users/controllers/ChangeAvatarController.ts
index 3288457638..b8b7c5d1dc 100644
--- a/scripts/apps/users/controllers/ChangeAvatarController.js
+++ b/scripts/apps/users/controllers/ChangeAvatarController.ts
@@ -8,8 +8,8 @@ export function ChangeAvatarController($scope, upload, session, urls, beta, noti
         {id: 'globe', label: gettext('Use a Web URL')},
     ];
 
-    beta.isBeta().then((beta) => {
-        if (!beta) {
+    beta.isBeta().then((isBeta) => {
+        if (!isBeta) {
             $scope.methods = _.reject($scope.methods, {beta: true});
         }
     });
@@ -27,7 +27,7 @@ export function ChangeAvatarController($scope, upload, session, urls, beta, noti
     };
 
     $scope.upload = function(config) {
-        var form = {};
+        var form: any = {};
 
         form.CropLeft = Math.round(Math.min(config.cords.x, config.cords.x2));
         form.CropRight = Math.round(Math.max(config.cords.x, config.cords.x2));
diff --git a/scripts/apps/users/controllers/UserListController.js b/scripts/apps/users/controllers/UserListController.ts
similarity index 98%
rename from scripts/apps/users/controllers/UserListController.js
rename to scripts/apps/users/controllers/UserListController.ts
index d55108fd31..56fc309b23 100644
--- a/scripts/apps/users/controllers/UserListController.js
+++ b/scripts/apps/users/controllers/UserListController.ts
@@ -57,7 +57,7 @@ export function UserListController($scope, $location, api, _, session, usersServ
 
     function getCriteria() {
         var params = $location.search(),
-            criteria = {
+            criteria: any = {
                 max_results: Number(params.max_results) || DEFAULT_SIZE,
             };
 
@@ -77,7 +77,7 @@ export function UserListController($scope, $location, api, _, session, usersServ
     }
 
     function initCriteria(search, filter) {
-        const query = {};
+        const query: any = {};
         const canSeeSupportUsers = usersService.isSupport(session.identity);
 
         if (!canSeeSupportUsers) {
diff --git a/scripts/apps/users/directives/RolesPrivilegesDirective.js b/scripts/apps/users/directives/RolesPrivilegesDirective.ts
similarity index 98%
rename from scripts/apps/users/directives/RolesPrivilegesDirective.js
rename to scripts/apps/users/directives/RolesPrivilegesDirective.ts
index ab2e3f66b1..e6c273ff93 100644
--- a/scripts/apps/users/directives/RolesPrivilegesDirective.js
+++ b/scripts/apps/users/directives/RolesPrivilegesDirective.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import handleError from '../helpers';
 import {gettext} from 'core/utils';
 
diff --git a/scripts/apps/users/directives/UserListDirective.js b/scripts/apps/users/directives/UserListDirective.ts
similarity index 95%
rename from scripts/apps/users/directives/UserListDirective.js
rename to scripts/apps/users/directives/UserListDirective.ts
index 146e41fe21..2ef517a356 100644
--- a/scripts/apps/users/directives/UserListDirective.js
+++ b/scripts/apps/users/directives/UserListDirective.ts
@@ -64,7 +64,7 @@ export function UserListDirective(keyboardManager, usersService, asset, session)
 
             function getSelectedIndex() {
                 if (!_.isEmpty(scope.selected)) {
-                    return _.findIndex(scope.users, (user) => user._id === scope.selected._id);
+                    return _.findIndex(scope.users, (user: any) => user._id === scope.selected._id);
                 }
             }
         },
diff --git a/scripts/apps/users/directives/UserMentioDirective.js b/scripts/apps/users/directives/UserMentioDirective.ts
similarity index 98%
rename from scripts/apps/users/directives/UserMentioDirective.js
rename to scripts/apps/users/directives/UserMentioDirective.ts
index 4ca268e9cc..859d973de3 100644
--- a/scripts/apps/users/directives/UserMentioDirective.js
+++ b/scripts/apps/users/directives/UserMentioDirective.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 UserMentioDirective.$inject = ['userList', 'desks', 'asset', '$q'];
 export function UserMentioDirective(userList, desks, asset, $q) {
     return {
@@ -94,7 +96,7 @@ export function UserMentioDirective(userList, desks, asset, $q) {
                     if (newValue.hasClass('active')) {
                         $('.mentio-menu').scrollTop(newValue.position().top);
                     }
-                }
+                },
             );
         },
     };
diff --git a/scripts/apps/users/directives/UserPreferencesDirective.ts b/scripts/apps/users/directives/UserPreferencesDirective.ts
index 9bd2e2c567..0c9cda749c 100644
--- a/scripts/apps/users/directives/UserPreferencesDirective.ts
+++ b/scripts/apps/users/directives/UserPreferencesDirective.ts
@@ -1,3 +1,5 @@
+/* eslint-disable max-len */
+/* tslint:disable:max-line-length */
 import {gettext} from 'core/utils';
 
 /**
@@ -333,7 +335,6 @@ export function UserPreferencesDirective(
                     return $q.when();
                 }
 
-                // tslint:disable-next-line
                 msg = gettext('No preferred categories selected. Should you choose to proceed with your choice. A default set of categories will be selected for you.');
 
                 modalResult = modal.confirm(msg).then(() => {
diff --git a/scripts/apps/users/directives/UserPrivilegesDirective.js b/scripts/apps/users/directives/UserPrivilegesDirective.ts
similarity index 97%
rename from scripts/apps/users/directives/UserPrivilegesDirective.js
rename to scripts/apps/users/directives/UserPrivilegesDirective.ts
index 94e878a7d6..82822b033e 100644
--- a/scripts/apps/users/directives/UserPrivilegesDirective.js
+++ b/scripts/apps/users/directives/UserPrivilegesDirective.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import handleError from '../helpers';
 import {gettext} from 'core/utils';
 
@@ -67,7 +68,7 @@ export function UserPrivilegesDirective(api, notify, userList, $q) {
                 api.save(
                     'users',
                     scope.user,
-                    _.pick(scope.user, 'privileges')
+                    _.pick(scope.user, 'privileges'),
                 )
                     .then(() => {
                         scope.origPrivileges = angular.copy(
diff --git a/scripts/apps/users/import/import.js b/scripts/apps/users/import/import.ts
similarity index 93%
rename from scripts/apps/users/import/import.js
rename to scripts/apps/users/import/import.ts
index dab6a3baf1..cb218feacd 100644
--- a/scripts/apps/users/import/import.js
+++ b/scripts/apps/users/import/import.ts
@@ -3,7 +3,7 @@ import {gettext} from 'core/utils';
 UserImportService.$inject = ['api', '$q'];
 function UserImportService(api, $q) {
     function reject(key, message) {
-        var error = {};
+        var error: any = {};
 
         error[key] = 1;
         error.message = message;
@@ -34,8 +34,8 @@ function UserImportController($scope, userImport) {
     $scope.importUser = function importUser(user) {
         $scope.error = null;
         userImport.importUser(user)
-            .then(function finishImport(user) {
-                $scope.resolve(user);
+            .then(function finishImport(importedUser) {
+                $scope.resolve(importedUser);
             }, function renderErrors(error) {
                 $scope.error = error;
             });
diff --git a/scripts/apps/users/index.js b/scripts/apps/users/index.ts
similarity index 96%
rename from scripts/apps/users/index.js
rename to scripts/apps/users/index.ts
index 2697047c63..b7a2f21759 100644
--- a/scripts/apps/users/index.js
+++ b/scripts/apps/users/index.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 // styles
 import './activity-widget/widget-activity.scss';
 import './styles/change-avatar.scss';
@@ -69,8 +71,8 @@ export default angular.module('superdesk.apps.users', [
                 element.html(value);
                 var nscope = scope.$new(true);
 
-                _.each(scope.$eval(attrs.data), (value, key) => {
-                    nscope[key] = value;
+                _.each(scope.$eval(attrs.data), (val, key) => {
+                    nscope[key] = val;
                 });
                 $compile(element.contents())(nscope);
             };
diff --git a/scripts/apps/users/roles/RolesService.js b/scripts/apps/users/roles/RolesService.ts
similarity index 94%
rename from scripts/apps/users/roles/RolesService.js
rename to scripts/apps/users/roles/RolesService.ts
index 2ea869be28..10791d5932 100644
--- a/scripts/apps/users/roles/RolesService.js
+++ b/scripts/apps/users/roles/RolesService.ts
@@ -1,4 +1,6 @@
 export default class RolesService {
+    _api: any;
+
     constructor(api) {
         this._api = api;
     }
diff --git a/scripts/apps/users/services/ProfileService.js b/scripts/apps/users/services/ProfileService.ts
similarity index 96%
rename from scripts/apps/users/services/ProfileService.js
rename to scripts/apps/users/services/ProfileService.ts
index b684dfa01a..b59ab6feec 100644
--- a/scripts/apps/users/services/ProfileService.js
+++ b/scripts/apps/users/services/ProfileService.ts
@@ -11,7 +11,7 @@ export function ProfileService(api) {
      * @return {Promise}
      */
     this.getUserActivity = function(user, maxResults, page) {
-        var q = {
+        var q: any = {
             where: {user: user._id},
             sort: '[(\'_created\',-1)]',
             embedded: {user: 1},
@@ -38,7 +38,7 @@ export function ProfileService(api) {
      * @return {Promise}
      */
     this.getAllUsersActivity = function(maxResults, page) {
-        var q = {
+        var q: any = {
             sort: '[(\'_created\',-1)]',
             where: {user: {$exists: true}, item: {$exists: true}},
             embedded: {user: 1},
diff --git a/scripts/apps/users/services/UserListService.js b/scripts/apps/users/services/UserListService.ts
similarity index 95%
rename from scripts/apps/users/services/UserListService.js
rename to scripts/apps/users/services/UserListService.ts
index c20f651d5e..6e9b213878 100644
--- a/scripts/apps/users/services/UserListService.js
+++ b/scripts/apps/users/services/UserListService.ts
@@ -4,7 +4,7 @@
  */
 UserListService.$inject = ['api', '$q', '$cacheFactory'];
 export function UserListService(api, $q, $cacheFactory) {
-    var userservice = {};
+    var userservice: any = {};
 
     var cache = $cacheFactory('userList');
 
@@ -33,7 +33,7 @@ export function UserListService(api, $q, $cacheFactory) {
             return $q.when(value);
         }
 
-        var criteria = {max_results: page * perPage};
+        var criteria: any = {max_results: page * perPage};
 
         if (search) {
             criteria.where = JSON.stringify({
diff --git a/scripts/apps/users/services/UserPopupService.js b/scripts/apps/users/services/UserPopupService.ts
similarity index 98%
rename from scripts/apps/users/services/UserPopupService.js
rename to scripts/apps/users/services/UserPopupService.ts
index f9a56e1e03..852655083c 100644
--- a/scripts/apps/users/services/UserPopupService.js
+++ b/scripts/apps/users/services/UserPopupService.ts
@@ -1,6 +1,6 @@
 UserPopupService.$inject = ['$compile', '$timeout', 'userList'];
 export function UserPopupService($compile, $timeout, userList) {
-    var popover = {};
+    var popover: any = {};
     var holdInterval = 300;
 
     // Create element
@@ -87,7 +87,7 @@ export function UserPopupService($compile, $timeout, userList) {
             '<div class="title">{{user.display_name}}</div>' +
             '<div class="actions">' +
                 '<a href="#/users/{{user._id}}">go to profile</a>' +
-            '</div>'
+            '</div>',
         );
         var popupScope = scope.$new(true);
 
diff --git a/scripts/apps/users/services/UsersService.js b/scripts/apps/users/services/UsersService.ts
similarity index 97%
rename from scripts/apps/users/services/UsersService.js
rename to scripts/apps/users/services/UsersService.ts
index 2fa01241be..9313a2d889 100644
--- a/scripts/apps/users/services/UsersService.js
+++ b/scripts/apps/users/services/UsersService.ts
@@ -1,9 +1,11 @@
+import _ from 'lodash';
+
 /**
  * Bussiness logic layer, should be used instead of resource
  */
 UsersService.$inject = ['api', '$q', 'notify'];
 export function UsersService(api, $q, notify) {
-    var usersService = {};
+    var usersService: any = {};
 
     usersService.usernamePattern = /^[A-Za-z0-9_.'-]+$/;
     usersService.phonePattern = /^(?:(?:0?[1-9][0-9]{8})|(?:(?:\+|00)[1-9][0-9]{9,11}))$/;
diff --git a/scripts/apps/users/tests/sdUserPrivileges.spec.js b/scripts/apps/users/tests/sdUserPrivileges.spec.ts
similarity index 97%
rename from scripts/apps/users/tests/sdUserPrivileges.spec.js
rename to scripts/apps/users/tests/sdUserPrivileges.spec.ts
index 202e9f3256..a0a47e43a5 100644
--- a/scripts/apps/users/tests/sdUserPrivileges.spec.js
+++ b/scripts/apps/users/tests/sdUserPrivileges.spec.ts
@@ -25,7 +25,7 @@ describe('sdUserPrivileges directive', () => {
 
             // some API methods are attached directly to the API service, thus
             // a different mocking technique here
-            apiMock.save = jasmine.createSpy('api_save');
+            apiMock['save'] = jasmine.createSpy('api_save');
 
             return apiMock;
         }
@@ -117,7 +117,7 @@ describe('sdUserPrivileges directive', () => {
             isoScope.$digest();
 
             expect(isoScope.privileges).toEqual(
-                [{name: 'role_foo'}, {name: 'role_bar'}]
+                [{name: 'role_foo'}, {name: 'role_bar'}],
             );
         });
 
@@ -172,7 +172,7 @@ describe('sdUserPrivileges directive', () => {
                 userJohn,
                 {
                     privileges: [{name: 'can_edit'}],
-                }
+                },
             );
         });
 
@@ -190,9 +190,9 @@ describe('sdUserPrivileges directive', () => {
                 isoScope.$digest();
 
                 expect(isoScope.origPrivileges).toEqual(
-                    [{name: 'manager'}, {name: 'reviewer'}]
+                    [{name: 'manager'}, {name: 'reviewer'}],
                 );
-            }
+            },
         );
 
         it('issues system notification on success', inject((notify) => {
diff --git a/scripts/apps/users/tests/users.spec.js b/scripts/apps/users/tests/users.spec.ts
similarity index 97%
rename from scripts/apps/users/tests/users.spec.js
rename to scripts/apps/users/tests/users.spec.ts
index 48c0aa8b54..fa4cdda7e4 100644
--- a/scripts/apps/users/tests/users.spec.js
+++ b/scripts/apps/users/tests/users.spec.ts
@@ -1,5 +1,4 @@
 
-
 describe('users api', () => {
     beforeEach(window.module('superdesk.apps.users'));
     beforeEach(window.module('superdesk.mocks'));
@@ -19,7 +18,7 @@ describe('users api', () => {
     }));
 
     it('can update user', inject((usersService, api, $q, $rootScope) => {
-        var user = {UserName: 'foo', FirstName: 'a'},
+        var user: any = {UserName: 'foo', FirstName: 'a'},
             data = {FirstName: 'foo', LastName: 'bar'};
 
         spyOn(api, 'save').and.returnValue($q.when({UserName: 'foo', FirstName: 'foo', LastName: 'bar'}));
@@ -34,7 +33,7 @@ describe('users api', () => {
     }));
 
     xit('can change user password', inject((usersService, resource, $rootScope) => {
-        var user = {UserPassword: {href: 'pwd_url'}};
+        var user: any = {UserPassword: {href: 'pwd_url'}};
 
         spyOn(resource, 'replace');
 
@@ -183,7 +182,7 @@ describe('user edit form', () => {
             identity: {_id: 1},
             getIdentity: function() {
                 return $q.when(
-                    {who: 'cares', this: 'is', totaly: 'fake'}
+                    {who: 'cares', this: 'is', totaly: 'fake'},
                 );
             },
         }));
diff --git a/scripts/apps/workspace/content/services/ContentService.js b/scripts/apps/workspace/content/services/ContentService.ts
similarity index 95%
rename from scripts/apps/workspace/content/services/ContentService.js
rename to scripts/apps/workspace/content/services/ContentService.ts
index 077aecf00d..47fa624a60 100644
--- a/scripts/apps/workspace/content/services/ContentService.js
+++ b/scripts/apps/workspace/content/services/ContentService.ts
@@ -113,7 +113,7 @@ export function ContentService(api, superdesk, templates, desks, packages, archi
      * @return {Promise}
      */
     this.createItemFromTemplate = function(template) {
-        var item = newItem(template.data.type || null);
+        var item: any = newItem(template.data.type || null);
 
         angular.extend(item, templates.pickItemData(template.data || {}), {template: template._id});
         // set the dateline date to default utc date.
@@ -189,7 +189,8 @@ export function ContentService(api, superdesk, templates, desks, packages, archi
      * @return {Promise}
      */
     this.getTypes = function(includeDisabled) {
-        var self = this;
+        // eslint-disable-next-line consistent-this
+        var getTypesFnThis = this;
         var params = {};
 
         if (!includeDisabled) {
@@ -198,12 +199,12 @@ export function ContentService(api, superdesk, templates, desks, packages, archi
 
         // cache when fetching all types
         return api.getAll('content_types', params, !!includeDisabled).then((result) => {
-            self.types = result.sort((a, b) => b.priority - a.priority // with higher priority goes up
+            getTypesFnThis.types = result.sort((a, b) => b.priority - a.priority, // with higher priority goes up
             );
-            return self.types;
+            return getTypesFnThis.types;
         }, (reason) => {
-            self.types = [];
-            return self.types;
+            getTypesFnThis.types = [];
+            return getTypesFnThis.types;
         });
     };
 
@@ -296,7 +297,7 @@ export function ContentService(api, superdesk, templates, desks, packages, archi
     this.getDeskProfiles = function(desk, profileId) {
         return this.getTypes().then((profiles) => !desk || isEmpty(desk.content_profiles) ?
             profiles :
-            profiles.filter((profile) => desk.content_profiles[profile._id] || profile._id === profileId)
+            profiles.filter((profile) => desk.content_profiles[profile._id] || profile._id === profileId),
         );
     };
 
diff --git a/scripts/apps/workspace/directives/WorkspaceDropdownDirective.js b/scripts/apps/workspace/directives/WorkspaceDropdownDirective.ts
similarity index 99%
rename from scripts/apps/workspace/directives/WorkspaceDropdownDirective.js
rename to scripts/apps/workspace/directives/WorkspaceDropdownDirective.ts
index 448a1755f0..6126add762 100644
--- a/scripts/apps/workspace/directives/WorkspaceDropdownDirective.js
+++ b/scripts/apps/workspace/directives/WorkspaceDropdownDirective.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 WorkspaceDropdownDirective.$inject = ['desks', 'workspaces', '$route', 'preferencesService', '$location',
     'reloadService', 'notifyConnectionService', 'deskNotifications', 'pageTitle'];
 export function WorkspaceDropdownDirective(desks, workspaces, $route, preferencesService, $location, reloadService,
diff --git a/scripts/apps/workspace/helpers/getLabelForFieldId.js b/scripts/apps/workspace/helpers/getLabelForFieldId.ts
similarity index 100%
rename from scripts/apps/workspace/helpers/getLabelForFieldId.js
rename to scripts/apps/workspace/helpers/getLabelForFieldId.ts
diff --git a/scripts/core/activity/activity-list-directive.js b/scripts/core/activity/activity-list-directive.ts
similarity index 99%
rename from scripts/core/activity/activity-list-directive.js
rename to scripts/core/activity/activity-list-directive.ts
index 709b4a9375..ed555037d9 100644
--- a/scripts/core/activity/activity-list-directive.js
+++ b/scripts/core/activity/activity-list-directive.ts
@@ -16,7 +16,7 @@ angular.module('superdesk.core.activity.list', [])
                 link: function(scope, elem, attrs) {
                     scope.item.actioning = {};
 
-                    var intent = {
+                    var intent: any = {
                         action: scope.action,
                     };
 
diff --git a/scripts/core/analytics/analytics.js b/scripts/core/analytics/analytics.ts
similarity index 84%
rename from scripts/core/analytics/analytics.js
rename to scripts/core/analytics/analytics.ts
index 50d5ae6ecd..b77613ce0a 100644
--- a/scripts/core/analytics/analytics.js
+++ b/scripts/core/analytics/analytics.ts
@@ -3,12 +3,11 @@ function NoopTracking() {
 }
 
 function PiwikTracking(config) {
-    /* global _paq */
     window._paq = window._paq || [];
 
     (function() {
-        _paq.push(['setSiteId', config.id]);
-        _paq.push(['setTrackerUrl', config.url + '/piwik.php']);
+        window._paq.push(['setSiteId', config.id]);
+        window._paq.push(['setTrackerUrl', config.url + '/piwik.php']);
         var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
 
         g.type = 'text/javascript';
@@ -19,12 +18,11 @@ function PiwikTracking(config) {
     })();
 
     this.track = function(activity) {
-        _paq.push(['trackPageView', activity.label]);
+        window._paq.push(['trackPageView', activity.label]);
     };
 }
 
 function GoogleTracking(config) {
-    /* global ga */
     (function(i, s, o, g, r, a, m) {
         let el = a;
         let tag = m;
@@ -33,17 +31,18 @@ function GoogleTracking(config) {
         i[r] = i[r] || function() {
             (i[r].q = i[r].q || []).push(arguments);
         };
-        i[r].l = 1 * new Date(); el = s.createElement(o);
+        i[r].l = 1 * Number(new Date());
+        el = s.createElement(o);
         tag = s.getElementsByTagName(o)[0];
         el.async = 1;
         el.src = g;
         tag.parentNode.insertBefore(el, tag);
     })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
 
-    ga('create', config.id, 'sourcefabric.org');
+    window.ga('create', config.id, 'sourcefabric.org');
 
     this.track = function(activity) {
-        ga('send', 'pageview', {
+        window.ga('send', 'pageview', {
             page: activity._id,
             title: activity.label,
         });
diff --git a/scripts/core/api/api-service.spec.js b/scripts/core/api/api-service.spec.ts
similarity index 99%
rename from scripts/core/api/api-service.spec.js
rename to scripts/core/api/api-service.spec.ts
index b2331e034d..ba00275a78 100644
--- a/scripts/core/api/api-service.spec.js
+++ b/scripts/core/api/api-service.spec.ts
@@ -152,7 +152,7 @@ describe('API Provider', () => {
         }));
 
         it('can create new with diff', inject((api, urls, $q, $httpBackend) => {
-            var user = {},
+            var user: any = {},
                 data = {username: 'test'};
 
             spyOn(urls, 'resource').and.returnValue($q.when(USERS_URL));
@@ -331,7 +331,7 @@ describe('API Provider', () => {
         }));
 
         it('can create', inject((api, $httpBackend) => {
-            var user = {name: 'foo'};
+            var user: any = {name: 'foo'};
 
             $httpBackend.expectPOST(USERS_URL, user).respond(201, {_id: 1});
 
diff --git a/scripts/core/api/api-service.js b/scripts/core/api/api-service.ts
similarity index 94%
rename from scripts/core/api/api-service.js
rename to scripts/core/api/api-service.ts
index 6e373c6f88..f97f91cb7b 100644
--- a/scripts/core/api/api-service.js
+++ b/scripts/core/api/api-service.ts
@@ -1,5 +1,3 @@
-var angular = require('angular');
-
 /**
  * @ngdoc provider
  * @name apiProvider
@@ -80,7 +78,7 @@ function APIProvider() {
                         console.warn('duplicate request',
                             config.url,
                             'after', now - last.now, 'ms',
-                            config.params
+                            config.params,
                         );
                         return last.promise;
                     }
@@ -100,7 +98,7 @@ function APIProvider() {
         /**
          * Remove keys prefixed with '_'
          */
-        function clean(data, keepId) {
+        function clean(data, keepId?) {
             var blacklist = {
                     _type: 1,
                     _status: 1,
@@ -239,12 +237,12 @@ function APIProvider() {
          * @description
          * Query resource
          */
-        Resource.prototype.query = function(params, cache) {
+        Resource.prototype.query = function(params, _cache) {
             return http({
                 method: 'GET',
                 url: this.url(),
                 params: params,
-                cache: cache,
+                cache: _cache,
             });
         };
 
@@ -288,12 +286,12 @@ function APIProvider() {
          * @description
          * Get an item by _id
          */
-        Resource.prototype.getById = function(_id, params, cache) {
+        Resource.prototype.getById = function(_id, params, _cache) {
             return http({
                 method: 'GET',
                 url: this.url(_id),
                 params: params,
-                cache: cache,
+                cache: _cache,
             });
         };
 
@@ -317,15 +315,15 @@ function APIProvider() {
         };
 
         // api service
-        var api = function apiService(resource, parent) {
+        var api: any = function apiService(resource, parent) {
             return new Resource(resource, parent);
         };
 
         /**
          * @alias api(resource).getById(id)
          */
-        api.find = function apiFind(resource, id, params, cache) {
-            return api(resource).getById(id, params, cache);
+        api.find = function apiFind(resource, id, params, _cache) {
+            return api(resource).getById(id, params, _cache);
         };
 
         /**
@@ -375,8 +373,8 @@ function APIProvider() {
          * @param {Object} parent
          * @param {boolean} cache
          */
-        api.query = function apiQuery(resource, query, parent, cache) {
-            return api(resource, parent).query(query, cache);
+        api.query = function apiQuery(resource, query, parent, _cache) {
+            return api(resource, parent).query(query, _cache);
         };
 
         function getResourceUrl(resource, item, id) {
diff --git a/scripts/core/api/http-endpoint-factory.js b/scripts/core/api/http-endpoint-factory.ts
similarity index 99%
rename from scripts/core/api/http-endpoint-factory.js
rename to scripts/core/api/http-endpoint-factory.ts
index 721e2c9c88..cd1613b6ba 100644
--- a/scripts/core/api/http-endpoint-factory.js
+++ b/scripts/core/api/http-endpoint-factory.ts
@@ -31,7 +31,7 @@ function HttpEndpointFactory($http, $q, urls, _) {
      *
      * @description Get headers for given resource
      */
-    function getHeaders(resource, item) {
+    function getHeaders(resource, item?) {
         var headers = _.extend({}, resource.config.headers || {});
 
         if (item && item._etag) {
diff --git a/scripts/core/api/request-service.js b/scripts/core/api/request-service.ts
similarity index 100%
rename from scripts/core/api/request-service.js
rename to scripts/core/api/request-service.ts
diff --git a/scripts/core/api/timeout-interceptor.spec.js b/scripts/core/api/timeout-interceptor.spec.ts
similarity index 92%
rename from scripts/core/api/timeout-interceptor.spec.js
rename to scripts/core/api/timeout-interceptor.spec.ts
index 4ecabc7f46..81e61b20a6 100644
--- a/scripts/core/api/timeout-interceptor.spec.js
+++ b/scripts/core/api/timeout-interceptor.spec.ts
@@ -1,11 +1,10 @@
-var RequestService = window.RequestService;
 var TimeoutHttpInterceptor = window.TimeoutHttpInterceptor;
 
 describe('timeout http interceptor', () => {
     var service;
 
     beforeEach(window.module(($provide) => {
-        $provide.service('request', RequestService);
+        $provide.service('request', window.RequestService);
         $provide.service('upload', function() {
             this.isUpload = function() {
                 return false;
@@ -18,7 +17,7 @@ describe('timeout http interceptor', () => {
     }));
 
     xit('monitors requests and stop them after while', inject(($rootScope) => {
-        var config = {
+        var config: any = {
             method: 'GET',
             url: 'test',
         };
diff --git a/scripts/core/auth/basic-auth-adapter.spec.js b/scripts/core/auth/basic-auth-adapter.spec.ts
similarity index 100%
rename from scripts/core/auth/basic-auth-adapter.spec.js
rename to scripts/core/auth/basic-auth-adapter.spec.ts
diff --git a/scripts/core/config.js b/scripts/core/config.ts
similarity index 97%
rename from scripts/core/config.js
rename to scripts/core/config.ts
index b59bf9140d..165973be5a 100644
--- a/scripts/core/config.js
+++ b/scripts/core/config.ts
@@ -8,6 +8,9 @@ function DeployConfigFactory(api, $q) {
      * provides deployment related config from server
      */
     class DeployConfig {
+        config: any;
+        promise: any;
+
         constructor() {
             this.config = null;
             this.promise = null;
@@ -51,7 +54,7 @@ function DeployConfigFactory(api, $q) {
          * @param {mixed} defaultValue
          * @return {mixed}
          */
-        getSync(key, defaultValue) {
+        getSync(key, defaultValue?) {
             if (!this.config) {
                 return defaultValue;
             }
diff --git a/scripts/core/datetime/absdate-directive.js b/scripts/core/datetime/absdate-directive.ts
similarity index 98%
rename from scripts/core/datetime/absdate-directive.js
rename to scripts/core/datetime/absdate-directive.ts
index b26c581cfc..e6aebb90cd 100644
--- a/scripts/core/datetime/absdate-directive.js
+++ b/scripts/core/datetime/absdate-directive.ts
@@ -1,4 +1,5 @@
 import {gettext} from 'core/utils';
+import moment from 'moment';
 
 /**
  * Display absolute date in <time> element
diff --git a/scripts/core/datetime/datetime.js b/scripts/core/datetime/datetime.ts
similarity index 98%
rename from scripts/core/datetime/datetime.js
rename to scripts/core/datetime/datetime.ts
index 7b6c0aab29..cf901ce5ad 100644
--- a/scripts/core/datetime/datetime.js
+++ b/scripts/core/datetime/datetime.ts
@@ -1,4 +1,6 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
+import momentTimezone from 'moment-timezone';
 
 DateTimeDirective.$inject = ['datetime', 'moment'];
 function DateTimeDirective(datetime, moment) {
@@ -225,7 +227,7 @@ export default angular.module('superdesk.core.datetime', [
         };
     }])
 
-    .constant('moment', require('moment-timezone'))
+    .constant('moment', momentTimezone)
 
     .factory('weekdays', [function() {
         return Object.freeze({
@@ -261,7 +263,7 @@ export default angular.module('superdesk.core.datetime', [
         tzResource.prototype.getTzNames = function() {
             return _.union(
                 _.keys(this.zones),
-                _.keys(this.links)
+                _.keys(this.links),
             ).sort();
         };
 
diff --git a/scripts/core/datetime/group-dates-directive.js b/scripts/core/datetime/group-dates-directive.ts
similarity index 98%
rename from scripts/core/datetime/group-dates-directive.js
rename to scripts/core/datetime/group-dates-directive.ts
index ed01c539be..015c9eaf15 100644
--- a/scripts/core/datetime/group-dates-directive.js
+++ b/scripts/core/datetime/group-dates-directive.ts
@@ -1,3 +1,5 @@
+import moment from 'moment';
+
 /**
  * sdGroupDates directive will group list items by a date provided as a param.
  *
diff --git a/scripts/core/datetime/reldate-directive-complex.js b/scripts/core/datetime/reldate-directive-complex.ts
similarity index 98%
rename from scripts/core/datetime/reldate-directive-complex.js
rename to scripts/core/datetime/reldate-directive-complex.ts
index f556f2ec7f..c1a27495f7 100644
--- a/scripts/core/datetime/reldate-directive-complex.js
+++ b/scripts/core/datetime/reldate-directive-complex.ts
@@ -1,4 +1,5 @@
 import {gettext} from 'core/utils';
+import moment from 'moment';
 
 /**
  * Display relative date in <time> element
diff --git a/scripts/core/datetime/reldate-directive.js b/scripts/core/datetime/reldate-directive.ts
similarity index 100%
rename from scripts/core/datetime/reldate-directive.js
rename to scripts/core/datetime/reldate-directive.ts
diff --git a/scripts/core/directives/CheckAllDirective.js b/scripts/core/directives/CheckAllDirective.ts
similarity index 98%
rename from scripts/core/directives/CheckAllDirective.js
rename to scripts/core/directives/CheckAllDirective.ts
index c19f840e09..129c377877 100644
--- a/scripts/core/directives/CheckAllDirective.js
+++ b/scripts/core/directives/CheckAllDirective.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 var render = function(element, value) {
     element.toggleClass('checked', !!value);
     element.attr('checked', !!value);
diff --git a/scripts/core/directives/DebounceDirective.js b/scripts/core/directives/DebounceDirective.ts
similarity index 97%
rename from scripts/core/directives/DebounceDirective.js
rename to scripts/core/directives/DebounceDirective.ts
index 19aa09149b..d8623d2dcf 100644
--- a/scripts/core/directives/DebounceDirective.js
+++ b/scripts/core/directives/DebounceDirective.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export default angular.module('superdesk.core.directives.debounce', [])
     /**
      * @ngdoc directive
diff --git a/scripts/core/directives/PasswordStrengthDirective.ts b/scripts/core/directives/PasswordStrengthDirective.ts
index bf72e57090..774e10ace6 100644
--- a/scripts/core/directives/PasswordStrengthDirective.ts
+++ b/scripts/core/directives/PasswordStrengthDirective.ts
@@ -45,7 +45,7 @@ function PasswordStrength() {
     // informational icon.
     var helpText = gettext(
         'Must be {{MIN_LENGTH}} characters long and contain {{MIN_STRENGTH}} out of 4 of the following:',
-         config) +
+        config) +
         '<ul>' +
             '<li>' + gettext('a lower case letter (a-z)') + '</li>' +
             '<li>' + gettext('an upper case letter (A-Z)') + '</li>' +
diff --git a/scripts/core/directives/PhoneHomeModalDirective.js b/scripts/core/directives/PhoneHomeModalDirective.ts
similarity index 95%
rename from scripts/core/directives/PhoneHomeModalDirective.js
rename to scripts/core/directives/PhoneHomeModalDirective.ts
index 716d0b8932..39c73d6f3b 100644
--- a/scripts/core/directives/PhoneHomeModalDirective.js
+++ b/scripts/core/directives/PhoneHomeModalDirective.ts
@@ -3,6 +3,9 @@ export function PhoneHomeModalDirective(serverConfig, api, session) {
     let template = require('./views/phone-home-modal-directive.html');
 
     class PhoneController {
+        data: any;
+        enabled: any;
+
         constructor() {
             this.data = {};
 
diff --git a/scripts/core/directives/SearchListDirective.js b/scripts/core/directives/SearchListDirective.ts
similarity index 94%
rename from scripts/core/directives/SearchListDirective.js
rename to scripts/core/directives/SearchListDirective.ts
index 6ba6673b8a..a547598bd0 100644
--- a/scripts/core/directives/SearchListDirective.js
+++ b/scripts/core/directives/SearchListDirective.ts
@@ -110,18 +110,18 @@ export default angular.module('superdesk.core.directives.searchList', ['superdes
                 };
 
                 scope.unselectItem = function(item) {
-                    _.remove(scope.selectedItems, (i) => i._id === item._id);
+                    _.remove(scope.selectedItems, (i: any) => i._id === item._id);
                 };
 
                 scope.isSelected = function(item) {
                     return scope.selectedItems ?
-                        _.findIndex(scope.selectedItems, (i) => i._id === item._id) !== -1
+                        _.findIndex(scope.selectedItems, (i: any) => i._id === item._id) !== -1
                         : false;
                 };
 
                 scope.isDisabled = function(item) {
                     return scope.disabledItems ?
-                        _.findIndex(scope.disabledItems, (i) => i._id === item._id) !== -1
+                        _.findIndex(scope.disabledItems, (i: any) => i._id === item._id) !== -1
                         : false;
                 };
             },
diff --git a/scripts/core/directives/SearchListSingleDirective.js b/scripts/core/directives/SearchListSingleDirective.ts
similarity index 98%
rename from scripts/core/directives/SearchListSingleDirective.js
rename to scripts/core/directives/SearchListSingleDirective.ts
index a93825d341..d2cee7a05f 100644
--- a/scripts/core/directives/SearchListSingleDirective.js
+++ b/scripts/core/directives/SearchListSingleDirective.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export default angular.module('superdesk.core.directives.searchListSingle', ['superdesk.core.services.asset'])
     /**
      * @ngdoc directive
diff --git a/scripts/core/directives/ThrottleDirective.js b/scripts/core/directives/ThrottleDirective.ts
similarity index 97%
rename from scripts/core/directives/ThrottleDirective.js
rename to scripts/core/directives/ThrottleDirective.ts
index 59f61788d7..60eea27aa7 100644
--- a/scripts/core/directives/ThrottleDirective.js
+++ b/scripts/core/directives/ThrottleDirective.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export default angular.module('superdesk.core.directives.throttle', [])
     /**
      * @ngdoc directive
diff --git a/scripts/core/directives/WithParamsDirective.js b/scripts/core/directives/WithParamsDirective.ts
similarity index 93%
rename from scripts/core/directives/WithParamsDirective.js
rename to scripts/core/directives/WithParamsDirective.ts
index 8382b46aad..f4bc94b554 100644
--- a/scripts/core/directives/WithParamsDirective.js
+++ b/scripts/core/directives/WithParamsDirective.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export default angular.module('superdesk.core.directives.withParams', [])
     /**
      * @ngdoc directive
@@ -22,7 +24,7 @@ export default angular.module('superdesk.core.directives.withParams', [])
                     var excludes = attrs.exclude.split(',');
                     var query = locationParams.makeQuery(
                         _.omit(locationParams.params, excludes),
-                        locationParams.defaults
+                        locationParams.defaults,
                     );
 
                     attrs.$set('href', attrs.href.trim() + query);
diff --git a/scripts/core/editor2/add-embed.ctrl.js b/scripts/core/editor2/add-embed.ctrl.ts
similarity index 94%
rename from scripts/core/editor2/add-embed.ctrl.js
rename to scripts/core/editor2/add-embed.ctrl.ts
index 372273a9a7..27b94711b8 100644
--- a/scripts/core/editor2/add-embed.ctrl.js
+++ b/scripts/core/editor2/add-embed.ctrl.ts
@@ -1,4 +1,4 @@
-var embedCodeHandlers = require('./embedCodeHandlers');
+import embedCodeHandlers from './embedCodeHandlers';
 
 angular.module('superdesk.apps.editor2.embed', []).controller('SdAddEmbedController', SdAddEmbedController);
 
@@ -32,8 +32,8 @@ function SdAddEmbedController(embedService, $element, $timeout, $q, _,
                             embed = editor.generateMediaTag({url: data.url, altText: data.description});
                         }
                     }
-                    return $q.when(embed).then((embed) => ({
-                        body: embed,
+                    return $q.when(embed).then((embedElement) => ({
+                        body: embedElement,
                         provider: data.provider_name || EMBED_PROVIDERS.custom,
                     }));
                 });
@@ -73,10 +73,10 @@ function SdAddEmbedController(embedService, $element, $timeout, $q, _,
             // if it's an url, use embedService to retrieve the embed code
 
             if (_.startsWith(self.input, 'http')) {
-                embedCode = retrieveEmbedFromUrl(self.input);
+                embedCode = retrieveEmbedFromUrl();
             // otherwise we use the content of the field directly
             } else {
-                embedCode = parseRawEmbedCode(self.input);
+                embedCode = parseRawEmbedCode();
             }
             return $q.when(embedCode);
         },
diff --git a/scripts/core/editor2/customAnchor.js b/scripts/core/editor2/customAnchor.ts
similarity index 95%
rename from scripts/core/editor2/customAnchor.js
rename to scripts/core/editor2/customAnchor.ts
index d2a4043ee4..ad0533322c 100644
--- a/scripts/core/editor2/customAnchor.js
+++ b/scripts/core/editor2/customAnchor.ts
@@ -8,6 +8,10 @@
 import MediumEditor from 'medium-editor';
 
 class CustomAnchorButton extends MediumEditor.extensions.anchor {
+    linkValidation: any;
+    pattern: any;
+    getForm: any;
+
     createForm() {
         let form = super.createForm();
 
diff --git a/scripts/core/editor2/editor.ctrl.js b/scripts/core/editor2/editor.ctrl.ts
similarity index 85%
rename from scripts/core/editor2/editor.ctrl.js
rename to scripts/core/editor2/editor.ctrl.ts
index 56a28e4f59..6ee8aa311f 100644
--- a/scripts/core/editor2/editor.ctrl.js
+++ b/scripts/core/editor2/editor.ctrl.ts
@@ -4,10 +4,11 @@ SdTextEditorController.$inject = ['lodash', 'EMBED_PROVIDERS', '$timeout', 'edit
 function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q) {
     var self = this;
 
-    function Block(attrs = {}) {
-        var self = this;
+    function Block(attrs: any = {}) {
+        // eslint-disable-next-line consistent-this
+        var BlockFnThis = this;
 
-        angular.extend(self, _.defaults({
+        angular.extend(BlockFnThis, _.defaults({
             body: attrs.body,
             loading: attrs.loading,
             caption: attrs.caption,
@@ -16,7 +17,7 @@ function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q
             association: attrs.association,
             lowerAddEmbedIsExtended: undefined,
             showAndFocusLowerAddAnEmbedBox: function() {
-                self.lowerAddEmbedIsExtended = true;
+                BlockFnThis.lowerAddEmbedIsExtended = true;
             },
         }, {
             body: '<p><br></p>',
@@ -25,9 +26,9 @@ function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q
         }));
     }
     /**
-    * For the given blocks, merge text blocks when there are following each other
-    * and add empty text block arround embeds if needed
-    */
+     * For the given blocks, merge text blocks when there are following each other
+     * and add empty text block arround embeds if needed
+     */
     function prepareBlocks(blocks) {
         var newBlocks = [];
 
@@ -56,8 +57,8 @@ function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q
     function splitIntoBlock(bodyHtml) {
         var blocks = [], block;
         /**
-        * push the current block into the blocks collection if it is not empty
-        */
+         * push the current block into the blocks collection if it is not empty
+         */
 
         function commitBlock() {
             if (block !== undefined && block.body.trim() !== '') {
@@ -78,11 +79,11 @@ function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q
             .contents()
             .toArray()
             .forEach((element) => {
-            // if we get a <p>, we push the current block and create a new one
-            // for the paragraph content
+                // if we get a <p>, we push the current block and create a new one
+                // for the paragraph content
                 if (element.nodeName === 'P') {
                     handleParagraph(element);
-                // detect if it's an embed
+                    // detect if it's an embed
                 } else if (element.nodeName === '#comment') {
                     if (element.nodeValue.indexOf('EMBED START') > -1) {
                         commitBlock();
@@ -101,7 +102,7 @@ function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q
                         var embedAssoKey = /{id: "(embedded\d+)"}/;
 
                         if ((match = embedAssoKey.exec(angular.copy(element.nodeValue).trim())) !== null
-                        && self.associations) {
+                            && self.associations) {
                             association = angular.copy(self.associations[match[1]]);
                         }
                         // create the embed block
@@ -115,7 +116,7 @@ function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q
                     if (element.nodeValue.indexOf('EMBED END') > -1) {
                         commitBlock();
                     }
-                // if it's not a paragraph or an embed, we update the current block
+                    // if it's not a paragraph or an embed, we update the current block
                 } else {
                     if (block === undefined) {
                         block = new Block({body: ''});
@@ -129,28 +130,28 @@ function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q
             blocks.push(block);
         }
         // Complete embeds with metadata (from association datadata or html)
-        blocks.forEach((block) => {
-            if (block.blockType === 'embed') {
+        blocks.forEach((blockObject) => {
+            if (blockObject.blockType === 'embed') {
                 // for images that come from Superdesk, we use the association
-                if (block.association && block.embedType === 'Image') {
-                    block.caption = block.association.description_text;
-                    block.body = '';
-                    editor.generateMediaTag(block.association).then((img) => {
-                        block.body = img;
+                if (blockObject.association && blockObject.embedType === 'Image') {
+                    blockObject.caption = blockObject.association.description_text;
+                    blockObject.body = '';
+                    editor.generateMediaTag(blockObject.association).then((img) => {
+                        blockObject.body = img;
                     });
                 } else {
-                    // extract body and caption from embed block html
-                    var originalBody = angular.element(angular.copy(block.body));
+                    // extract body and caption from embed blockObject html
+                    var originalBody = angular.element(angular.copy(blockObject.body));
 
                     if (originalBody.get(0).nodeName === 'FIGURE') {
-                        block.body = '';
+                        blockObject.body = '';
                         originalBody.contents()
                             .toArray()
                             .forEach((element) => {
                                 if (element.nodeName === 'FIGCAPTION') {
-                                    block.caption = element.innerHTML;
+                                    blockObject.caption = element.innerHTML;
                                 } else {
-                                    block.body += element.outerHTML || element.nodeValue || '';
+                                    blockObject.body += element.outerHTML || element.nodeValue || '';
                                 }
                             });
                     }
@@ -246,8 +247,8 @@ function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q
             }
         },
         /**
-        * Return an object that contains the embedded images in the story
-        */
+         * Return an object that contains the embedded images in the story
+         */
         getAssociations: function() {
             var association = {};
 
@@ -268,7 +269,7 @@ function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q
             var index = self.getBlockPosition(textBlockCtrl.block) + 1;
 
             if (index === 0) {
-                throw 'Block to split not found';
+                throw new Error('Block to split not found');
             }
             // cut the text that is after the caret in the block and save it in order to add it after the embed later
             var after = textBlockCtrl.extractEndOfBlock().innerHTML;
@@ -313,13 +314,13 @@ function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q
             });
         },
         /**
-        ** Merge text blocks when there are following each other and add empty text block arround embeds if needed
-        ** @param {Integer} position
-        ** @param {Object} block ; block attributes
-        ** @param {boolean} doNotRenderBlocks ; if true, it won't merge text blocks and
-        ** add empty text block if needed through the `renderBlocks()` function.
-        ** @returns {object} this
-        */
+         ** Merge text blocks when there are following each other and add empty text block arround embeds if needed
+         ** @param {Integer} position
+         ** @param {Object} block ; block attributes
+         ** @param {boolean} doNotRenderBlocks ; if true, it won't merge text blocks and
+         ** add empty text block if needed through the `renderBlocks()` function.
+         ** @returns {object} this
+         */
         insertNewBlock: function(position, attrs, doNotRenderBlocks) {
             var newBlock = new Block(attrs);
 
@@ -341,8 +342,8 @@ function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q
             });
         },
         /**
-        * Merge text blocks when there are following each other and add empty text block arround embeds if needed
-        */
+         * Merge text blocks when there are following each other and add empty text block arround embeds if needed
+         */
         renderBlocks: function() {
             self.blocks = prepareBlocks(self.blocks);
         },
@@ -373,9 +374,9 @@ function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q
             return block;
         },
         /**
-        * Compute an id for the block with its content and its position.
-        * Used as `track by` value, it allows the blocks to be well rendered.
-        */
+         * Compute an id for the block with its content and its position.
+         * Used as `track by` value, it allows the blocks to be well rendered.
+         */
         generateBlockId: function(block) {
             function hashCode(string) {
                 var hash = 0, i, chr, len;
@@ -385,8 +386,9 @@ function SdTextEditorController(_, EMBED_PROVIDERS, $timeout, editor, config, $q
                 }
                 for (i = 0, len = string.length; i < len; i++) {
                     chr = string.charCodeAt(i);
-                    /* jshint bitwise: false */
+                    // tslint:disable-next-line:no-bitwise
                     hash = (hash << 5) - hash + chr;
+                    // tslint:disable-next-line:no-bitwise
                     hash |= 0; // Convert to 32bit integer
                 }
                 return hash;
diff --git a/scripts/core/editor2/editor.js b/scripts/core/editor2/editor.ts
similarity index 97%
rename from scripts/core/editor2/editor.js
rename to scripts/core/editor2/editor.ts
index fa941231f7..e9e66020a7 100644
--- a/scripts/core/editor2/editor.js
+++ b/scripts/core/editor2/editor.ts
@@ -85,8 +85,8 @@ function escapeRegExp(string) {
     return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
 
-EditorService.$inject = ['spellcheck', '$q', 'lodash', 'renditions', 'editorUtils'];
-function EditorService(spellcheck, $q, _, renditionsService, utils) {
+EditorService.$inject = ['spellcheck', '$q', 'renditions', 'editorUtils'];
+function EditorService(spellcheck, $q, renditionsService, utils) {
     this.settings = {spellcheck: true};
 
     this.version = () => '2';
@@ -432,7 +432,7 @@ function EditorService(spellcheck, $q, _, renditionsService, utils) {
                         var oldSettings = angular.extend({}, self.settings);
                         var caretPosition = scope.medium.exportSelection();
 
-                        _.forEach(_.uniq(found), (val) => {
+                        _.forEach(_.uniq(found), (val: string) => {
                             var replacementValue = abbreviations[val.replace('*', '')];
 
                             if (replacementValue) {
@@ -527,7 +527,7 @@ function EditorService(spellcheck, $q, _, renditionsService, utils) {
     ].join('\n');
 
     this.generateMediaTag = function(data) {
-        var mediaTypes = {
+        var mediaTypes: any = {
             video: function() {
                 var videoTag = ['<video controls="controls">'];
 
@@ -602,8 +602,8 @@ function EditorService(spellcheck, $q, _, renditionsService, utils) {
 
         if (window.getSelection) {
             text = window.getSelection().toString();
-        } else if (document.selection && document.selection.type !== 'Control') {
-            text = document.selection.createRange().text;
+        } else if (document['selection'] && document['selection'].type !== 'Control') {
+            text = document['selection'].createRange().text;
         }
         return text;
     };
@@ -671,10 +671,10 @@ function SdTextEditorBlockEmbedController($timeout, editor, renditions, config)
                 return false;
             }
             self.model.loading = true;
-            renditions.crop(picture).then((picture) => {
+            renditions.crop(picture).then((croppedPicture) => {
                 // update block
-                self.model.association = picture;
-                editor.generateMediaTag(picture).then((img) => {
+                self.model.association = croppedPicture;
+                editor.generateMediaTag(croppedPicture).then((img) => {
                     self.model.body = img;
                 });
                 // update caption
@@ -758,7 +758,7 @@ angular.module('superdesk.apps.editor2', [
                     ];
 
                     let getType = (event) => MEDIA_TYPES.find(
-                        (_type) => event.originalEvent.dataTransfer.types.indexOf(_type) >= 0
+                        (_type) => event.originalEvent.dataTransfer.types.indexOf(_type) >= 0,
                     );
 
                     element.on('drop dragdrop', (event) => {
@@ -839,7 +839,7 @@ angular.module('superdesk.apps.editor2', [
                 },
             };
         }])
-    .directive('sdTextEditor', ['$timeout', 'lodash', function($timeout, _) {
+    .directive('sdTextEditor', ['$timeout', function($timeout) {
         return {
             scope: {type: '=', config: '=', editorformat: '=', language: '=', associations: '=?'},
             require: ['sdTextEditor', 'ngModel'],
@@ -886,7 +886,7 @@ angular.module('superdesk.apps.editor2', [
             controllerAs: 'vm',
             bindToController: true,
             controller: SdTextEditorBlockEmbedController,
-        })
+        }),
     )
     .directive('sdTextEditorBlockText', ['editor', 'spellcheck', '$timeout',
         '$q', 'config', '$rootScope',
@@ -957,14 +957,14 @@ angular.module('superdesk.apps.editor2', [
                     selection = window.getSelection();
 
                 if (selection.anchorNode.nodeType === Node.TEXT_NODE) {
-                    var text = selection.anchorNode.wholeText.substring(0, selection.anchorOffset);
+                    var text = selection.anchorNode['wholeText'].substring(0, selection.anchorOffset);
                     var node = selection.anchorNode;
 
                     column = text.length + 1;
                     while (node.nodeName !== 'P') {
                         if (node.previousSibling) {
-                            column += node.previousSibling.wholeText ?
-                                node.previousSibling.wholeText.length :
+                            column += node.previousSibling['wholeText'] ?
+                                node.previousSibling['wholeText'].length :
                                 node.previousSibling.textContent.length;
                             node = node.previousSibling;
                         } else {
@@ -1181,8 +1181,8 @@ angular.module('superdesk.apps.editor2', [
                                 scope.medium.subscribe(eventName, updateAddContentButton);
                             });
                         // listen updates by medium editor to update the model
-                        scope.medium.subscribe('editableInput', (e, elem) => {
-                            elem.querySelectorAll('span[style]').forEach((span) => {
+                        scope.medium.subscribe('editableInput', (e, element) => {
+                            element.querySelectorAll('span[style]').forEach((span) => {
                                 span.before(span.firstChild);
                                 span.remove();
                             });
@@ -1207,16 +1207,16 @@ angular.module('superdesk.apps.editor2', [
                         });
 
                         // hide toolbar if element is under header
-                        scope.medium.subscribe('positionedToolbar', (e, elem) => {
+                        scope.medium.subscribe('positionedToolbar', (e, element) => {
                             var toolbar = scope.medium.getExtensionByName('toolbar'),
-                                elemPosition = elem.getBoundingClientRect();
+                                elemPosition = element.getBoundingClientRect();
 
                             if (toolbar) {
                                 toolbar.toolbar.hidden = elemPosition.top + elemPosition.height < TOP_OFFSET;
                             }
                         });
 
-                        function cancelTimeout(event) {
+                        function cancelTimeout(event?) {
                             $timeout.cancel(updateTimeout);
                             startTyping();
                         }
@@ -1333,7 +1333,7 @@ angular.module('superdesk.apps.editor2', [
                                     });
 
                                     scope.suggestions = suggestions.filter((suggestion) =>
-                                        suggestion.key !== scope.replaceWord
+                                        suggestion.key !== scope.replaceWord,
                                     );
                                 } else {
                                     scope.suggestions = suggestions;
@@ -1416,8 +1416,8 @@ angular.module('superdesk.apps.editor2', [
                         scope.node.parentNode.classList.remove(TYPING_CLASS);
                     }
                 },
-                controller: ['$scope', 'editor', 'api', 'superdesk', 'renditions', 'config',
-                    function(scope, editor, api, superdesk, renditions, config) {
+                controller: ['$scope', 'api', 'superdesk', 'renditions',
+                    function(scope, api, superdesk, renditions) {
                         var self = this;
 
                         angular.extend(self, {
@@ -1478,11 +1478,11 @@ angular.module('superdesk.apps.editor2', [
                                             return media;
                                         }
                                         return renditions.ingest(media);
-                                    })()).then((media) => {
-                                        editor.generateMediaTag(media).then((imgTag) => {
+                                    })()).then((mediaObject) => {
+                                        editor.generateMediaTag(mediaObject).then((imgTag) => {
                                             angular.extend(block, {
                                                 body: imgTag,
-                                                association: media,
+                                                association: mediaObject,
                                                 loading: false,
                                             });
                                             $timeout(self.sdEditorCtrl.commitChanges);
diff --git a/scripts/core/editor2/embedCodeHandlers.ts b/scripts/core/editor2/embedCodeHandlers.ts
index 4d1aff324c..1c4670931b 100644
--- a/scripts/core/editor2/embedCodeHandlers.ts
+++ b/scripts/core/editor2/embedCodeHandlers.ts
@@ -1,5 +1,5 @@
 
-module.exports = [
+export default [
     ['EMBED_PROVIDERS', function(EMBED_PROVIDERS) {
         return {
             pattern: /twitter\.com\/widgets\.js/g,
diff --git a/scripts/core/editor3/actions/tests/toolbar.spec.tsx b/scripts/core/editor3/actions/tests/toolbar.spec.tsx
index 396c3833c9..7400fb9db4 100644
--- a/scripts/core/editor3/actions/tests/toolbar.spec.tsx
+++ b/scripts/core/editor3/actions/tests/toolbar.spec.tsx
@@ -1,7 +1,7 @@
 import {cropImage, insertMedia} from '..';
 
 describe('editor3.actions.toolbar', () => {
-    beforeEach(window['module'](($provide) => {
+    beforeEach(window.module(($provide) => {
         $provide.service('superdesk', ($q) => ({
             intent: jasmine.createSpy().and.returnValue($q.when('media_list')),
         }));
diff --git a/scripts/core/editor3/components/Editor3.tsx b/scripts/core/editor3/components/Editor3.tsx
index e5006cbaf2..52a25362a3 100644
--- a/scripts/core/editor3/components/Editor3.tsx
+++ b/scripts/core/editor3/components/Editor3.tsx
@@ -52,4 +52,4 @@ const mapDispatchToProps = (dispatch) => ({
     onCreateChangeStyleSuggestion: (type, active) => dispatch(actions.createChangeStyleSuggestion(type, active)),
 });
 
-export const Editor3: React.StatelessComponent<any> = connect(mapStateToProps, mapDispatchToProps)(Editor3Base);
+export const Editor3 = connect(mapStateToProps, mapDispatchToProps)(Editor3Base);
diff --git a/scripts/core/editor3/components/Editor3Component.tsx b/scripts/core/editor3/components/Editor3Component.tsx
index 44059734a9..b27270a86c 100644
--- a/scripts/core/editor3/components/Editor3Component.tsx
+++ b/scripts/core/editor3/components/Editor3Component.tsx
@@ -352,7 +352,7 @@ export class Editor3Component extends React.Component<any, any> {
 
     componentDidUpdate() {
         if (window.hasOwnProperty('instgrm')) {
-            window['instgrm'].Embeds.process();
+            window.instgrm.Embeds.process();
         }
     }
 
diff --git a/scripts/core/editor3/components/annotations/AnnotationInput.tsx b/scripts/core/editor3/components/annotations/AnnotationInput.tsx
index 30005f6399..697580b017 100644
--- a/scripts/core/editor3/components/annotations/AnnotationInput.tsx
+++ b/scripts/core/editor3/components/annotations/AnnotationInput.tsx
@@ -200,6 +200,6 @@ const AnnotationInputBodyWithDependenciesLoaded = connectPromiseResults(() => ({
         .then(() => ng.get('metadata').values.annotation_types),
 }))(AnnotationInputBody);
 
-export const AnnotationInput: React.StatelessComponent<any> = connect(mapStateToProps, {
+export const AnnotationInput = connect(mapStateToProps, {
     hidePopups,
 })(AnnotationInputBodyWithDependenciesLoaded);
diff --git a/scripts/core/editor3/components/annotations/AnnotationPopup.tsx b/scripts/core/editor3/components/annotations/AnnotationPopup.tsx
index 8a19905aea..3f22dbe5bd 100644
--- a/scripts/core/editor3/components/annotations/AnnotationPopup.tsx
+++ b/scripts/core/editor3/components/annotations/AnnotationPopup.tsx
@@ -92,7 +92,7 @@ const AnnotationWithDependenciesLoaded = connectPromiseResults(() => ({
         .then(() => ng.get('metadata').values.annotation_types),
 }))(Annotation);
 
-export const AnnotationPopup: React.StatelessComponent<any> = connect(
+export const AnnotationPopup = connect(
     () => ({}),
     {showPopup},
 )(AnnotationWithDependenciesLoaded);
diff --git a/scripts/core/editor3/components/comments/CommentInput.tsx b/scripts/core/editor3/components/comments/CommentInput.tsx
index ea55d903de..8f69c70af5 100644
--- a/scripts/core/editor3/components/comments/CommentInput.tsx
+++ b/scripts/core/editor3/components/comments/CommentInput.tsx
@@ -102,6 +102,6 @@ CommentInputBody.propTypes = {
     highlightsManager: PropTypes.object.isRequired,
 };
 
-export const CommentInput: React.StatelessComponent<any> = connect(null, {
+export const CommentInput = connect(null, {
     hidePopups,
 })(CommentInputBody);
diff --git a/scripts/core/editor3/components/embeds/EmbedBlock.tsx b/scripts/core/editor3/components/embeds/EmbedBlock.tsx
index 2f49e51eab..b86858aee1 100644
--- a/scripts/core/editor3/components/embeds/EmbedBlock.tsx
+++ b/scripts/core/editor3/components/embeds/EmbedBlock.tsx
@@ -181,4 +181,4 @@ const mapDispatchToProps = (dispatch) => ({
         dispatch(actions.mergeEntityDataByKey(blockKey, entityKey, valuesToMerge)),
 });
 
-export const EmbedBlock: React.StatelessComponent<any> = connect(null, mapDispatchToProps)(EmbedBlockComponent);
+export const EmbedBlock = connect(null, mapDispatchToProps)(EmbedBlockComponent);
diff --git a/scripts/core/editor3/components/embeds/EmbedInput.tsx b/scripts/core/editor3/components/embeds/EmbedInput.tsx
index cc03f663e1..c8f4e3e6dd 100644
--- a/scripts/core/editor3/components/embeds/EmbedInput.tsx
+++ b/scripts/core/editor3/components/embeds/EmbedInput.tsx
@@ -155,7 +155,7 @@ EmbedInputComponent.propTypes = {
     hidePopups: PropTypes.func.isRequired,
 };
 
-export const EmbedInput: React.StatelessComponent<any> = connect(null, {
+export const EmbedInput = connect(null, {
     embed,
     hidePopups,
 })(EmbedInputComponent);
diff --git a/scripts/core/editor3/components/embeds/loadIframely.tsx b/scripts/core/editor3/components/embeds/loadIframely.tsx
index 684d8300c7..7b2c362769 100644
--- a/scripts/core/editor3/components/embeds/loadIframely.tsx
+++ b/scripts/core/editor3/components/embeds/loadIframely.tsx
@@ -21,7 +21,7 @@ function importIframelyEmbedJs() {
 
 export function loadIframelyEmbedJs() {
     importIframelyEmbedJs().then(() => {
-        const iframely = window['iframely'] = window['iframely'] || {};
+        const iframely = window.iframely = window.iframely || {};
         const widgets = iframely.widgets = iframely.widgets || {};
 
         if (widgets.load) {
diff --git a/scripts/core/editor3/components/links/LinkInput.tsx b/scripts/core/editor3/components/links/LinkInput.tsx
index 99f58a4ec6..7baab2c42c 100644
--- a/scripts/core/editor3/components/links/LinkInput.tsx
+++ b/scripts/core/editor3/components/links/LinkInput.tsx
@@ -231,7 +231,7 @@ const LinkInputComponentWithDependenciesLoaded = connectPromiseResults(() => ({
         .then(() => ng.get('metadata').values.local_domains),
 }))(LinkInputComponent);
 
-export const LinkInput: React.StatelessComponent<any> = connect(mapStateToProps, {
+export const LinkInput = connect(mapStateToProps, {
     applyLink,
     hidePopups,
     createLinkSuggestion,
diff --git a/scripts/core/editor3/components/links/LinkToolbar.tsx b/scripts/core/editor3/components/links/LinkToolbar.tsx
index f577870e6e..a0b9946f14 100644
--- a/scripts/core/editor3/components/links/LinkToolbar.tsx
+++ b/scripts/core/editor3/components/links/LinkToolbar.tsx
@@ -72,7 +72,7 @@ const mapDispatchToProps = (dispatch) => ({
     removeLinkSuggestion: () => dispatch(actions.removeLinkSuggestion()),
 });
 
-export const LinkToolbar: React.StatelessComponent<any> = connect(
+export const LinkToolbar = connect(
     mapStateToProps,
     mapDispatchToProps,
 )(LinkToolbarComponent);
diff --git a/scripts/core/editor3/components/media/MediaBlock.tsx b/scripts/core/editor3/components/media/MediaBlock.tsx
index d297fdaeaf..9c96ec9813 100644
--- a/scripts/core/editor3/components/media/MediaBlock.tsx
+++ b/scripts/core/editor3/components/media/MediaBlock.tsx
@@ -360,7 +360,7 @@ const mapDispatchToProps = (dispatch) => ({
     setLocked: () => dispatch(actions.setLocked(true)),
 });
 
-export const MediaBlock: React.StatelessComponent<any> = connect(
+export const MediaBlock = connect(
     mapStateToProps,
     mapDispatchToProps,
 )(MediaBlockComponent);
diff --git a/scripts/core/editor3/components/spellchecker/SpellcheckerContextMenu.tsx b/scripts/core/editor3/components/spellchecker/SpellcheckerContextMenu.tsx
index cdad4c1564..212a247977 100644
--- a/scripts/core/editor3/components/spellchecker/SpellcheckerContextMenu.tsx
+++ b/scripts/core/editor3/components/spellchecker/SpellcheckerContextMenu.tsx
@@ -127,7 +127,7 @@ const mapDispatchToProps = (dispatch) => ({
     replaceWord: (word) => setTimeout(() => dispatch(actions.replaceWord(word)), 0),
 });
 
-export const SpellcheckerContextMenu: React.StatelessComponent<any> = connect(
+export const SpellcheckerContextMenu = connect(
     null,
     mapDispatchToProps,
 )(SpellcheckerContextMenuComponent);
diff --git a/scripts/core/editor3/components/suggestions/SuggestionPopup.tsx b/scripts/core/editor3/components/suggestions/SuggestionPopup.tsx
index b3e7b67167..8c4d64985d 100644
--- a/scripts/core/editor3/components/suggestions/SuggestionPopup.tsx
+++ b/scripts/core/editor3/components/suggestions/SuggestionPopup.tsx
@@ -171,7 +171,7 @@ Suggestion.propTypes = {
     editorNode: PropTypes.object,
 };
 
-export const SuggestionPopup: React.StatelessComponent<any> = connect(null, {
+export const SuggestionPopup = connect(null, {
     acceptSuggestion,
     rejectSuggestion,
 })(Suggestion);
diff --git a/scripts/core/editor3/components/tables/TableBlock.tsx b/scripts/core/editor3/components/tables/TableBlock.tsx
index 61cbe39042..040bc8006e 100644
--- a/scripts/core/editor3/components/tables/TableBlock.tsx
+++ b/scripts/core/editor3/components/tables/TableBlock.tsx
@@ -166,7 +166,7 @@ const mapStateToProps = (state) => ({
     activeCell: state.activeCell,
 });
 
-export const TableBlock: React.StatelessComponent<any> = connect(
+export const TableBlock = connect(
     mapStateToProps,
     mapDispatchToProps,
 )(TableBlockComponent);
diff --git a/scripts/core/editor3/components/tests/embeds.spec.tsx b/scripts/core/editor3/components/tests/embeds.spec.tsx
index 7905b70d2c..ef0858fe4c 100644
--- a/scripts/core/editor3/components/tests/embeds.spec.tsx
+++ b/scripts/core/editor3/components/tests/embeds.spec.tsx
@@ -15,7 +15,7 @@ describe('editor3.components.embed-block', () => {
 });
 
 describe('editor3.components.embed-input', () => {
-    beforeEach(window['module'](($provide) => {
+    beforeEach(window.module(($provide) => {
         $provide.constant('config', {iframely: {key: 'key'}});
     }));
 
diff --git a/scripts/core/editor3/components/tests/spellchecker.spec.tsx b/scripts/core/editor3/components/tests/spellchecker.spec.tsx
index decc0e7605..aeeb4d0404 100644
--- a/scripts/core/editor3/components/tests/spellchecker.spec.tsx
+++ b/scripts/core/editor3/components/tests/spellchecker.spec.tsx
@@ -18,7 +18,7 @@ describe('editor3.components.spellchecker-decorator', () => {
         return mount(<SpellcheckerError children={children} />, options);
     }
 
-    beforeEach(window['module'](($provide) => {
+    beforeEach(window.module(($provide) => {
         $provide.service('spellcheck', ($q) => ({
             suggest: jasmine.createSpy().and.returnValue($q.when(['this', 'tish', 'fish'])),
         }));
@@ -88,7 +88,7 @@ describe('editor3.components.spellchecker-context-menu', () => {
         {value: 'three', key: 'threeKey'},
     ];
 
-    beforeEach(window['module'](($provide) => {
+    beforeEach(window.module(($provide) => {
         $provide.service('spellcheck', ($q) => ({
             addWord: jasmine.createSpy().and.returnValue(null),
         }));
diff --git a/scripts/core/editor3/directive.js b/scripts/core/editor3/directive.tsx
similarity index 88%
rename from scripts/core/editor3/directive.js
rename to scripts/core/editor3/directive.tsx
index ec5b71cfe8..177dcc5532 100644
--- a/scripts/core/editor3/directive.js
+++ b/scripts/core/editor3/directive.tsx
@@ -25,6 +25,27 @@ import ng from 'core/services/ng';
 export const sdEditor3 = () => new Editor3Directive();
 
 class Editor3Directive {
+    scope: any;
+    controllerAs: any;
+    controller: any;
+    bindToController: any;
+    item: any;
+    language: any;
+    readOnly: any;
+    findReplaceTarget: any;
+    singleLine: any;
+    debounce: any;
+    disableSpellchecker: any;
+    bindToValue: any;
+    tabindex: any;
+    showTitle: any;
+    $rootScope: any;
+    $scope: any;
+    svc: any;
+    pathToValue: any;
+    scrollContainer: any;
+    refreshTrigger: any;
+
     constructor() {
         this.scope = {};
         this.controllerAs = 'vm';
@@ -169,16 +190,18 @@ class Editor3Directive {
         const store = createEditorStore(this);
 
         // bind the directive value attribute bi-directionally between Angular and Redux.
-        this.bindToValue && $scope.$watch('vm.value', (newValue, oldValue) => {
-            const text = (newValue || '')
-                .replace(/<ins/g, '<code')
-                .replace(/<\/ins>/g, '</code>');
-            const content = getContentStateFromHtml(text);
-            const state = store.getState();
-            const editorState = EditorState.push(state.editorState, content, 'insert-characters');
+        if (this.bindToValue) {
+            $scope.$watch('vm.value', (newValue, oldValue) => {
+                const text = (newValue || '')
+                    .replace(/<ins/g, '<code')
+                    .replace(/<\/ins>/g, '</code>');
+                const content = getContentStateFromHtml(text);
+                const state = store.getState();
+                const editorState = EditorState.push(state.editorState, content, 'insert-characters');
 
-            store.dispatch(changeEditorState(editorState));
-        });
+                store.dispatch(changeEditorState(editorState));
+            });
+        }
 
         // bind the directive refreshTrigger attribute bi-directionally between Angular and Redux.
         $scope.$watch('vm.refreshTrigger', (val, old) => {
@@ -235,7 +258,7 @@ class Editor3Directive {
                         <Editor3
                             scrollContainer={this.scrollContainer}
                             singleLine={this.singleLine} />
-                    </Provider>, $element.get(0)
+                    </Provider>, $element.get(0),
                 );
             });
     }
diff --git a/scripts/core/editor3/helpers/editor3CustomData.spec.js b/scripts/core/editor3/helpers/editor3CustomData.spec.ts
similarity index 89%
rename from scripts/core/editor3/helpers/editor3CustomData.spec.js
rename to scripts/core/editor3/helpers/editor3CustomData.spec.ts
index 580ad5a69d..ad075dc4bd 100644
--- a/scripts/core/editor3/helpers/editor3CustomData.spec.js
+++ b/scripts/core/editor3/helpers/editor3CustomData.spec.ts
@@ -10,8 +10,8 @@ it('should generate ids for annotations in order they appear in the content', ()
     const result = getAnnotationsFromContentState(contentState);
 
     expect(
-        JSON.stringify(ignoreInternalAnnotationFields(result))
+        JSON.stringify(ignoreInternalAnnotationFields(result)),
     ).toBe(
-        JSON.stringify(ignoreInternalAnnotationFields(outputJson))
+        JSON.stringify(ignoreInternalAnnotationFields(outputJson)),
     );
-});
\ No newline at end of file
+});
diff --git a/scripts/core/editor3/helpers/editor3CustomData.js b/scripts/core/editor3/helpers/editor3CustomData.ts
similarity index 97%
rename from scripts/core/editor3/helpers/editor3CustomData.js
rename to scripts/core/editor3/helpers/editor3CustomData.ts
index 4e32ee9d93..7f77b8aaad 100644
--- a/scripts/core/editor3/helpers/editor3CustomData.js
+++ b/scripts/core/editor3/helpers/editor3CustomData.ts
@@ -26,7 +26,7 @@ function getCustomMetadataFromContentState(contentState, highlightType) {
 
     const allStyleNames = getUniqueStyleNamesInDraftSelection(
         editorState,
-        getDraftSelectionForEntireContent(editorState)
+        getDraftSelectionForEntireContent(editorState),
     );
 
     return allStyleNames
@@ -73,7 +73,7 @@ export function setAllCustomDataForEditor(editorState, value) {
     const editorStateWithDataSet = EditorState.push(editorState, content, 'change-block-data');
     const editorStateWithSelectionRestored = EditorState.acceptSelection(
         editorStateWithDataSet,
-        currentSelectionToPreserve
+        currentSelectionToPreserve,
     );
 
     return editorStateWithSelectionRestored;
diff --git a/scripts/core/editor3/helpers/handleBeforeInputHighlights.js b/scripts/core/editor3/helpers/handleBeforeInputHighlights.ts
similarity index 96%
rename from scripts/core/editor3/helpers/handleBeforeInputHighlights.js
rename to scripts/core/editor3/helpers/handleBeforeInputHighlights.ts
index 030e193446..fd08e343a5 100644
--- a/scripts/core/editor3/helpers/handleBeforeInputHighlights.js
+++ b/scripts/core/editor3/helpers/handleBeforeInputHighlights.ts
@@ -6,7 +6,6 @@ import {getDraftCharacterListForSelection} from './getDraftCharacterListForSelec
 import {resizeDraftSelection} from './resizeDraftSelection';
 import {styleNameBelongsToHighlight} from './highlights';
 
-
 /**
  * @ngdoc method
  * @name addCommentsForServer
@@ -15,7 +14,7 @@ import {styleNameBelongsToHighlight} from './highlights';
  * @return {List<CharacterMetadata>}
  */
 function getRelevantCharactersForCollapsedSelection(editorState, collapsedSelection) {
-    let characters = List();
+    let characters: any = List();
     const selectionAtTheStartOfTheLine = editorState.getSelection().getStartOffset() === 0;
     const resizeLeft = selectionAtTheStartOfTheLine ? 2 : 1; // SDESK-2861
 
@@ -60,7 +59,7 @@ export function handleBeforeInputHighlights(onChange, chars, editorState) {
     }
 
     const commonHighlightStyles = allHighlightStyles.filter(
-        (styleName) => characterStyles.every((stylesAtPosition) => stylesAtPosition.includes(styleName))
+        (styleName) => characterStyles.every((stylesAtPosition) => stylesAtPosition.includes(styleName)),
     );
 
     const nextInlineStyles = editorState.getCurrentInlineStyle()
@@ -71,11 +70,11 @@ export function handleBeforeInputHighlights(onChange, chars, editorState) {
         editorState.getCurrentContent(),
         editorState.getSelection(),
         chars,
-        nextInlineStyles
+        nextInlineStyles,
     );
     const nextEditorState = EditorState.push(editorState, nextContentstate, 'insert-characters');
 
     onChange(nextEditorState);
 
     return 'handled';
-}
\ No newline at end of file
+}
diff --git a/scripts/core/editor3/helpers/htmlComesFromDraftjsEditor.spec.js b/scripts/core/editor3/helpers/htmlComesFromDraftjsEditor.spec.ts
similarity index 98%
rename from scripts/core/editor3/helpers/htmlComesFromDraftjsEditor.spec.js
rename to scripts/core/editor3/helpers/htmlComesFromDraftjsEditor.spec.ts
index 3765b772cf..4e9f3c23d5 100644
--- a/scripts/core/editor3/helpers/htmlComesFromDraftjsEditor.spec.js
+++ b/scripts/core/editor3/helpers/htmlComesFromDraftjsEditor.spec.ts
@@ -3,4 +3,4 @@ import input from './htmlComesFromDraftjsEditor.snapshot.input.html';
 
 it('should detect HTML coming from draft-js editor for text copied within single block', () => {
     expect(htmlComesFromDraftjsEditor(input)).toBe(true);
-});
\ No newline at end of file
+});
diff --git a/scripts/core/editor3/helpers/inlineStyles.js b/scripts/core/editor3/helpers/inlineStyles.ts
similarity index 85%
rename from scripts/core/editor3/helpers/inlineStyles.js
rename to scripts/core/editor3/helpers/inlineStyles.ts
index 6493ff287c..97f66db244 100644
--- a/scripts/core/editor3/helpers/inlineStyles.js
+++ b/scripts/core/editor3/helpers/inlineStyles.ts
@@ -23,11 +23,10 @@ export const acceptedInlineStyles = Object.values(inlineStyles);
  * @returns {ContentState}
  */
 
-export function sanitizeContent(editorState, inlineStyles = acceptedInlineStyles) {
+export function sanitizeContent(editorState, styles = acceptedInlineStyles) {
     let contentState = editorState.getCurrentContent();
 
-
-    const ignoreStyle = (style) => inlineStyles.indexOf(style) === -1;
+    const ignoreStyle = (style) => styles.indexOf(style) === -1;
     const getSelection = (block, start, end) => SelectionState.createEmpty(block.getKey()).merge({
         anchorOffset: start,
         focusOffset: end,
@@ -43,23 +42,22 @@ export function sanitizeContent(editorState, inlineStyles = acceptedInlineStyles
                 const selection = getSelection(block, start, end);
                 const inlineStyle = block.getInlineStyleAt(start).find(ignoreStyle);
 
-                contentState = Modifier.removeInlineStyle(contentState, selection, inlineStyle);
-            }
+                contentState = Modifier.removeInlineStyle(contentState, selection as SelectionState, inlineStyle);
+            },
         );
     });
 
     nextEditorState = EditorState.push(
         nextEditorState,
         contentState,
-        'change-inline-style'
+        'change-inline-style',
     );
 
     nextEditorState = EditorState.push(
         nextEditorState,
         contentState,
-        'apply-entity'
+        'apply-entity',
     );
 
     return nextEditorState;
 }
-
diff --git a/scripts/core/editor3/helpers/insertAtomicBlockWithoutEmptyLines.js b/scripts/core/editor3/helpers/insertAtomicBlockWithoutEmptyLines.ts
similarity index 96%
rename from scripts/core/editor3/helpers/insertAtomicBlockWithoutEmptyLines.js
rename to scripts/core/editor3/helpers/insertAtomicBlockWithoutEmptyLines.ts
index be7419eb94..a5d1801bf5 100644
--- a/scripts/core/editor3/helpers/insertAtomicBlockWithoutEmptyLines.js
+++ b/scripts/core/editor3/helpers/insertAtomicBlockWithoutEmptyLines.ts
@@ -2,13 +2,14 @@ import {
     BlockMapBuilder,
     CharacterMetadata,
     ContentBlock,
+    ContentState,
     Modifier,
     EditorState,
     genKey,
 } from 'draft-js';
 import {getAllCustomDataFromEditor, setAllCustomDataForEditor} from './editor3CustomData';
 
-const Immutable = require('immutable');
+import Immutable from 'immutable';
 
 var List = Immutable.List,
     Repeat = Immutable.Repeat;
@@ -58,7 +59,6 @@ function insertAtomicBlockWithoutEmptyLines(editorState, entityKey, character) {
         }));
     }
 
-
     fragmentArray.push(new ContentBlock({
         key: genKey(),
         type: 'atomic',
@@ -88,10 +88,10 @@ function insertAtomicBlockWithoutEmptyLines(editorState, entityKey, character) {
 
     var withAtomicBlock = Modifier.replaceWithFragment(asAtomicBlock, target.selectionState, fragment);
 
-    var newContent = withAtomicBlock.merge({
+    var newContent: ContentState = withAtomicBlock.merge({
         selectionBefore: selectionState,
         selectionAfter: withAtomicBlock.getSelectionAfter().set('hasFocus', true),
-    });
+    }) as ContentState;
 
     const {block: blockKeyForEntity} = newContent.getBlocksAsArray()
         .map((b) => ({entity: b.getEntityAt(0), block: b.getKey()}))
diff --git a/scripts/core/editor3/helpers/removeFormat.js b/scripts/core/editor3/helpers/removeFormat.ts
similarity index 96%
rename from scripts/core/editor3/helpers/removeFormat.js
rename to scripts/core/editor3/helpers/removeFormat.ts
index 05e100867e..5c2926c624 100644
--- a/scripts/core/editor3/helpers/removeFormat.js
+++ b/scripts/core/editor3/helpers/removeFormat.ts
@@ -21,7 +21,7 @@ export function removeInlineStyles(content, styles) {
                 const selection = empty.merge({anchorOffset: start, focusOffset: end});
 
                 styles.forEach((s) => {
-                    contentState = Modifier.removeInlineStyle(contentState, selection, s);
+                    contentState = Modifier.removeInlineStyle(contentState, selection as SelectionState, s);
                 });
             });
     });
@@ -41,7 +41,7 @@ export function removeInlineStylesForSelection(content, selection) {
     const contentWithoutStyles = acceptedInlineStyles.reduce(
         (newContentState, style) =>
             Modifier.removeInlineStyle(newContentState, selection, style),
-        content
+        content,
     );
 
     return contentWithoutStyles;
@@ -90,19 +90,19 @@ export function removeFormatFromState(editorState) {
     const selection = editorState.getSelection();
     const contentWithoutInlineStyles = removeInlineStylesForSelection(
         editorState.getCurrentContent(),
-        selection
+        selection,
     );
     const contentWithoutBlockStyles = removeBlockStyles(
         editorState,
         contentWithoutInlineStyles,
         selection,
-        ['atomic']
+        ['atomic'],
     );
 
     // Push new editor state as only one change so 'UNDO' will change both at the same type
     return EditorState.push(
         editorState,
         contentWithoutBlockStyles,
-        'change-block-type'
+        'change-block-type',
     );
 }
diff --git a/scripts/core/editor3/helpers/selection/selectionIterator.js b/scripts/core/editor3/helpers/selection/selectionIterator.ts
similarity index 96%
rename from scripts/core/editor3/helpers/selection/selectionIterator.js
rename to scripts/core/editor3/helpers/selection/selectionIterator.ts
index 1900de3386..9bd13317ce 100644
--- a/scripts/core/editor3/helpers/selection/selectionIterator.js
+++ b/scripts/core/editor3/helpers/selection/selectionIterator.ts
@@ -47,7 +47,7 @@ export function hasNextSelection(editorState, selection, backward = false) {
     const endBlock = content.getBlockForKey(selection.getEndKey());
 
     if (startBlock == null && backward || endBlock == null && !backward) {
-        throw new Error('The following selection is invalid: ', selection);
+        throw new Error('The following selection is invalid: ' + selection);
     }
 
     if (backward) {
diff --git a/scripts/core/editor3/helpers/tansa.ts b/scripts/core/editor3/helpers/tansa.ts
index f574350a11..a760cb12d6 100644
--- a/scripts/core/editor3/helpers/tansa.ts
+++ b/scripts/core/editor3/helpers/tansa.ts
@@ -50,7 +50,7 @@ export function getTansaHtml(editorState) {
  * @param {String} simpleReplace
  * @returns {EditorState}
  */
-export function setTansaHtml(editorState, html, simpleReplace) {
+export function setTansaHtml(editorState, html, simpleReplace?) {
     let content = editorState.getCurrentContent();
     const blockMap = content.getBlockMap();
     const htmlElement = document.createElement('div');
@@ -173,7 +173,7 @@ function updateText(editorState, content, block, newText, diffMatchPatch, simple
 
         if (diff[0] === 0) {
             if (previousDiff != null) {
-                const _previousText  = previousDiff[1];
+                const _previousText = previousDiff[1];
 
                 newContent = removeText(editorState, newContent, block, offset, _previousText);
             }
@@ -183,21 +183,21 @@ function updateText(editorState, content, block, newText, diffMatchPatch, simple
             if (previousDiff == null) {
                 ({newContent, offset} = insertText(editorState, newContent, block, offset, _text));
             } else {
-                const _previousText  = previousDiff[1];
+                const _previousText = previousDiff[1];
 
-                ({newContent, offset}  =  replaceText(editorState, newContent, block, offset, _previousText, _text));
+                ({newContent, offset} = replaceText(editorState, newContent, block, offset, _previousText, _text));
                 previousDiff = null;
             }
         } else {
             if (previousDiff != null) {
-                const _previousText  = previousDiff[1];
+                const _previousText = previousDiff[1];
 
                 newContent = removeText(editorState, newContent, block, offset, _previousText);
             }
 
             if (simpleReplace === true) {
                 newContent = removeText(editorState, newContent, block, offset, _text);
-            } else  {
+            } else {
                 previousDiff = diff;
             }
         }
@@ -220,6 +220,7 @@ function insertText(editorState, content, block, offset, text) {
     const selection = createSelectionForBlock(editorState, block, offset);
     const newContent = Modifier.insertText(content, selection, text);
 
+    // eslint-disable-next-line
     offset += text.length;
     return {newContent, offset};
 }
@@ -235,7 +236,7 @@ function insertText(editorState, content, block, offset, text) {
  * @param {String} newText
  * @returns {ContentState, Integer}
  */
-function replaceText(editorState, content, block, offset, text, newText)  {
+function replaceText(editorState, content, block, offset, text, newText) {
     const overlapLength = text.length < newText.length ? text.length : newText.length;
     let newContent = content;
 
@@ -248,6 +249,7 @@ function replaceText(editorState, content, block, offset, text, newText)  {
         newContent = Modifier.replaceText(newContent, selection, newCharacter, inlineStyle, entity);
     }
 
+    // eslint-disable-next-line no-param-reassign
     offset += overlapLength;
 
     if (overlapLength < text.length) {
@@ -263,6 +265,7 @@ function replaceText(editorState, content, block, offset, text, newText)  {
         const selection = createSelectionForBlock(editorState, block, offset, extraText.length);
 
         newContent = Modifier.insertText(newContent, selection, extraText, lastInlineStyle, lastEntity);
+        // eslint-disable-next-line no-param-reassign
         offset += extraText.length;
     }
 
diff --git a/scripts/core/editor3/html/from-html/index.js b/scripts/core/editor3/html/from-html/index.ts
similarity index 97%
rename from scripts/core/editor3/html/from-html/index.js
rename to scripts/core/editor3/html/from-html/index.ts
index 9c5cf6205d..4ade9b419d 100644
--- a/scripts/core/editor3/html/from-html/index.js
+++ b/scripts/core/editor3/html/from-html/index.ts
@@ -30,6 +30,14 @@ import {
  * well as accommodate Editor3 custom atomic blocks.
  */
 class HTMLParser {
+    iframes: any;
+    scripts: any;
+    figures: any;
+    tables: any;
+    media: any;
+    associations: any;
+    tree: any;
+
     constructor(html, associations) {
         this.iframes = {};
         this.scripts = {};
@@ -85,7 +93,7 @@ class HTMLParser {
                     // editor2 media support
 
                     const lineAfterFigureClosingTag = node.parentElement.innerHTML.slice(
-                        node.parentElement.innerHTML.indexOf(node.outerHTML) + node.outerHTML.length + 1
+                        node.parentElement.innerHTML.indexOf(node.outerHTML) + node.outerHTML.length + 1,
                     ).match(/.+\n/)[0];
 
                     const embedId = lineAfterFigureClosingTag
@@ -138,14 +146,14 @@ class HTMLParser {
 
         let contentState = ContentState.createFromBlockArray(
             conversionResult.contentBlocks,
-            conversionResult.entityMap
+            conversionResult.entityMap,
         );
 
         contentState = this.processLinks(contentState);
 
         return ContentState.createFromBlockArray(
             contentState.getBlocksAsArray().map(processBlock),
-            contentState.getEntityMap()
+            contentState.getEntityMap(),
         );
     }
 
diff --git a/scripts/core/editor3/html/tests/from-html-snapshot.spec.jsx b/scripts/core/editor3/html/tests/from-html-snapshot.spec.tsx
similarity index 99%
rename from scripts/core/editor3/html/tests/from-html-snapshot.spec.jsx
rename to scripts/core/editor3/html/tests/from-html-snapshot.spec.tsx
index 16ffe8076b..e3bb4c31bd 100644
--- a/scripts/core/editor3/html/tests/from-html-snapshot.spec.jsx
+++ b/scripts/core/editor3/html/tests/from-html-snapshot.spec.tsx
@@ -18,4 +18,3 @@ describe('core.editor3.html.from-html', () => {
         expect(computedResult).toBe(removeKeys(JSON.stringify(expectedResultJson)));
     });
 });
-
diff --git a/scripts/core/editor3/html/tests/from-html.spec.js b/scripts/core/editor3/html/tests/from-html.spec.ts
similarity index 96%
rename from scripts/core/editor3/html/tests/from-html.spec.js
rename to scripts/core/editor3/html/tests/from-html.spec.ts
index b6905eb4cd..683f4283b2 100644
--- a/scripts/core/editor3/html/tests/from-html.spec.js
+++ b/scripts/core/editor3/html/tests/from-html.spec.ts
@@ -1,3 +1,5 @@
+/* eslint-disable max-len */
+/* tslint:disable:max-line-length */
 import {getContentStateFromHtml} from '../from-html';
 import {convertFromRaw} from 'draft-js';
 
@@ -75,7 +77,7 @@ describe('core.editor3.html.from-html', () => {
     xit('should parse editor2 inline styles', () => {
         const {blocks} = blocksFor('<sub>1</sub><sup>2</sup><strike>3</strike>');
 
-        expect(blocks[0].text).toBe('123');
+        expect(blocks[0].getText()).toBe('123');
         expect(blocks[0].getInlineStyleAt(0).toArray()).toEqual(['SUBSCRIPT']);
         expect(blocks[0].getInlineStyleAt(1).toArray()).toEqual(['SUPERSCRIPT']);
         expect(blocks[0].getInlineStyleAt(2).toArray()).toEqual(['STRIKETHROUGH']);
@@ -84,11 +86,10 @@ describe('core.editor3.html.from-html', () => {
     it('should parse editor2 block styles', () => {
         const {blocks} = blocksFor('<pre>text</pre>');
 
-        expect(blocks[0].type).toBe('code-block');
+        expect(blocks[0].getType()).toBe('code-block');
     });
 
     it('should parse Google Docs special paste', () => {
-        // eslint-disable-next-line max-len
         const {blocks} = blocksFor('<b style="font-weight:normal;" id="docs-internal-guid-63c0f3a6-072a-245e-c39d-3f61398cba2c"><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;margin-left: 21.25984251968504pt;text-indent: 14.173228346456693pt;text-align: justify;"><span style="font-size:12pt;font-family:Roboto;color:#333333;background-color:transparent;font-weight:700;font-style:normal;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">bold</span></p><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;margin-left: 21.25984251968504pt;text-indent: 14.173228346456693pt;text-align: justify;"><span style="font-size:12pt;font-family:Roboto;color:#333333;background-color:transparent;font-weight:400;font-style:italic;font-variant:normal;text-decoration:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">italic</span></p><p dir="ltr" style="line-height:1.38;margin-top:0pt;margin-bottom:0pt;margin-left: 21.25984251968504pt;text-indent: 14.173228346456693pt;text-align: justify;"><span style="font-size:12pt;font-family:Roboto;color:#333333;background-color:transparent;font-weight:400;font-style:normal;font-variant:normal;text-decoration:underline;-webkit-text-decoration-skip:none;text-decoration-skip-ink:none;vertical-align:baseline;white-space:pre;white-space:pre-wrap;">underline</span></p><br></b>');
 
         expect(blocks[0].getInlineStyleAt(0).toArray()).toEqual(['BOLD']);
diff --git a/scripts/core/editor3/html/tests/to-html.spec.js b/scripts/core/editor3/html/tests/to-html.spec.ts
similarity index 98%
rename from scripts/core/editor3/html/tests/to-html.spec.js
rename to scripts/core/editor3/html/tests/to-html.spec.ts
index d2573ea52a..cd34e86e0a 100644
--- a/scripts/core/editor3/html/tests/to-html.spec.js
+++ b/scripts/core/editor3/html/tests/to-html.spec.ts
@@ -1,6 +1,6 @@
 import * as testUtils from '../../components/tests/utils';
 import {AtomicBlockParser} from '../to-html';
-import {ContentState, convertToRaw, convertFromRaw} from 'draft-js';
+import {ContentState, convertToRaw, convertFromRaw, RawDraftContentState} from 'draft-js';
 import {BlockInlineStyleWrapper, BlockEntityWrapper, HTMLGenerator} from '../to-html';
 import {OrderedSet as OS} from 'immutable';
 
@@ -134,7 +134,7 @@ describe('core.editor3.html.to-html.HTMLGenerator', () => {
                 entityRanges: [],
             }],
         };
-        const result = new HTMLGenerator(convertFromRaw(rawContentState)).html();
+        const result = new HTMLGenerator(convertFromRaw(rawContentState as RawDraftContentState)).html();
 
         expect(result).toBe('<p>lorem ' +
             '<span annotation-id="1">ipsum</span> ' +
@@ -158,6 +158,7 @@ describe('core.editor3.html.to-html.AtomicBlockParser', () => {
 <!-- EMBED START Image {id: "editor_0"} -->
 <figure>
     <img src="image_href" alt="image_alt_text" />
+    <figcatpion>image_description</figcaption>
 </figure>
 <!-- EMBED END Image {id: "editor_0"} -->
 `);
@@ -305,7 +306,7 @@ describe('core.editor3.html.to-html.BlockEntityWrapper', () => {
         expect(wrapper.tags(ek[1])).toEqual('</a><a href="def">');
         expect(wrapper.tags(ek[1])).toEqual('');
         expect(wrapper.tags(ek[1])).toEqual('');
-        expect(wrapper.tags()).toEqual('</a>');
+        expect(wrapper.tags(null)).toEqual('</a>');
         expect(wrapper.tags(ek[2])).toEqual('<a href="jkl">');
         expect(wrapper.tags(ek[2])).toEqual('');
 
diff --git a/scripts/core/editor3/html/to-html/AtomicBlockParser.js b/scripts/core/editor3/html/to-html/AtomicBlockParser.ts
similarity index 97%
rename from scripts/core/editor3/html/to-html/AtomicBlockParser.js
rename to scripts/core/editor3/html/to-html/AtomicBlockParser.ts
index e5e4150a02..cf5a6dc319 100644
--- a/scripts/core/editor3/html/to-html/AtomicBlockParser.js
+++ b/scripts/core/editor3/html/to-html/AtomicBlockParser.ts
@@ -13,6 +13,10 @@ import * as tableHelpers from 'core/editor3/helpers/table';
  * @param {Array=} disabled A set of disabled elements (ie. ['table'] will ignore tables.
  */
 export class AtomicBlockParser {
+    contentState: any;
+    disabled: any;
+    rawState: any;
+
     constructor(contentState, disabled = []) {
         this.contentState = contentState;
         this.disabled = disabled;
@@ -117,7 +121,8 @@ export class AtomicBlockParser {
         const id = `${type} {id: "editor_${key}"}`;
 
         if (desc) {
-            content + `\n    <figcatpion>${desc}</figcaption>`;
+            // eslint-disable-next-line
+            content += `\n    <figcatpion>${desc}</figcaption>`;
         }
 
         return `
diff --git a/scripts/core/editor3/html/to-html/BlockEntityWrapper.js b/scripts/core/editor3/html/to-html/BlockEntityWrapper.ts
similarity index 96%
rename from scripts/core/editor3/html/to-html/BlockEntityWrapper.js
rename to scripts/core/editor3/html/to-html/BlockEntityWrapper.ts
index 22a1a1c874..e4790f00a4 100644
--- a/scripts/core/editor3/html/to-html/BlockEntityWrapper.js
+++ b/scripts/core/editor3/html/to-html/BlockEntityWrapper.ts
@@ -1,3 +1,4 @@
+import {ContentState} from 'draft-js';
 /**
  * @ngdoc class
  * @name BlockEntityWrapper
@@ -10,6 +11,9 @@
  * character. See the tags method for additional information.
  */
 export class BlockEntityWrapper {
+    activeEntity: any;
+    contentState: ContentState;
+
     constructor(contentState) {
         this.activeEntity = null;
         this.contentState = contentState;
diff --git a/scripts/core/editor3/html/to-html/BlockInlineStyleWrapper.js b/scripts/core/editor3/html/to-html/BlockInlineStyleWrapper.ts
similarity index 97%
rename from scripts/core/editor3/html/to-html/BlockInlineStyleWrapper.js
rename to scripts/core/editor3/html/to-html/BlockInlineStyleWrapper.ts
index 943981cf8f..38e6c6ce58 100644
--- a/scripts/core/editor3/html/to-html/BlockInlineStyleWrapper.js
+++ b/scripts/core/editor3/html/to-html/BlockInlineStyleWrapper.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 /**
  * @type {Object}
  * @name InlineStyleTags
@@ -26,7 +28,10 @@ const InlineStyleTags = {
  * character. See the tags method for additional information.
  */
 export class BlockInlineStyleWrapper {
-    constructor(customInlineStyleTags) {
+    activeStyles: Array<any>;
+    inlineStyleTags: any;
+
+    constructor(customInlineStyleTags?) {
         this.activeStyles = [];
         this.inlineStyleTags = Object.assign({}, InlineStyleTags, customInlineStyleTags);
     }
diff --git a/scripts/core/editor3/html/to-html/HTMLGenerator.js b/scripts/core/editor3/html/to-html/HTMLGenerator.ts
similarity index 96%
rename from scripts/core/editor3/html/to-html/HTMLGenerator.js
rename to scripts/core/editor3/html/to-html/HTMLGenerator.ts
index 5963ed8577..45b56d2c35 100644
--- a/scripts/core/editor3/html/to-html/HTMLGenerator.js
+++ b/scripts/core/editor3/html/to-html/HTMLGenerator.ts
@@ -1,3 +1,4 @@
+import {ContentState, ContentBlock} from 'draft-js';
 import {BlockEntityWrapper} from '.';
 import {BlockInlineStyleWrapper} from '.';
 import {AtomicBlockParser} from '.';
@@ -31,6 +32,13 @@ const BlockStyleTags = {
  * tables.
  */
 export class HTMLGenerator {
+    contentState: ContentState;
+    listTags: Array<any>;
+    lastDepth: number;
+    atomicBlockParser: AtomicBlockParser;
+    blocks: Array<ContentBlock>;
+    annotationIndexesByStyleName: any;
+
     constructor(contentState, disabled = []) {
         this.contentState = contentState;
         this.listTags = [];
diff --git a/scripts/core/editor3/store/index.js b/scripts/core/editor3/store/index.ts
similarity index 92%
rename from scripts/core/editor3/store/index.js
rename to scripts/core/editor3/store/index.ts
index ed0e5f8796..72b8f97101 100644
--- a/scripts/core/editor3/store/index.js
+++ b/scripts/core/editor3/store/index.ts
@@ -2,12 +2,12 @@ import {EditorState, convertFromRaw, convertToRaw, ContentState} from 'draft-js'
 import {createStore, applyMiddleware} from 'redux';
 import {createLogger} from 'redux-logger';
 import thunk from 'redux-thunk';
-import {pick, get} from 'lodash';
+import {pick, get, debounce} from 'lodash';
 
 import {toHTML} from 'core/editor3/html';
 import ng from 'core/services/ng';
 
-import {Editor3} from '../components/Editor3';
+import {Editor3, Editor3Base} from '../components/Editor3';
 import {PopupTypes, forceUpdate, setAbbreviations} from '../actions';
 import {fieldsMetaKeys, setFieldMetadata, getFieldMetadata, FIELD_KEY_SEPARATOR} from '../helpers/fieldsMeta';
 import {getContentStateFromHtml} from '../html/from-html';
@@ -21,7 +21,7 @@ import reducers from '../reducers';
 
 export const ignoreInternalAnnotationFields = (annotations) =>
     annotations.map(
-        (annotation) => pick(annotation, ['id', 'type', 'body'])
+        (annotation) => pick(annotation, ['id', 'type', 'body']),
     );
 
 export const isEditorPlainText = (props) => props.singleLine || (props.editorFormat || []).length === 0;
@@ -43,10 +43,10 @@ export default function createEditorStore(props, isReact = false) {
     const dict = spellcheck.getDict();
     const content = getInitialContent(props);
 
-    const decorators = Editor3.getDecorator(props.disableSpellchecker || !spellcheck.isAutoSpellchecker);
+    const decorators = Editor3Base.getDecorator(props.disableSpellchecker || !spellcheck.isAutoSpellchecker);
     const showToolbar = !isEditorPlainText(props);
 
-    const onChangeValue = isReact ? props.onChange : _.debounce(onChange.bind(props), props.debounce);
+    const onChangeValue = isReact ? props.onChange : debounce(onChange.bind(props), props.debounce);
 
     const middlewares = [thunk];
 
@@ -77,7 +77,6 @@ export default function createEditorStore(props, isReact = false) {
         abbreviations: {},
     }, applyMiddleware(...middlewares));
 
-
     // after we have the dictionary, force update the editor to highlight typos
     dict.finally(() => store.dispatch(forceUpdate()));
 
@@ -95,7 +94,7 @@ export default function createEditorStore(props, isReact = false) {
  */
 function generateAnnotations(item) {
     item.annotations = ignoreInternalAnnotationFields(
-        getAnnotationsFromItem(item, 'body_html')
+        getAnnotationsFromItem(item, 'body_html'),
     );
 }
 
@@ -117,7 +116,7 @@ export function onChange(contentState, {plainText = false} = {}) {
     const decorativeStyles = ['HIGHLIGHT', 'HIGHLIGHT_STRONG'];
     const contentStateCleaned = removeInlineStyles(contentState, decorativeStyles);
     const contentStateHighlightsReadyForExport = prepareHighlightsForExport(
-        EditorState.createWithContent(contentStateCleaned)
+        EditorState.createWithContent(contentStateCleaned),
     ).getCurrentContent();
     const rawState = convertToRaw(contentStateHighlightsReadyForExport);
 
@@ -125,7 +124,7 @@ export function onChange(contentState, {plainText = false} = {}) {
         this.item,
         pathToValue,
         fieldsMetaKeys.draftjsState,
-        rawState
+        rawState,
     );
 
     if (pathToValue === 'body_html') {
@@ -170,7 +169,7 @@ export function getInitialContent(props) {
     // support standalone instance of editor3 which is not connected to item field
     if (props.editorState != null) {
         var contentState = convertFromRaw(
-            (props.editorState instanceof Array) ? props.editorState[0] : props.editorState
+            (props.editorState instanceof Array) ? props.editorState[0] : props.editorState,
         );
 
         return initializeHighlights(EditorState.createWithContent(contentState)).getCurrentContent();
@@ -179,13 +178,13 @@ export function getInitialContent(props) {
     const draftjsRawState = getFieldMetadata(
         props.item,
         props.pathToValue,
-        fieldsMetaKeys.draftjsState
+        fieldsMetaKeys.draftjsState,
     );
 
     if (draftjsRawState != null) {
-        let contentState = convertFromRaw(draftjsRawState);
+        let initialContent = convertFromRaw(draftjsRawState);
 
-        return initializeHighlights(EditorState.createWithContent(contentState)).getCurrentContent();
+        return initializeHighlights(EditorState.createWithContent(initialContent)).getCurrentContent();
     }
 
     if (props.value) {
diff --git a/scripts/core/editor3/store/tests/store.spec.tsx b/scripts/core/editor3/store/tests/store.spec.tsx
index 3bf5cc096f..537ece6f65 100644
--- a/scripts/core/editor3/store/tests/store.spec.tsx
+++ b/scripts/core/editor3/store/tests/store.spec.tsx
@@ -1,7 +1,7 @@
 import createEditorStore from '..';
 
 describe('editor3.store', () => {
-    beforeEach(window['module'](($provide) => {
+    beforeEach(window.module(($provide) => {
         $provide.service('spellcheck', ($q) => ({
             setLanguage: jasmine.createSpy(),
             getDict: jasmine.createSpy().and.returnValue($q.when(null)),
diff --git a/scripts/core/editor3/tests/editor3core.spec.tsx b/scripts/core/editor3/tests/editor3core.spec.tsx
index ce18da99ee..1f184f6a3c 100644
--- a/scripts/core/editor3/tests/editor3core.spec.tsx
+++ b/scripts/core/editor3/tests/editor3core.spec.tsx
@@ -1,5 +1,5 @@
 describe('editor3.service', () => {
-    beforeEach(window['module']('superdesk.core.editor3'));
+    beforeEach(window.module('superdesk.core.editor3'));
 
     it('should implement editor2 find & replace interface', inject((editor3) => {
         [
diff --git a/scripts/core/elastic/es.js b/scripts/core/elastic/es.ts
similarity index 96%
rename from scripts/core/elastic/es.js
rename to scripts/core/elastic/es.ts
index 8dc78e122d..c7dc3d7abd 100644
--- a/scripts/core/elastic/es.js
+++ b/scripts/core/elastic/es.ts
@@ -27,7 +27,7 @@ angular.module('superdesk.core.elastic').service('es', [function() {
      * @returns {Object}
      */
     function buildQuery(params, filters) {
-        var query = {filtered: {}};
+        var query: any = {filtered: {}};
 
         if (filters && filters.length) {
             query.filtered.filter = {and: filters};
diff --git a/scripts/core/filters/index.js b/scripts/core/filters/index.ts
similarity index 98%
rename from scripts/core/filters/index.js
rename to scripts/core/filters/index.ts
index d01cdec67c..7e8a0a6c22 100644
--- a/scripts/core/filters/index.js
+++ b/scripts/core/filters/index.ts
@@ -1,9 +1,7 @@
+import _ from 'lodash';
 import {stripHtmlTags} from '../utils';
 
 export default angular.module('superdesk.core.filters', [])
-    .filter('any', () => function(data, key) {
-        return _.any(data, key);
-    })
     .filter('body', () => function(content) {
         var lines = $(content);
         var texts = [];
@@ -18,7 +16,7 @@ export default angular.module('superdesk.core.filters', [])
 
         return texts.join('\n');
     })
-    .filter('mergeWords', ['lodash', function(_) {
+    .filter('mergeWords', [function() {
         return function(array, propertyName, schemeName, returnArray) {
             var subjectMerged = [];
 
@@ -114,7 +112,7 @@ export default angular.module('superdesk.core.filters', [])
             } else if (input === 'error') {
                 return 'danger';
             }
-        }
+        },
     )
     .filter('mergeTargets', () => function(array) {
         var merged = [];
diff --git a/scripts/core/global-fixes/open-external-links-in-new-tab.js b/scripts/core/global-fixes/open-external-links-in-new-tab.js
deleted file mode 100644
index 77ea3ab85d..0000000000
--- a/scripts/core/global-fixes/open-external-links-in-new-tab.js
+++ /dev/null
@@ -1,29 +0,0 @@
-function isLinkExternal(href) {
-    try {
-        const url = new URL(href);
-
-        // Check if the hosts are different and protocol is http or https
-        return url.host !== window.location.host && ['http:', 'https:'].includes(url.protocol);
-    } catch (e) {
-        // will throw if string is not a valid link
-        return false;
-    }
-}
-
-document.addEventListener('click', (event) => {
-    if (
-        event != null
-        && event.target != null
-        && event.target.tagName === 'A'
-        && isLinkExternal(event.target.href)
-    ) {
-        event.preventDefault();
-        event.stopPropagation();
-
-        // security https://mathiasbynens.github.io/rel-noopener/
-        var nextWindow = window.open();
-
-        nextWindow.opener = null;
-        nextWindow.location = event.target.href;
-    }
-});
\ No newline at end of file
diff --git a/scripts/core/global-fixes/open-external-links-in-new-tab.ts b/scripts/core/global-fixes/open-external-links-in-new-tab.ts
new file mode 100644
index 0000000000..b27edb3007
--- /dev/null
+++ b/scripts/core/global-fixes/open-external-links-in-new-tab.ts
@@ -0,0 +1,28 @@
+function isLinkExternal(href) {
+    try {
+        const url = new URL(href);
+
+        // Check if the hosts are different and protocol is http or https
+        return url.host !== window.location.host && ['http:', 'https:'].includes(url.protocol);
+    } catch (e) {
+        // will throw if string is not a valid link
+        return false;
+    }
+}
+
+document.addEventListener('click', (event) => {
+    if (event != null) {
+        const target = event.target as HTMLAnchorElement;
+
+        if (target && target.tagName === 'A' && isLinkExternal(target.href)) {
+            event.preventDefault();
+            event.stopPropagation();
+
+            // security https://mathiasbynens.github.io/rel-noopener/
+            var nextWindow = window.open();
+
+            nextWindow.opener = null;
+            nextWindow.location.href = target.href;
+        }
+    }
+});
diff --git a/scripts/core/helpers/dom/onEveryAnimationFrame.js b/scripts/core/helpers/dom/onEveryAnimationFrame.ts
similarity index 95%
rename from scripts/core/helpers/dom/onEveryAnimationFrame.js
rename to scripts/core/helpers/dom/onEveryAnimationFrame.ts
index ad76a1f7c9..e163d51c33 100644
--- a/scripts/core/helpers/dom/onEveryAnimationFrame.js
+++ b/scripts/core/helpers/dom/onEveryAnimationFrame.ts
@@ -2,6 +2,8 @@ export class OnEveryAnimationFrame {
     // only use this with callbacks which are not resource intensive(<5ms)
     // don't forget to `destroy` when finished
 
+    lastTimer: number;
+
     constructor(callback) {
         this.lastTimer = 0; // dummy value for initial check
         this.loop(callback);
@@ -18,4 +20,4 @@ export class OnEveryAnimationFrame {
         window.cancelAnimationFrame(this.lastTimer);
         this.lastTimer = null;
     }
-}
\ No newline at end of file
+}
diff --git a/scripts/core/helpers/dom/stickElementsWithTracking.js b/scripts/core/helpers/dom/stickElementsWithTracking.ts
similarity index 92%
rename from scripts/core/helpers/dom/stickElementsWithTracking.js
rename to scripts/core/helpers/dom/stickElementsWithTracking.ts
index c0251d97a5..f43a005368 100644
--- a/scripts/core/helpers/dom/stickElementsWithTracking.js
+++ b/scripts/core/helpers/dom/stickElementsWithTracking.ts
@@ -1,8 +1,9 @@
 import {stickElements} from './stickElements';
 import {OnEveryAnimationFrame} from './onEveryAnimationFrame';
 
-
 export class StickElementsWithTracking {
+    animationManager: OnEveryAnimationFrame;
+
     constructor(target, source) {
         let preferredPosition = {};
 
@@ -17,4 +18,4 @@ export class StickElementsWithTracking {
     destroy() {
         this.animationManager.destroy();
     }
-}
\ No newline at end of file
+}
diff --git a/scripts/core/helpers/uuid.js b/scripts/core/helpers/uuid.ts
similarity index 80%
rename from scripts/core/helpers/uuid.js
rename to scripts/core/helpers/uuid.ts
index ac79972294..cdf480fdd1 100644
--- a/scripts/core/helpers/uuid.js
+++ b/scripts/core/helpers/uuid.ts
@@ -1,5 +1,6 @@
+/* tslint:disable:no-bitwise */
 // https://gist.github.com/jed/982883
-export function uuid(a) {
+export function uuid(a?) {
     return a // if the placeholder was passed, return
         ? ( // a random number from 0 to 15
             a ^ // unless b is 8,
@@ -8,13 +9,13 @@ export function uuid(a) {
         >> a / 4 // 8 to 11
         ).toString(16) // in hexadecimal
         : ( // or otherwise a concatenated string:
-            [1e7] + // 10000000 +
+            `${1e7}` + // 10000000 +
         -1e3 + // -1000 +
         -4e3 + // -4000 +
         -8e3 + // -80000000 +
         -1e11 // -100000000000,
         ).replace( // replacing
             /[018]/g, // zeroes, ones, and eights with
-            uuid // random hex digits
+            uuid, // random hex digits
         );
-}
\ No newline at end of file
+}
diff --git a/scripts/core/index.js b/scripts/core/index.ts
similarity index 99%
rename from scripts/core/index.js
rename to scripts/core/index.ts
index 6507b1c4d2..3e70e05051 100644
--- a/scripts/core/index.js
+++ b/scripts/core/index.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 import 'core/global-fixes';
 
 import 'core/activity';
diff --git a/scripts/core/itemList/itemList.ts b/scripts/core/itemList/itemList.ts
index 532bd100c6..109b2e8b56 100644
--- a/scripts/core/itemList/itemList.ts
+++ b/scripts/core/itemList/itemList.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 angular.module('superdesk.core.itemList', ['superdesk.apps.search'])
diff --git a/scripts/core/keyboard/keyboard.js b/scripts/core/keyboard/keyboard.ts
similarity index 94%
rename from scripts/core/keyboard/keyboard.js
rename to scripts/core/keyboard/keyboard.ts
index e97d140db5..3bcd5b643a 100644
--- a/scripts/core/keyboard/keyboard.js
+++ b/scripts/core/keyboard/keyboard.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 export default angular.module('superdesk.core.keyboard', [])
@@ -177,28 +178,28 @@ export default angular.module('superdesk.core.keyboard', [])
 
             const inputDisabled = function(e) {
                 if (options.inputDisabled) {
-                    var elt;
+                    var elem;
 
                     if (e.target) {
-                        elt = e.target;
+                        elem = e.target;
                     } else if (e.srcElement) {
-                        elt = e.srcElement;
+                        elem = e.srcElement;
                     }
-                    if (elt.nodeType === 3) {
-                        elt = elt.parentNode;
+                    if (elem.nodeType === 3) {
+                        elem = elem.parentNode;
                     }
-                    return elt.tagName === 'INPUT' || elt.tagName === 'TEXTAREA' ||
-                    elt.className.indexOf('editor-type-html') !== -1;
+                    return elem.tagName === 'INPUT' || elem.tagName === 'TEXTAREA' ||
+                    elem.className.indexOf('editor-type-html') !== -1;
                 }
             };
 
-            const getCharacter = function(code) {
-                let character = String.fromCharCode(code).toLowerCase();
+            const getCharacter = function(codeNumber) {
+                let character = String.fromCharCode(codeNumber).toLowerCase();
 
-                if (code === 188) {
+                if (codeNumber === 188) {
                     character = ',';
                 } // If the user presses , when the type is onkeydown
-                if (code === 190) {
+                if (codeNumber === 190) {
                     character = '.';
                 } // If the user presses , when the type is onkeydown
 
@@ -241,8 +242,8 @@ export default angular.module('superdesk.core.keyboard', [])
                 };
 
                 let computeKeys = () => {
-                    let isCtrl = (k) => k === 'ctrl' || k === 'control';
-                    let isMeta = (k) => k === 'alt' || k === 'shift' || k === 'meta';
+                    let isCtrl = (key) => key === 'ctrl' || key === 'control';
+                    let isMeta = (key) => key === 'alt' || key === 'shift' || key === 'meta';
 
                     // Foreach keys in label (split on +)
                     for (var i = 0, l = keys.length; k = keys[i], i < l; i++) {
diff --git a/scripts/core/keyboard/tests/keyboard.spec.js b/scripts/core/keyboard/tests/keyboard.spec.ts
similarity index 97%
rename from scripts/core/keyboard/tests/keyboard.spec.js
rename to scripts/core/keyboard/tests/keyboard.spec.ts
index 2a1405a8f0..2be8ac58f7 100644
--- a/scripts/core/keyboard/tests/keyboard.spec.js
+++ b/scripts/core/keyboard/tests/keyboard.spec.ts
@@ -1,5 +1,4 @@
 
-
 describe('keyboardManager', () => {
     beforeEach(window.module('superdesk.core.keyboard'));
 
@@ -104,7 +103,7 @@ describe('keyboardManager', () => {
     it('can catch ctrl+shift events', inject(($rootScope) => {
         var p = document.createElement('p');
 
-        p.contentEditable = true;
+        p.contentEditable = 'true';
         document.body.appendChild(p);
         elemKeydown('t', true, false, p);
 
@@ -123,7 +122,7 @@ describe('keyboardManager', () => {
         expect(handle).toHaveBeenCalled();
     }));
 
-    function elemKeydown(which, ctrl, shift, target) {
+    function elemKeydown(which, ctrl, shift?, target?) {
         var e = new $.Event('keydown');
 
         e.which = which.charCodeAt(0);
diff --git a/scripts/core/lang/index.js b/scripts/core/lang/index.ts
similarity index 100%
rename from scripts/core/lang/index.js
rename to scripts/core/lang/index.ts
diff --git a/scripts/core/lang/missing-translations-strings.js b/scripts/core/lang/missing-translations-strings.ts
similarity index 98%
rename from scripts/core/lang/missing-translations-strings.js
rename to scripts/core/lang/missing-translations-strings.ts
index 286aaf1740..8e71796c4e 100644
--- a/scripts/core/lang/missing-translations-strings.js
+++ b/scripts/core/lang/missing-translations-strings.ts
@@ -1,3 +1,6 @@
+/* tslint:disable:max-line-length */
+/* eslint-disable max-len */
+
 /**
  * Expose strings for translation that aren't visible in regular js or template files.
  */
diff --git a/scripts/core/list/list.js b/scripts/core/list/list.ts
similarity index 98%
rename from scripts/core/list/list.js
rename to scripts/core/list/list.ts
index 7f7c7e08ff..d2f4becf52 100644
--- a/scripts/core/list/list.js
+++ b/scripts/core/list/list.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 function ListItemDirectiveFactory() {
     return {
         link: function(scope, element, attrs, controller, $transclude) {
@@ -190,7 +192,7 @@ mod.directive('sdUpdowns', ['$location', 'keyboardManager', '$anchorScroll',
                 onKey('down', move(DOWN));
                 onKey('right', move(DOWN));
 
-                function clickItem(item, $event) {
+                function clickItem(item, $event?) {
                     scope.select({item: item});
                     if ($event) {
                         $event.stopPropagation();
@@ -217,7 +219,7 @@ mod.directive('sdUpdowns', ['$location', 'keyboardManager', '$anchorScroll',
  * @items {object} Item container as received from server, with _items and _meta.
  * @limit {number} Number of items per page.
  */
-mod.directive('sdPagination', ['$location', 'asset', 'lodash', function($location, asset, _) {
+mod.directive('sdPagination', ['$location', 'asset', function($location, asset) {
     return {
         template: require('./views/sdPagination.html'),
         scope: {
diff --git a/scripts/core/menu/notifications/notifications.js b/scripts/core/menu/notifications/notifications.ts
similarity index 94%
rename from scripts/core/menu/notifications/notifications.js
rename to scripts/core/menu/notifications/notifications.ts
index d0e0c0e1aa..8e429d0288 100644
--- a/scripts/core/menu/notifications/notifications.js
+++ b/scripts/core/menu/notifications/notifications.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 UserNotificationsService.$inject = [
@@ -31,9 +32,7 @@ function UserNotificationsService(
      * @return {Object}
      */
     function getFilter() {
-        var filter = {};
-
-        filter = {'recipients.user_id': session.identity._id};
+        var filter: any = {'recipients.user_id': session.identity._id};
 
         // filter out system messages for non-admin users
         if (session.identity.user_type === 'user') {
@@ -66,7 +65,7 @@ function UserNotificationsService(
                 _.each(this._items, (item) => {
                     var recipients = item.recipients || {};
 
-                    item._unread = !isRead(recipients, identity._id, true);
+                    item._unread = !isRead(recipients, identity._id);
                     this.unread += item._unread ? 1 : 0;
                     item.message = gettext(item.message, item.data);
                 });
@@ -77,7 +76,7 @@ function UserNotificationsService(
     this.markAsRead = function(notification) {
         var _notification = angular.extend({}, notification);
         var recipients = notification.recipients;
-        var recipient = _.find(recipients, {user_id: session.identity._id});
+        var recipient: any = _.find(recipients, {user_id: session.identity._id});
 
         if (recipient && !recipient.read) {
             recipient.read = true;
@@ -97,7 +96,7 @@ function UserNotificationsService(
 
     // Checks if the current message is read
     function isRead(activity, userId) {
-        var userReadRecord = getFilteredRecipients(activity, userId);
+        var userReadRecord: any = getFilteredRecipients(activity, userId);
 
         return userReadRecord && userReadRecord.read;
     }
@@ -122,7 +121,7 @@ function UserNotificationsService(
                 $timeout(this.reload, UPDATE_TIMEOUT, false);
                 // check for permission and send a desktop notificiation
                 preferencesService.desktopNotification.send(
-                    sdActivityMessage.format(extras.activity)
+                    sdActivityMessage.format(extras.activity),
                 );
             }
         });
@@ -182,7 +181,7 @@ function DeskNotificationsService($rootScope, api, session) {
                             }
 
                             this._items[recipient.desk_id].push(item);
-                            this.unread[recipient.desk_id] += !isRead(recipients, recipient.desk_id, true) ? 1 : 0;
+                            this.unread[recipient.desk_id] += !isRead(recipients, recipient.desk_id) ? 1 : 0;
                         }
                     });
                 });
@@ -193,7 +192,7 @@ function DeskNotificationsService($rootScope, api, session) {
     this.markAsRead = function(notification, deskId) {
         var _notification = angular.extend({}, notification);
         var recipients = _.clone(notification.recipients);
-        var recipient = _.find(recipients, {desk_id: deskId});
+        var recipient: any = _.find(recipients, {desk_id: deskId});
 
         if (recipient && !recipient.read) {
             recipient.read = true;
@@ -215,7 +214,7 @@ function DeskNotificationsService($rootScope, api, session) {
      * @return {boolean}
      */
     function isRead(recipients, deskId) {
-        var deskReadRecord = _.find(recipients, {desk_id: deskId});
+        var deskReadRecord: any = _.find(recipients, {desk_id: deskId});
 
         return deskReadRecord && deskReadRecord.read;
     }
diff --git a/scripts/core/notification/notification.js b/scripts/core/notification/notification.ts
similarity index 99%
rename from scripts/core/notification/notification.js
rename to scripts/core/notification/notification.ts
index 9cd9466be9..9e61f32005 100644
--- a/scripts/core/notification/notification.js
+++ b/scripts/core/notification/notification.ts
@@ -8,6 +8,7 @@
 * at https://www.sourcefabric.org/superdesk/license
 */
 
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 WebSocketProxy.$inject = ['$rootScope', 'config', '$interval', 'session', 'SESSION_EVENTS'];
@@ -127,8 +128,8 @@ function NotifyConnectionService($rootScope, notify, $timeout, session) {
     });
 }
 
-ReloadService.$inject = ['$window', '$rootScope', 'session', 'desks', 'superdeskFlags', 'lodash'];
-function ReloadService($window, $rootScope, session, desks, superdeskFlags, _) {
+ReloadService.$inject = ['$window', '$rootScope', 'session', 'desks', 'superdeskFlags'];
+function ReloadService($window, $rootScope, session, desks, superdeskFlags) {
     var self = this;
 
     self.userDesks = [];
diff --git a/scripts/core/services/data.js b/scripts/core/services/data.ts
similarity index 96%
rename from scripts/core/services/data.js
rename to scripts/core/services/data.ts
index a6c35a4e7d..92c692d9ec 100644
--- a/scripts/core/services/data.js
+++ b/scripts/core/services/data.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export default angular.module('superdesk.core.services.data', [])
     /**
      * @ngdoc service
@@ -38,7 +40,7 @@ export default angular.module('superdesk.core.services.data', [])
                 var self = this;
                 var state = LocationStateAdapter; // @todo implement storage state adapter
                 var cancelWatch = angular.noop;
-                var defaultParams = {page: 1};
+                var defaultParams: any = {page: 1};
 
                 /**
                  * Get query criteria - extend default params with current search
@@ -180,11 +182,11 @@ export default angular.module('superdesk.core.services.data', [])
                  * @name DataAdapter#reset
                  * @public
                  *
-                 * @param {Object} params Paramters.
+                 * @param {Object} paramsObject Paramters.
                  *
                  * @description Reset default params
                  */
-                this.reset = function(params) {
+                this.reset = function(paramsObject) {
                     cancelWatch();
 
                     defaultParams = angular.extend({
@@ -194,7 +196,7 @@ export default angular.module('superdesk.core.services.data', [])
                         sort: [],
                         filters: [],
                         ttl: 0,
-                    }, params);
+                    }, paramsObject);
 
                     // main loop - update when query criteria change
                     cancelWatch = $rootScope.$watchCollection(() => getQueryCriteria(), (criteria) => {
diff --git a/scripts/core/services/entity.js b/scripts/core/services/entity.ts
similarity index 99%
rename from scripts/core/services/entity.js
rename to scripts/core/services/entity.ts
index 41920bd4f2..4ddc414417 100644
--- a/scripts/core/services/entity.js
+++ b/scripts/core/services/entity.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export default angular.module('superdesk.core.services.entity', [])
     /**
      * @ngdoc service
@@ -95,7 +97,7 @@ export default angular.module('superdesk.core.services.entity', [])
                             parts.push(encodeURIComponent(key) + '=' + encodeURIComponent(item));
                         });
                     }
-                }, this);
+                });
                 var query = parts.length === 0 ? '' : '?' + parts.join('&');
 
                 return query;
diff --git a/scripts/core/services/modalService.spec.ts b/scripts/core/services/modalService.spec.ts
index 6e3035d702..2b90f4be91 100644
--- a/scripts/core/services/modalService.spec.ts
+++ b/scripts/core/services/modalService.spec.ts
@@ -14,7 +14,15 @@ describe('modal service', () => {
         modal.confirm('body', 'header', 'ok', 'cancel', 'foo');
         $rootScope.$digest();
 
-        expect(angular.element(document.body).find('.modal__header').text().trim()).toBe('header');
-        expect(angular.element(document.body).find('.modal__body').text().trim()).toBe('body');
+        expect(
+            angular.element(document.body).find('.modal__header')
+                .text()
+                .trim(),
+        ).toBe('header');
+        expect(
+            angular.element(document.body).find('.modal__body')
+                .text()
+                .trim(),
+        ).toBe('body');
     }));
 });
diff --git a/scripts/core/services/permissionsService.js b/scripts/core/services/permissionsService.ts
similarity index 99%
rename from scripts/core/services/permissionsService.js
rename to scripts/core/services/permissionsService.ts
index 327a06deed..e1fa4c75fe 100644
--- a/scripts/core/services/permissionsService.js
+++ b/scripts/core/services/permissionsService.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 /**
  * @ngdoc service
  * @module superdesk.core.services
diff --git a/scripts/core/services/preferencesService.js b/scripts/core/services/preferencesService.ts
similarity index 95%
rename from scripts/core/services/preferencesService.js
rename to scripts/core/services/preferencesService.ts
index f5b8c67a78..5fffb958ce 100644
--- a/scripts/core/services/preferencesService.js
+++ b/scripts/core/services/preferencesService.ts
@@ -89,6 +89,7 @@ export default angular.module('superdesk.core.preferences', ['superdesk.core.not
                         if ('Notification' in window && Notification.permission !== 'denied') {
                             Notification.requestPermission((permission) => {
                                 if (permission === 'granted') {
+                                    // tslint:disable-next-line:no-unused-expression
                                     new Notification(msg);
                                 }
                             });
@@ -191,7 +192,7 @@ export default angular.module('superdesk.core.preferences', ['superdesk.core.not
              * @name preferencesService#update
              * @private
              *
-             * @param {object} updates
+             * @param {object} updatesObject
              * @param {string} key
              *
              * @description
@@ -202,14 +203,12 @@ export default angular.module('superdesk.core.preferences', ['superdesk.core.not
              * only cache changes. In next $digest those changes are pushed to api.
              * This way we can update multiple preferences without getting etag conflicts.
              */
-            this.update = function(updates, key) {
-                if (!key) {
-                    return scheduleUpdate(USER_PREFERENCES, updates);
-                } else if (userPreferences[key]) {
-                    return scheduleUpdate(USER_PREFERENCES, updates, key);
+            this.update = function(updatesObject, key) {
+                if (!key || userPreferences[key]) {
+                    return scheduleUpdate(USER_PREFERENCES, updatesObject);
                 }
 
-                return scheduleUpdate(SESSION_PREFERENCES, updates, key);
+                return scheduleUpdate(SESSION_PREFERENCES, updatesObject);
             };
 
             var updates,
@@ -274,8 +273,8 @@ export default angular.module('superdesk.core.preferences', ['superdesk.core.not
             /**
              * Make sure all segments are presented in preferences.
              */
-            function initPreferences(preferences) {
-                if (_.get(preferences, 'user_preferences.desktop:notification.enabled')) {
+            function initPreferences(prefs) {
+                if (_.get(prefs, 'user_preferences.desktop:notification.enabled')) {
                     desktopNotification.requestPermission();
                 }
                 angular.forEach([
@@ -284,8 +283,8 @@ export default angular.module('superdesk.core.preferences', ['superdesk.core.not
                     ACTIVE_PRIVILEGES,
                     ACTIONS,
                 ], (key) => {
-                    if (_.isNil(preferences[key])) {
-                        preferences[key] = {};
+                    if (_.isNil(prefs[key])) {
+                        prefs[key] = {};
                     }
                 });
             }
diff --git a/scripts/core/services/server.js b/scripts/core/services/server.ts
similarity index 95%
rename from scripts/core/services/server.js
rename to scripts/core/services/server.ts
index 8e8c4d0a92..5113b1a542 100644
--- a/scripts/core/services/server.js
+++ b/scripts/core/services/server.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export default angular.module('superdesk.core.services.server', [])
     /**
      * @ngdoc service
@@ -38,7 +40,7 @@ export default angular.module('superdesk.core.services.server', [])
                 });
                 return data;
             },
-            _all: function(functionName, items = datas, datas) {
+            _all: function(functionName, items, datas?) {
                 var self = this;
                 var resource;
 
@@ -62,7 +64,7 @@ export default angular.module('superdesk.core.services.server', [])
             _http: function(method, url, params, data) {
                 var created;
 
-                var options = {
+                var options: any = {
                     method: method.toLowerCase(),
                     url: url,
                     params: params,
@@ -171,7 +173,7 @@ export default angular.module('superdesk.core.services.server', [])
                 return this._http('post',
                     this._makeUrl(resource),
                     null,
-                    data
+                    data,
                 );
             },
 
@@ -189,13 +191,13 @@ export default angular.module('superdesk.core.services.server', [])
             list: function(resource, params) {
                 return this._http('get',
                     this._makeUrl(resource),
-                    this._convertParams(params)
+                    this._convertParams(params),
                 );
             },
 
             // transfer url params to server params
             _convertParams: function(params) {
-                var serverParams = _.extend({}, _.pick(params, [
+                var serverParams: any = _.extend({}, _.pick(params, [
                     'filter',
                     'max_results',
                     'page',
@@ -236,7 +238,7 @@ export default angular.module('superdesk.core.services.server', [])
              */
             read: function(item) {
                 return this._http('get',
-                    this._wrapUrl(item._links.self.href)
+                    this._wrapUrl(item._links.self.href),
                 );
             },
 
@@ -253,7 +255,7 @@ export default angular.module('superdesk.core.services.server', [])
              */
             readById: function(resource, id) {
                 return this._http('get',
-                    this._makeUrl(resource, id)
+                    this._makeUrl(resource, id),
                 );
             },
 
@@ -279,7 +281,7 @@ export default angular.module('superdesk.core.services.server', [])
                 return this._http('patch',
                     this._wrapUrl(item._links.self.href),
                     {},
-                    item
+                    item,
                 );
             },
             /**
@@ -296,7 +298,7 @@ export default angular.module('superdesk.core.services.server', [])
                 return this._http('delete',
                     this._wrapUrl(item._links.self.href),
                     {},
-                    item
+                    item,
                 );
             },
         };
diff --git a/scripts/core/services/serverConfig.js b/scripts/core/services/serverConfig.ts
similarity index 96%
rename from scripts/core/services/serverConfig.js
rename to scripts/core/services/serverConfig.ts
index a8f34f3c43..34cbc70b5a 100644
--- a/scripts/core/services/serverConfig.js
+++ b/scripts/core/services/serverConfig.ts
@@ -1,4 +1,4 @@
-let _ = require('lodash');
+import _ from 'lodash';
 
 /**
  * @ngdoc service
@@ -8,6 +8,8 @@ let _ = require('lodash');
  * @description Server config service.
  */
 export class ServerConfigService {
+    api: any;
+
     constructor(api) {
         this.api = api;
     }
diff --git a/scripts/core/services/translate.js b/scripts/core/services/translate.ts
similarity index 98%
rename from scripts/core/services/translate.js
rename to scripts/core/services/translate.ts
index 6d9145c56f..a74ca1daa9 100644
--- a/scripts/core/services/translate.js
+++ b/scripts/core/services/translate.ts
@@ -1,5 +1,6 @@
-require('angular-dynamic-locale');
+import 'angular-dynamic-locale';
 import {addLangOverride} from 'core/lang';
+import moment from 'moment';
 
 /**
  * Translate module
diff --git a/scripts/core/services/workflowService.js b/scripts/core/services/workflowService.ts
similarity index 97%
rename from scripts/core/services/workflowService.js
rename to scripts/core/services/workflowService.ts
index 444a46a676..92e3f2e597 100644
--- a/scripts/core/services/workflowService.js
+++ b/scripts/core/services/workflowService.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export default angular.module('superdesk.core.workflow', [])
     .run(['workflowService', angular.noop]) // make sure it's loaded
     .service('workflowService', ['preferencesService', '$rootScope', function(preferencesService, $rootScope) {
diff --git a/scripts/core/spellcheck/spellcheck.js b/scripts/core/spellcheck/spellcheck.ts
similarity index 96%
rename from scripts/core/spellcheck/spellcheck.js
rename to scripts/core/spellcheck/spellcheck.ts
index 0cb46164af..548395083b 100644
--- a/scripts/core/spellcheck/spellcheck.js
+++ b/scripts/core/spellcheck/spellcheck.ts
@@ -16,7 +16,6 @@ function SpellcheckService($q, api, dictionaries, $rootScope, $location, _, pref
     self.abbreviationsDict = null;
     self.isAutoSpellchecker = false;
 
-
     /**
      * Set current language
      *
@@ -85,15 +84,15 @@ function SpellcheckService($q, api, dictionaries, $rootScope, $location, _, pref
     /*
      * Return dictionaries for requested language
      *
-     * @param {Object} lang
+     * @param {Object} language
      * @returns {Object} List of dictionaries
      */
-    this.getDictionary = function(lang) {
-        if (!_activeCache[lang]) {
-            _activeCache[lang] = dictionaries.getActive(lang, getBaseLanguage(lang));
+    this.getDictionary = function(language) {
+        if (!_activeCache[language]) {
+            _activeCache[language] = dictionaries.getActive(language, getBaseLanguage(language));
         }
 
-        return _activeCache[lang];
+        return _activeCache[language];
     };
 
     /**
@@ -251,7 +250,7 @@ function SpellcheckService($q, api, dictionaries, $rootScope, $location, _, pref
      * @param {Boolean} i - if true tests case in-sensitive
      * @return {Boolean}
      */
-    function wordExistInDict(word, i) {
+    function wordExistInDict(word: string, i?) {
         if (i) {
             var lowerCaseWord = word.toLowerCase();
 
@@ -332,7 +331,7 @@ function SpellcheckService($q, api, dictionaries, $rootScope, $location, _, pref
                         });
                     }
                 }
-                currentOffset += tree.currentNode.length;
+                currentOffset += tree.currentNode['length'];
             }
 
             return errors;
@@ -413,10 +412,10 @@ function SpellcheckService($q, api, dictionaries, $rootScope, $location, _, pref
      * Add word to regular or ignored dictionary
      *
      * @param {String} word
-     * @param {String} isIgnored
+     * @param {String} isBeingIgnored
      */
-    this.addWord = function addWord(word, isIgnored) {
-        if (isIgnored) {
+    this.addWord = function addWord(word, isBeingIgnored) {
+        if (isBeingIgnored) {
             ignoreWord(word);
         } else {
             addWordToUserDictionary(word);
diff --git a/scripts/core/ui/components/Form/LinkInput.tsx b/scripts/core/ui/components/Form/LinkInput.tsx
index 3ffb727223..5dc78accc5 100644
--- a/scripts/core/ui/components/Form/LinkInput.tsx
+++ b/scripts/core/ui/components/Form/LinkInput.tsx
@@ -2,8 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import 'whatwg-fetch';
 import {get} from 'lodash';
-
-import {gettext} from '../utils';
+import {gettext} from 'core/utils';
 
 import {Row, LineInput, Label, TextArea} from './';
 import {IconButton} from '../';
diff --git a/scripts/core/ui/ui.js b/scripts/core/ui/ui.ts
similarity index 99%
rename from scripts/core/ui/ui.js
rename to scripts/core/ui/ui.ts
index d6f645e1c4..e7145aed2d 100644
--- a/scripts/core/ui/ui.js
+++ b/scripts/core/ui/ui.ts
@@ -1,4 +1,8 @@
-import {mapValues} from 'lodash';
+/* eslint-disable max-len */
+/* tslint:disable:max-line-length */
+
+import _, {mapValues} from 'lodash';
+import moment from 'moment-timezone';
 import {gettext} from 'core/utils';
 
 /**
@@ -221,7 +225,7 @@ function DropdownFocus(Keys) {
 
 PopupService.$inject = ['$document'];
 function PopupService($document) {
-    var service = {};
+    var service: any = {};
 
     service.position = function(width, height, target) {
         // taking care of screen size and responsiveness
@@ -318,8 +322,8 @@ function DatepickerDirective($document) {
     };
 }
 
-DatepickerInnerDirective.$inject = ['$compile', '$document', 'popupService', 'datetimeHelper', 'config', 'moment'];
-function DatepickerInnerDirective($compile, $document, popupService, datetimeHelper, config, moment) {
+DatepickerInnerDirective.$inject = ['$compile', '$document', 'popupService', 'datetimeHelper', 'config'];
+function DatepickerInnerDirective($compile, $document, popupService, datetimeHelper, config) {
     var popupTpl = '<div sd-datepicker-wrapper ng-model="date">' +
         '<div datepicker format-day="d" starting-day="' + config.startingDay + '" show-weeks="false"></div>' +
     '</div>';
@@ -644,7 +648,7 @@ function TimezoneDirective(tzdata, config, $timeout) {
                 termLower = searchTerm.toLowerCase();
                 scope.matchingTimeZones = _.filter(
                     scope.timeZones,
-                    (item) => item.toLowerCase().indexOf(termLower) >= 0
+                    (item) => item.toLowerCase().indexOf(termLower) >= 0,
                 );
             };
 
@@ -691,13 +695,13 @@ function TimepickerPopupDirective($timeout, config) {
 
             var POPUP = '.timepicker-popup';
 
-            var focusElement = function() {
+            var focusEl = function() {
                 $timeout(() => {
                     element.find(POPUP).focus();
                 }, 0, false);
             };
 
-            scope.$on('timepicker.focus', focusElement);
+            scope.$on('timepicker.focus', focusEl);
 
             element.bind('click', (event) => {
                 event.preventDefault();
@@ -1102,7 +1106,6 @@ function MultipleEmailsValidation() {
         restrict: 'A',
         require: 'ngModel',
         link: function(scope, elem, attrs, ctrl) {
-            // eslint-disable-next-line max-len
             var EMAIL_REGEXP = /^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+\/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+\/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/;
 
             ctrl.$validators.multipleEmails = function(modelValue, viewValue) {
diff --git a/scripts/core/upload/crop-directive.js b/scripts/core/upload/crop-directive.ts
similarity index 88%
rename from scripts/core/upload/crop-directive.js
rename to scripts/core/upload/crop-directive.ts
index 9ec9818c1e..dcc01a4db6 100644
--- a/scripts/core/upload/crop-directive.js
+++ b/scripts/core/upload/crop-directive.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import {gettext} from 'core/utils';
 
 angular.module('superdesk.core.upload.crop', [])
@@ -24,10 +25,10 @@ angular.module('superdesk.core.upload.crop', [])
                     });
                 }, 300);
 
-                function showPreview(e, rx, ry, boundx, boundy, cordx, cordy) {
+                function showPreview(e, rx, ry, boundX, boundY, cordx, cordy) {
                     $(e).css({
-                        width: Math.round(rx * boundx) + 'px',
-                        height: Math.round(ry * boundy) + 'px',
+                        width: Math.round(rx * boundX) + 'px',
+                        height: Math.round(ry * boundY) + 'px',
                         marginLeft: '-' + Math.round(rx * cordx) + 'px',
                         marginTop: '-' + Math.round(ry * cordy) + 'px',
                     });
@@ -39,7 +40,7 @@ angular.module('superdesk.core.upload.crop', [])
                     && scope.file.size / 1048576 > parseInt(scope.maxFileSize, 10)) {
                         notify.info(gettext(
                             'Image is bigger than {{maxFileSize}}MB, upload file size may be limited!',
-                            {maxFileSize: scope.maxFileSize}
+                            {maxFileSize: scope.maxFileSize},
                         ));
                     }
 
@@ -48,9 +49,9 @@ angular.module('superdesk.core.upload.crop', [])
 
                         img.onload = function() {
                             scope.progressWidth = 80;
-                            var size = [this.width, this.height];
+                            var size = [this['width'], this['height']];
 
-                            if (this.width < 200 || this.height < 200) {
+                            if (size[0] < 200 || size[1] < 200) {
                                 scope.$apply(() => {
                                     notify.pop();
                                     notify.error(gettext('Sorry, but avatar must be at least 200x200 pixels big.'));
diff --git a/scripts/core/upload/sdImageCrop.spec.ts b/scripts/core/upload/sdImageCrop.spec.ts
index 3670c17ace..4e6468973f 100644
--- a/scripts/core/upload/sdImageCrop.spec.ts
+++ b/scripts/core/upload/sdImageCrop.spec.ts
@@ -96,7 +96,7 @@ describe('Image Crop', () => {
                 expect(mySpy.calls.count()).toEqual(0);
                 expect($elm.text())
                     .toBe(
-                        'Sorry, but image must be at least {{width}}x{{height}}.' + ' ' +
+                        'Sorry, but image must be at least {{width}}x{{height}}. ' +
                         'Currently the image size is {{width}}x{{height}}).',
                     );
             }));
diff --git a/scripts/core/upload/sdImageModify.js b/scripts/core/upload/sdImageModify.ts
similarity index 87%
rename from scripts/core/upload/sdImageModify.js
rename to scripts/core/upload/sdImageModify.ts
index 4d57cd3b97..333c74ae1d 100644
--- a/scripts/core/upload/sdImageModify.js
+++ b/scripts/core/upload/sdImageModify.ts
@@ -14,7 +14,7 @@ export default angular.module('superdesk.core.upload.imagemodify', [
         },
         template: '<canvas id="image"></canvas>',
         link: function(scope) {
-            let canvas = document.getElementById('image'),
+            let canvas = document.getElementById('image') as HTMLCanvasElement,
                 context = canvas.getContext('2d'),
                 baseImage = new Image(),
                 filter = {
@@ -32,25 +32,25 @@ export default angular.module('superdesk.core.upload.imagemodify', [
                 canvas.width = baseImage.width;
                 canvas.height = baseImage.height;
 
-                context.filter = filter.brightness + filter.contrast + filter.saturate;
+                context['filter'] = filter.brightness + filter.contrast + filter.saturate;
                 context.drawImage(baseImage, 0, 0);
             };
 
             scope.$watch('brightness', (value, old) => {
                 filter.brightness = 'brightness(' + value + ') ';
-                context.filter = filter.brightness + filter.contrast + filter.saturate;
+                context['filter'] = filter.brightness + filter.contrast + filter.saturate;
                 context.drawImage(baseImage, 0, 0);
             });
 
             scope.$watch('contrast', (value, old) => {
                 filter.contrast = 'contrast(' + value + ') ';
-                context.filter = filter.brightness + filter.contrast + filter.saturate;
+                context['filter'] = filter.brightness + filter.contrast + filter.saturate;
                 context.drawImage(baseImage, 0, 0);
             });
 
             scope.$watch('saturate', (value, old) => {
                 filter.saturate = 'saturate(' + value + ') ';
-                context.filter = filter.brightness + filter.contrast + filter.saturate;
+                context['filter'] = filter.brightness + filter.contrast + filter.saturate;
                 context.drawImage(baseImage, 0, 0);
             });
 
@@ -82,4 +82,4 @@ export default angular.module('superdesk.core.upload.imagemodify', [
                     '; -moz-transform:' + transform.rotate + transform.flipH + transform.flipV);
             }
         },
-    }));
\ No newline at end of file
+    }));
diff --git a/scripts/core/upload/video-capture-directive.js b/scripts/core/upload/video-capture-directive.ts
similarity index 87%
rename from scripts/core/upload/video-capture-directive.js
rename to scripts/core/upload/video-capture-directive.ts
index 4dc2139207..5d869312e4 100644
--- a/scripts/core/upload/video-capture-directive.js
+++ b/scripts/core/upload/video-capture-directive.ts
@@ -1,10 +1,10 @@
 angular.module('superdesk.core.upload').directive('sdVideoCapture', [function() {
     var URL = window.URL || window.webkitURL;
 
-    navigator.getMedia = navigator.getUserMedia ||
-        navigator.webkitGetUserMedia ||
-        navigator.mozGetUserMedia ||
-        navigator.msGetUserMedia;
+    navigator['getMedia'] = navigator.getUserMedia ||
+        navigator['webkitGetUserMedia'] ||
+        navigator['mozGetUserMedia'] ||
+        navigator['msGetUserMedia'];
 
     return {
         scope: {
@@ -19,7 +19,7 @@ angular.module('superdesk.core.upload').directive('sdVideoCapture', [function()
 
             elem.after(canvas);
 
-            navigator.getMedia({
+            navigator['getMedia']({
                 video: true,
                 audio: false,
             }, (stream) => {
@@ -29,7 +29,7 @@ angular.module('superdesk.core.upload').directive('sdVideoCapture', [function()
                 }
 
                 localMediaStream = stream;
-                if (navigator.mozGetUserMedia) {
+                if (navigator['mozGetUserMedia']) {
                     elem[0].mozSrcObject = stream;
                 } else {
                     elem[0].src = URL.createObjectURL(stream);
diff --git a/scripts/globals.d.ts b/scripts/globals.d.ts
index 0555049fc2..1e4950b7b1 100644
--- a/scripts/globals.d.ts
+++ b/scripts/globals.d.ts
@@ -9,16 +9,22 @@ declare const gettext: any;
 declare const KV: any; // qumu widgets
 
 // angular
-declare const angular: any;
+declare const angular: IAngularStatic;
 declare const inject: any;
 
 // testing
 declare const jasmine: any;
 declare const spyOn: any;
 declare const describe: any;
+declare const fdescribe: any;
+declare const xdescribe: any;
 declare const beforeEach: any;
+declare const afterEach: any;
 declare const expect: any;
 declare const it: any;
+declare const fit: any;
+declare const xit: any;
+declare const fail: any;
 
 // globals
 // tslint:disable-next-line: interface-name
@@ -28,6 +34,7 @@ interface Window {
     $: any;
     _paq: any;
     GoogleAnalyticsObject: any;
+    ga: any;
     TimeoutHttpInterceptor: any;
     RequestService: any;
     clipboardData: any;
@@ -37,8 +44,14 @@ interface Window {
     webkitURL: any;
     superdeskConfig: any;
     module: any;
+    RunTansaProofing: any;
+    iframely: any;
 }
 
+// Allow importing json/html files
+declare module "*.json";
+declare module "*.html";
+
 // ------------------------------------------------------------------------------------------------
 // TYPES
 // ------------------------------------------------------------------------------------------------
diff --git a/scripts/index.js b/scripts/index.ts
similarity index 93%
rename from scripts/index.js
rename to scripts/index.ts
index 6854359dc2..0ffb3166cc 100644
--- a/scripts/index.js
+++ b/scripts/index.ts
@@ -10,7 +10,7 @@ const appConfig = __SUPERDESK_CONFIG__;
 
 if (appConfig.features.useTansaProofing) {
     // see: http://www.hiddenwebgenius.com/blog/guides/understanding-javascripts-asynchronous-code/
-    setTimeout(require('apps/tansa'), 0);
+    setTimeout(() => require('apps/tansa'), 0);
 }
 
 let body = angular.element('body');
@@ -46,5 +46,5 @@ body.ready(() => {
         'superdesk.apps',
     ].concat(appConfig.apps || []), {strictDi: true});
 
-    window.superdeskIsReady = true;
+    window['superdeskIsReady'] = true;
 });
diff --git a/scripts/tests.js b/scripts/tests.ts
similarity index 100%
rename from scripts/tests.js
rename to scripts/tests.ts
diff --git a/tsconfig.json b/tsconfig.json
index 9f34cacbb7..fafd5fbad9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,6 +9,7 @@
         "esModuleInterop": true,
         "module": "commonjs",
         "target": "es5",
+        "skipLibCheck": true,
         "lib": [
             "dom",
             "es2017"
diff --git a/yarn.lock b/yarn.lock
index 13293de15e..020c9f9e04 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14,10 +14,10 @@
   resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.50.tgz#8b6599088d80f68ef0cad7d3a2062248ebe72b3d"
   integrity sha512-D3KB0PdaxdwtA44yOpK+NtptTscKWgUzXmf8fiLaaVxnX+b7QQ+dUMsyeVDweCQ6VX4PMwkd6x2hJ0X+ISIsoQ==
 
-"@types/draft-js@0.10.25":
-  version "0.10.25"
-  resolved "https://registry.yarnpkg.com/@types/draft-js/-/draft-js-0.10.25.tgz#4f741ea8b7f008c3c0a06ff6b2c4427f380dc331"
-  integrity sha512-6fgNdCBuUt9SOj03ukB1ZJfsCcD/6L6xK6244aZn7xALQKynZ1GjYlc09U6SDd1OjE/vIXl1Dk5YriZ0aluiYg==
+"@types/draft-js@0.10.29":
+  version "0.10.29"
+  resolved "https://registry.yarnpkg.com/@types/draft-js/-/draft-js-0.10.29.tgz#78fe500f8501078255e18ee2ce1343e482e7983b"
+  integrity sha512-SA9hhLBjYtBFYz5d7N8CMzDQ6Z4evRsTa6+oomJu2JMBtrGA3jIG2/RzaSfN3U/8tXCJd/vMntBvVMdlYupjpw==
   dependencies:
     "@types/react" "*"
     immutable "^3.8.1"
@@ -27,6 +27,20 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.117.tgz#695a7f514182771a1e0f4345d189052ee33c8778"
   integrity sha512-xyf2m6tRbz8qQKcxYZa7PA4SllYcay+eh25DN3jmNYY6gSTL7Htc/bttVdkqj2wfJGbeWlQiX8pIyJpKU+tubw==
 
+"@types/moment-timezone@^0.5.12":
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/@types/moment-timezone/-/moment-timezone-0.5.12.tgz#0fb680c03db194fe8ff4551eaeb1eec8d3d80e9f"
+  integrity sha512-hnHH2+Efg2vExr/dSz+IX860nSiyk9Sk4pJF2EmS11lRpMcNXeB4KBW5xcgw2QPsb9amTXdsVNEe5IoJXiT0uw==
+  dependencies:
+    moment ">=2.14.0"
+
+"@types/moment@^2.13.0":
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/@types/moment/-/moment-2.13.0.tgz#604ebd189bc3bc34a1548689404e61a2a4aac896"
+  integrity sha1-YE69GJvDvDShVIaJQE5hoqSqyJY=
+  dependencies:
+    moment "*"
+
 "@types/node@*":
   version "10.12.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.10.tgz#4fa76e6598b7de3f0cb6ec3abacc4f59e5b3a2ce"
@@ -47,6 +61,21 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
   integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
 
+"@types/react-dom@16.8.0":
+  version "16.8.0"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.0.tgz#c565f43f9d2ec911f9e0b8f3b74e25e67879aa3f"
+  integrity sha512-Jp4ufcEEjVJEB0OHq2MCZcE1u3KYUKO6WnSuiU/tZeYeiZxUoQavfa/TZeiIT+1XoN6l0lQVNM30VINZFDeolQ==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react-redux@7.0.1":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.0.1.tgz#9dd2503be7a9861c5a092bf1c5050b7ade4dc62e"
+  integrity sha512-+DIH7TI2MT4Ke4lOrRMgNy//DzTDIzv5QwkJSD6AVrlsIgzf7yMM0JoWL5wJUXYwKQ2f1FgvwlvIVGD2QWQnew==
+  dependencies:
+    "@types/react" "*"
+    redux "^4.0.0"
+
 "@types/react@*":
   version "16.7.7"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.7.7.tgz#1e5e23e7dd922968ed4b484cdec00a5402c9f31b"
@@ -68,6 +97,11 @@
   resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.13.tgz#deb799c641773c5e367abafc92d1e733d62cddd7"
   integrity sha512-rI0LGoMiZGUM+tjDakQpwZOvcmQoubiJ7hxqrYU12VRxBuGGvOThxrBOU/QmJKlKg1WG6FMzuvcEyLffvVSsmw==
 
+"@types/webpack-env@^1.13.9":
+  version "1.13.9"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a"
+  integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg==
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -1761,6 +1795,14 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
+cors@2.8.5:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
 crc@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.3.0.tgz#fa622e1bc388bf257309082d6b65200ce67090ba"
@@ -2092,6 +2134,11 @@ decode-uri-component@^0.2.0:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
+deep-diff@^0.3.5:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84"
+  integrity sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=
+
 deep-equal@*, deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
@@ -6297,6 +6344,11 @@ moment-timezone@0.5.14:
   dependencies:
     moment ">= 2.9.0"
 
+moment@*, moment@>=2.14.0:
+  version "2.24.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
+  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
+
 moment@2.20.1:
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
@@ -6776,7 +6828,7 @@ object-assign@^3.0.0:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
   integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -8291,6 +8343,13 @@ reduce-function-call@^1.0.1:
   dependencies:
     balanced-match "^0.4.2"
 
+redux-logger@3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf"
+  integrity sha1-91VZZvMJjzyIYExEnPC69XeCdL8=
+  dependencies:
+    deep-diff "^0.3.5"
+
 redux-thunk@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5"
@@ -8306,6 +8365,14 @@ redux@3.7.2:
     loose-envify "^1.1.0"
     symbol-observable "^1.0.3"
 
+redux@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"
+  integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==
+  dependencies:
+    loose-envify "^1.4.0"
+    symbol-observable "^1.2.0"
+
 regenerate@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
@@ -9508,10 +9575,10 @@ superdesk-code-style@^1.1.1:
     eslint-plugin-jasmine "^2.9.1"
     eslint-plugin-react "^7.5.1"
 
-superdesk-ui-framework@1.5.6:
-  version "1.5.6"
-  resolved "https://registry.yarnpkg.com/superdesk-ui-framework/-/superdesk-ui-framework-1.5.6.tgz#83ecc751cbf41c03e408a770970d688e768866bc"
-  integrity sha512-HlXGsLN0WGff8ddCdmFVeWfoiOWVe3fUOZW0d4QkhRZ4jedkLIc6crmXDlGjs922EvH/At4iTL1SXeJYLXZd0A==
+superdesk-ui-framework@1.8.6:
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/superdesk-ui-framework/-/superdesk-ui-framework-1.8.6.tgz#f1805f6d859124a10452824e44436e042754af9a"
+  integrity sha512-D7AC/jTw2cIG0q4d1jEO47cHIqggHeLXtpmUGjpfjYvKY4fUpUS9wePpC4vsjPl7BmTgdlIWTeKYhEAj+irQcA==
   dependencies:
     popper.js "1.14.4"
 
@@ -9567,7 +9634,7 @@ swap-case@^1.1.0:
     lower-case "^1.1.1"
     upper-case "^1.1.1"
 
-symbol-observable@^1.0.3:
+symbol-observable@^1.0.3, symbol-observable@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
@@ -10182,16 +10249,16 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+vary@^1, vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
 vary@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.0.1.tgz#99e4981566a286118dfb2b817357df7993376d10"
   integrity sha1-meSYFWaihhGN+yuBc1ffeZM3bRA=
 
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-
 vendors@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801"