Bump typescript and axios

* Bump axios due to CVE-2023-45857

* Bump typescript, only in resolutions, to 4.6.4 - needed for newer axios

Signed-off-by: Miki <[email protected]>

package.json

@@ -96,7 +96,7 @@
     "**/node-jose": "^2.2.0",
     "**/nth-check": "^2.0.1",
     "**/trim": "^0.0.3",
-    "**/typescript": "4.0.2",
+    "**/typescript": "4.6.4",
     "**/unset-value": "^2.0.1",
     "**/jest-config": "npm:@amoo-miki/[email protected]",
     "**/jest-jasmine2": "npm:@amoo-miki/[email protected]",

packages/osd-babel-preset/common_preset.js

@@ -29,8 +29,8 @@
  */
 
 const plugins = [
-  '@babel/plugin-transform-class-properties',
-  '@babel/plugin-transform-private-methods',
+  require.resolve('@babel/plugin-transform-class-properties'),
+  require.resolve('@babel/plugin-transform-private-methods'),
   require.resolve('babel-plugin-add-module-exports'),
 
   // Optional Chaining proposal is stage 4 (https://github.com/tc39/proposal-optional-chaining)

packages/osd-cross-platform/src/repo_root.ts

@@ -41,7 +41,7 @@ const readOpenSearchDashboardsPkgJson = (dir: string) => {
       return json;
     }
   } catch (error) {
-    if (error && error.code === 'ENOENT') {
+    if (error?.code === 'ENOENT') {
       return;
     }
 

packages/osd-dev-utils/package.json

@@ -15,7 +15,7 @@
   "dependencies": {
     "@babel/core": "^7.22.9",
     "@osd/utils": "1.0.0",
-    "axios": "^0.27.2",
+    "axios": "^1.6.1",
     "chalk": "^4.1.0",
     "cheerio": "0.22.0",
     "dedent": "^0.7.0",

packages/osd-dev-utils/src/osd_client/osd_client_requester.ts

@@ -36,7 +36,7 @@ import { ToolingLog } from '../tooling_log';
 
 const isConcliftOnGetError = (error: any) => {
   return (
-    isAxiosResponseError(error) && error.config.method === 'GET' && error.response.status === 409
+    isAxiosResponseError(error) && error.config?.method === 'GET' && error.response.status === 409
   );
 };
 

packages/osd-opensearch-archiver/src/cli.ts

@@ -239,7 +239,7 @@ export function runCli() {
             output: process.stdout,
           });
 
-          await new Promise((resolveInput) => {
+          await new Promise<void>((resolveInput) => {
             rl.question(`Press enter when you're done`, () => {
               rl.close();
               resolveInput();

packages/osd-test/src/failed_tests_reporter/github_api.ts

@@ -28,7 +28,7 @@
  * under the License.
  */
 
-import Axios, { AxiosRequestConfig, AxiosInstance } from 'axios';
+import Axios, { AxiosRequestConfig, AxiosInstance, AxiosHeaderValue } from 'axios';
 import parseLinkHeader from 'parse-link-header';
 import { ToolingLog, isAxiosResponseError, isAxiosRequestError } from '@osd/dev-utils';
 
@@ -206,7 +206,7 @@ export class GithubApi {
   ): Promise<{
     status: number;
     statusText: string;
-    headers: Record<string, string | string[] | undefined>;
+    headers: Record<string, AxiosHeaderValue | undefined>;
     data: T;
   }> {
     const executeRequest = !this.dryRun || options.safeForDryRun;
@@ -231,7 +231,7 @@ export class GithubApi {
       const githubApiFailed = isAxiosResponseError(error) && error.response.status >= 500;
       const errorResponseLog =
         isAxiosResponseError(error) &&
-        `[${error.config.method} ${error.config.url}] ${error.response.status} ${error.response.statusText} Error`;
+        `[${error.config?.method} ${error.config?.url}] ${error.response.status} ${error.response.statusText} Error`;
 
       if ((unableToReachGithub || githubApiFailed) && attempt < maxAttempts) {
         const waitMs = 1000 * attempt;

packages/osd-test/src/functional_test_runner/lib/lifecycle_phase.ts

@@ -44,16 +44,17 @@ export class LifecyclePhase<Args extends readonly any[]> {
   private readonly beforeSubj = new Rx.Subject<void>();
   public readonly before$ = this.beforeSubj.asObservable();
 
-  private readonly afterSubj = this.options.singular
-    ? new Rx.ReplaySubject<void>(1)
-    : new Rx.Subject<void>();
-  public readonly after$ = this.afterSubj.asObservable();
+  private readonly afterSubj: Rx.Subject<void>;
+  public readonly after$: Rx.Observable<void>;
 
   constructor(
     private readonly options: {
       singular?: boolean;
     } = {}
-  ) {}
+  ) {
+    this.afterSubj = this.options.singular ? new Rx.ReplaySubject<void>(1) : new Rx.Subject<void>();
+    this.after$ = this.afterSubj.asObservable();
+  }
 
   public add(fn: (...args: Args) => Promise<void> | void) {
     this.handlers.push(fn);

packages/osd-ui-shared-deps/package.json

@@ -16,7 +16,7 @@
     "@osd/i18n": "1.0.0",
     "@osd/monaco": "1.0.0",
     "abortcontroller-polyfill": "^1.4.0",
-    "axios": "^0.27.2",
+    "axios": "^1.6.1",
     "compression-webpack-plugin": "npm:@amoo-miki/[email protected]",
     "core-js": "^3.6.5",
     "custom-event-polyfill": "^0.3.0",
@@ -51,4 +51,4 @@
     "val-loader": "^2.1.2",
     "webpack": "npm:@amoo-miki/[email protected]"
   }
-}
+}

packages/osd-ui-shared-deps/webpack.config.js

@@ -131,6 +131,17 @@ exports.getWebpackConfig = ({ dev = false } = {}) => ({
           },
         ],
       },
+      {
+        test: /worker_proxy_service\.js$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            babelrc: false,
+            presets: [require.resolve('@osd/babel-preset/webpack_preset')],
+          },
+        },
+      },
     ],
   },
 

src/core/public/application/application_service.test.ts

@@ -708,7 +708,7 @@ describe('#start()', () => {
       // Create an app and a promise that allows us to control when the app completes mounting
       const createWaitingApp = (props: Partial<App>): [App, () => void] => {
         let finishMount: () => void;
-        const mountPromise = new Promise((resolve) => (finishMount = resolve));
+        const mountPromise = new Promise<void>((resolve) => (finishMount = resolve));
         const app = {
           id: 'some-id',
           title: 'some-title',

src/core/public/application/integration_tests/application_service.test.tsx

@@ -77,7 +77,7 @@ describe('ApplicationService', () => {
         const { register } = service.setup(setupDeps);
 
         let resolveMount: () => void;
-        const promise = new Promise((resolve) => {
+        const promise = new Promise<void>((resolve) => {
           resolveMount = resolve;
         });
 
@@ -111,7 +111,7 @@ describe('ApplicationService', () => {
         const { register } = service.setup(setupDeps);
 
         let resolveMount: () => void;
-        const promise = new Promise((resolve) => {
+        const promise = new Promise<void>((resolve) => {
           resolveMount = resolve;
         });
 
@@ -453,7 +453,7 @@ describe('ApplicationService', () => {
       const { register } = service.setup(setupDeps);
 
       let resolveMount: () => void;
-      const promise = new Promise((resolve) => {
+      const promise = new Promise<void>((resolve) => {
         resolveMount = resolve;
       });
 
@@ -491,7 +491,7 @@ describe('ApplicationService', () => {
       const { register } = service.setup(setupDeps);
 
       let resolveMount: () => void;
-      const promise = new Promise((resolve) => {
+      const promise = new Promise<void>((resolve) => {
         resolveMount = resolve;
       });
 

src/core/public/application/ui/app_container.test.tsx

@@ -50,7 +50,7 @@ describe('AppContainer', () => {
   });
 
   const flushPromises = async () => {
-    await new Promise(async (resolve) => {
+    await new Promise<void>(async (resolve) => {
       setImmediate(() => resolve());
     });
   };

src/core/public/chrome/chrome_service.test.ts

@@ -43,9 +43,12 @@ import { ChromeService } from './chrome_service';
 import { getAppInfo } from '../application/utils';
 
 class FakeApp implements App {
-  public title = `${this.id} App`;
+  public title: string;
   public mount = () => () => {};
-  constructor(public id: string, public chromeless?: boolean) {}
+
+  constructor(public id: string, public chromeless?: boolean) {
+    this.title = `${this.id} App`;
+  }
 }
 const store = new Map();
 const originalLocalStorage = window.localStorage;

src/core/public/chrome/chrome_service.tsx

@@ -89,7 +89,7 @@ interface ConstructorParams {
   browserSupportsCsp: boolean;
 }
 
-interface StartDeps {
+export interface StartDeps {
   application: InternalApplicationStart;
   docLinks: DocLinksStart;
   http: HttpStart;

src/core/public/chrome/recently_accessed/recently_accessed_service.test.ts

@@ -69,11 +69,9 @@ describe('RecentlyAccessed#start()', () => {
 
     // @ts-expect-error to allow redeclaring a readonly prop
     delete window.localStorage;
-    // @ts-expect-error
     window.localStorage = new LocalStorageMock();
   });
   beforeEach(() => localStorage.clear());
-  // @ts-expect-error
   afterAll(() => (window.localStorage = originalLocalStorage));
 
   const getStart = async () => {

src/core/public/context/context_service.ts

@@ -32,7 +32,7 @@ import { PluginOpaqueId } from '../../server';
 import { IContextContainer, ContextContainer, HandlerFunction } from '../../utils/context';
 import { CoreContext } from '../core_system';
 
-interface StartDeps {
+export interface StartDeps {
   pluginDependencies: ReadonlyMap<PluginOpaqueId, PluginOpaqueId[]>;
 }
 

src/core/public/core_app/core_app.ts

@@ -43,14 +43,14 @@ import type { InjectedMetadataSetup } from '../injected_metadata';
 import { renderApp as renderErrorApp, setupUrlOverflowDetection } from './errors';
 import { renderApp as renderStatusApp } from './status';
 
-interface SetupDeps {
+export interface SetupDeps {
   application: InternalApplicationSetup;
   http: HttpSetup;
   injectedMetadata: InjectedMetadataSetup;
   notifications: NotificationsSetup;
 }
 
-interface StartDeps {
+export interface StartDeps {
   application: InternalApplicationStart;
   http: HttpStart;
   notifications: NotificationsStart;

src/core/public/doc_links/doc_links_service.ts

@@ -32,7 +32,7 @@ import { deepFreeze } from '@osd/std';
 import { parse } from 'semver';
 import { InjectedMetadataSetup } from '../injected_metadata';
 
-interface StartDeps {
+export interface StartDeps {
   injectedMetadata: InjectedMetadataSetup;
 }
 

src/core/public/fatal_errors/fatal_errors_service.tsx

@@ -38,7 +38,7 @@ import { InjectedMetadataSetup } from '../injected_metadata';
 import { FatalErrorsScreen } from './fatal_errors_screen';
 import { FatalErrorInfo, getErrorInfo } from './get_error_info';
 
-interface Deps {
+export interface Deps {
   i18n: I18nStart;
   injectedMetadata: InjectedMetadataSetup;
 }

src/core/public/http/fetch.ts

@@ -212,6 +212,8 @@ export class Fetch {
   }
 
   private shorthand(method: string): HttpHandler {
+    // ToDo: find why 'TResponseBody' of HttpHandler is not assignable to type 'HttpResponse<any>'
+    // @ts-expect-error
     return (pathOrOptions: string | HttpFetchOptionsWithPath, options?: HttpFetchOptions) => {
       const optionsWithPath = validateFetchArguments(pathOrOptions, options);
       return this.fetch({ ...optionsWithPath, method });

src/core/public/injected_metadata/injected_metadata_service.ts

@@ -88,11 +88,13 @@ export interface InjectedMetadataParams {
  * @internal
  */
 export class InjectedMetadataService {
-  private state = deepFreeze(
-    this.params.injectedMetadata
-  ) as InjectedMetadataParams['injectedMetadata'];
+  private state: InjectedMetadataParams['injectedMetadata'];
 
-  constructor(private readonly params: InjectedMetadataParams) {}
+  constructor(private readonly params: InjectedMetadataParams) {
+    this.state = deepFreeze(
+      this.params.injectedMetadata
+    ) as InjectedMetadataParams['injectedMetadata'];
+  }
 
   public start(): InjectedMetadataStart {
     return this.setup();

src/core/public/integrations/integrations_service.ts

@@ -34,7 +34,7 @@ import { CoreService } from '../../types';
 import { MomentService } from './moment';
 import { StylesService } from './styles';
 
-interface Deps {
+export interface Deps {
   uiSettings: IUiSettingsClient;
 }
 

src/core/public/notifications/notifications_service.ts

@@ -36,11 +36,11 @@ import { ToastsService, ToastsSetup, ToastsStart } from './toasts';
 import { IUiSettingsClient } from '../ui_settings';
 import { OverlayStart } from '../overlays';
 
-interface SetupDeps {
+export interface SetupDeps {
   uiSettings: IUiSettingsClient;
 }
 
-interface StartDeps {
+export interface StartDeps {
   i18n: I18nStart;
   overlays: OverlayStart;
   targetDomElement: HTMLElement;

src/core/public/rendering/rendering_service.tsx

@@ -37,7 +37,7 @@ import { InternalApplicationStart } from '../application';
 import { OverlayStart } from '../overlays';
 import { AppWrapper, AppContainer } from './app_containers';
 
-interface StartDeps {
+export interface StartDeps {
   application: InternalApplicationStart;
   chrome: InternalChromeStart;
   overlays: OverlayStart;

src/core/public/ui_settings/ui_settings_api.ts

@@ -66,7 +66,7 @@ export class UiSettingsApi {
    * before sending the next request
    */
   public batchSet(key: string, value: any) {
-    return new Promise<UiSettingsApiResponse>((resolve, reject) => {
+    return new Promise<UiSettingsApiResponse | undefined>((resolve, reject) => {
       const prev = this.pendingChanges || NOOP_CHANGES;
 
       this.pendingChanges = {

src/core/public/ui_settings/ui_settings_client.ts

@@ -198,7 +198,7 @@ You can use \`IUiSettingsClient.get("${key}", defaultValue)\`, which will just r
     this.setLocally(key, newVal);
 
     try {
-      const { settings } = await this.api.batchSet(key, newVal);
+      const { settings } = (await this.api.batchSet(key, newVal)) || {};
       this.cache = defaultsDeep({}, defaults, settings);
       this.saved$.next({ key, newValue: newVal, oldValue: initialVal });
       return true;

src/core/public/ui_settings/ui_settings_service.ts

@@ -37,7 +37,7 @@ import { UiSettingsApi } from './ui_settings_api';
 import { UiSettingsClient } from './ui_settings_client';
 import { IUiSettingsClient } from './types';
 
-interface UiSettingsServiceDeps {
+export interface UiSettingsServiceDeps {
   http: HttpSetup;
   injectedMetadata: InjectedMetadataSetup;
 }

src/core/server/context/context_service.ts

@@ -32,7 +32,7 @@ import { PluginOpaqueId } from '../../server';
 import { IContextContainer, ContextContainer, HandlerFunction } from '../../utils/context';
 import { CoreContext } from '../core_context';
 
-interface SetupDeps {
+export interface SetupDeps {
   pluginDependencies: ReadonlyMap<PluginOpaqueId, PluginOpaqueId[]>;
 }
 

src/core/server/http/http_service.ts

@@ -56,7 +56,7 @@ import {
 import { RequestHandlerContext } from '../../server';
 import { registerCoreHandlers } from './lifecycle_handlers';
 
-interface SetupDeps {
+export interface SetupDeps {
   context: ContextSetup;
 }
 

src/core/server/http/router/response_adapter.ts

@@ -117,7 +117,9 @@ export class HapiResponseAdapter {
   private toRedirect(
     opensearchDashboardsResponse: OpenSearchDashboardsResponse<HttpResponsePayload>
   ) {
-    const { headers } = opensearchDashboardsResponse.options;
+    const {
+      headers,
+    }: { headers?: Record<string, string | string[]> } = opensearchDashboardsResponse.options;
     if (!headers || typeof headers.location !== 'string') {
       throw new Error("expected 'location' header to be set");
     }

src/core/server/logging/appenders/file/file_appender.ts

@@ -82,7 +82,7 @@ export class FileAppender implements DisposableAppender {
    * Disposes `FileAppender`. Waits for the underlying file stream to be completely flushed and closed.
    */
   public async dispose() {
-    await new Promise((resolve) => {
+    await new Promise<void>((resolve) => {
       if (this.outputStream === undefined) {
         return resolve();
       }