Skip to content

Commit

Permalink
Don't bootstrap core type emits (elastic#66377) (elastic#66701)
Browse files Browse the repository at this point in the history
  • Loading branch information
rudolf authored May 15, 2020
1 parent 6edb396 commit 3a4c86b
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 15 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ module.exports = {
// for absolute imports until fixed in
// https://github.com/elastic/kibana/issues/36096
'!src/core/server/*.test.mocks{,.ts}',

'target/types/**',
],
allowSameFolder: true,
errorMessage:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"kbn:watch": "node scripts/kibana --dev --logging.json=false",
"build:types": "tsc --p tsconfig.types.json",
"docs:acceptApiChanges": "node --max-old-space-size=6144 scripts/check_published_api_changes.js --accept",
"kbn:bootstrap": "yarn build:types && node scripts/register_git_hook",
"kbn:bootstrap": "node scripts/register_git_hook",
"spec_to_console": "node scripts/spec_to_console",
"storybook": "node scripts/storybook"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import { fold } from 'fp-ts/lib/Either';
import { identity } from 'fp-ts/lib/function';
import { pipe } from 'fp-ts/lib/pipeable';
import createContainer from 'constate';
import { HttpHandler } from 'target/types/core/public/http';
import { ToastInput } from 'target/types/core/public/notifications/toasts/toasts_api';
import { HttpHandler } from 'src/core/public';
import { ToastInput } from 'src/core/public';
import {
SourceResponseRuntimeType,
SourceResponse,
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/infra/public/hooks/use_http_request.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import React, { useMemo, useState } from 'react';
import { IHttpFetchError } from 'src/core/public';
import { i18n } from '@kbn/i18n';
import { HttpHandler } from 'target/types/core/public/http';
import { ToastInput } from 'target/types/core/public/notifications/toasts/toasts_api';
import { HttpHandler } from 'src/core/public';
import { ToastInput } from 'src/core/public';
import { useTrackedPromise } from '../utils/use_tracked_promise';
import { useKibana } from '../../../../../src/plugins/kibana_react/public';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import DateMath from '@elastic/datemath';
import { isEqual } from 'lodash';
import { useEffect, useState } from 'react';
import { HttpHandler } from 'target/types/core/public/http';
import { HttpHandler } from 'src/core/public';
import { IIndexPattern } from 'src/plugins/data/public';
import { SourceQuery } from '../../../../../common/graphql/types';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
*/
import { set } from 'lodash/fp';

import { RequestHandlerContext } from 'src/core/server';
import { SetupPlugins } from '../../../../plugin';
import { KibanaRequest } from '../../../../../../../../src/core/server';
import { RequestHandlerContext } from '../../../../../../../../target/types/core/server';
import { FrameworkRequest } from '../../../framework';

export const buildFrameworkRequest = async (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

import React, { Fragment } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import { IHttpFetchError } from 'src/core/public';
import { EmptyStateError } from './empty_state_error';
import { EmptyStateLoading } from './empty_state_loading';
import { DataOrIndexMissing } from './data_or_index_missing';
import { DynamicSettings, StatesIndexStatus } from '../../../../common/runtime_types';
import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';

interface EmptyStateProps {
children: JSX.Element[] | JSX.Element;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { EuiEmptyPrompt, EuiPanel, EuiTitle, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React, { Fragment } from 'react';
import { IHttpFetchError } from '../../../../../../../target/types/core/public/http';
import { IHttpFetchError } from 'src/core/public';

interface EmptyStateErrorProps {
errors: IHttpFetchError[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
*/

import { createAction } from 'redux-actions';
import { IHttpFetchError } from 'src/core/public';
import { QueryParams } from './types';
import { MonitorDurationResult } from '../../../common/types';
import { IHttpFetchError } from '../../../../../../target/types/core/public/http';

type MonitorQueryParams = QueryParams & { monitorId: string };

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/uptime/public/state/actions/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { Action } from 'redux-actions';
import { IHttpFetchError } from '../../../../../../target/types/core/public/http';
import { IHttpFetchError } from 'src/core/public';

export interface AsyncAction<Payload, SuccessPayload> {
get: (payload: Payload) => Action<Payload>;
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/uptime/public/state/actions/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/

import { createAction } from 'redux-actions';
import { IHttpFetchError } from 'src/core/public';
import { AsyncAction, AsyncAction1 } from './types';
import { IHttpFetchError } from '../../../../../../target/types/core/public/http';

export function createAsyncAction<Payload, SuccessPayload>(
actionStr: string
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/uptime/public/state/api/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { PathReporter } from 'io-ts/lib/PathReporter';
import { isRight } from 'fp-ts/lib/Either';
import { HttpFetchQuery, HttpSetup } from '../../../../../../target/types/core/public';
import { HttpFetchQuery, HttpSetup } from 'src/core/public';

class ApiService {
private static instance: ApiService;
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/uptime/public/state/effects/fetch_effect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { call, put } from 'redux-saga/effects';
import { Action } from 'redux-actions';
import { IHttpFetchError } from '../../../../../../target/types/core/public/http';
import { IHttpFetchError } from 'src/core/public';

/**
* Factory function for a fetch effect. It expects three action creators,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/uptime/public/state/reducers/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { IHttpFetchError } from '../../../../../../target/types/core/public/http';
import { IHttpFetchError } from 'src/core/public';

export interface AsyncInitialState<ReduceStateType> {
data: ReduceStateType | null;
Expand Down

0 comments on commit 3a4c86b

Please sign in to comment.