Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[eslint] automatically determine dev packages #127089

Merged
merged 2 commits into from
Mar 8, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -6,6 +6,11 @@
* Side Public License, v 1.
*/

const Path = require('path');
const Fs = require('fs');

const globby = require('globby');

const APACHE_2_0_LICENSE_HEADER = `
/*
* Licensed to Elasticsearch B.V. under one or more contributor
@@ -89,23 +94,16 @@ const SAFER_LODASH_SET_DEFINITELYTYPED_HEADER = `
*/
`;

const packagePkgJsons = globby.sync('*/package.json', {
cwd: Path.resolve(__dirname, 'packages'),
absolute: true,
});

/** Packages which should not be included within production code. */
const DEV_PACKAGES = [
'kbn-babel-code-parser',
'kbn-dev-utils',
'kbn-cli-dev-mode',
'kbn-docs-utils',
'kbn-es*',
'kbn-eslint*',
'kbn-optimizer',
'kbn-plugin-generator',
'kbn-plugin-helpers',
'kbn-pm',
'kbn-storybook',
'kbn-telemetry-tools',
'kbn-test',
'kbn-type-summarizer',
];
const DEV_PACKAGES = packagePkgJsons.flatMap((path) => {
const pkg = JSON.parse(Fs.readFileSync(path, 'utf8'));
return pkg.kibana && pkg.kibana.devOnly ? Path.dirname(Path.basename(path)) : [];
});

/** Directories (at any depth) which include dev-only code. */
const DEV_DIRECTORIES = [
3 changes: 3 additions & 0 deletions packages/kbn-babel-code-parser/package.json
Original file line number Diff line number Diff line change
@@ -8,5 +8,8 @@
"repository": {
"type": "git",
"url": "https://github.com/elastic/kibana/tree/main/packages/kbn-babel-code-parser"
},
"kibana": {
"devOnly": true
}
}
5 changes: 4 additions & 1 deletion packages/kbn-optimizer/package.json
Original file line number Diff line number Diff line change
@@ -3,5 +3,8 @@
"version": "1.0.0",
"private": true,
"license": "SSPL-1.0 OR Elastic License 2.0",
"main": "./target_node/index.js"
"main": "./target_node/index.js",
"kibana": {
"devOnly": true
}
}
5 changes: 4 additions & 1 deletion packages/kbn-plugin-generator/package.json
Original file line number Diff line number Diff line change
@@ -3,5 +3,8 @@
"version": "1.0.0",
"private": true,
"license": "SSPL-1.0 OR Elastic License 2.0",
"main": "target_node/index.js"
"main": "target_node/index.js",
"kibana": {
"devOnly": true
}
}
1 change: 0 additions & 1 deletion packages/kbn-test-jest-helpers/src/enzyme_helpers.tsx
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@
*/

import { I18nProvider, InjectedIntl, intlShape, __IntlProvider } from '@kbn/i18n-react';
// eslint-disable-next-line import/no-extraneous-dependencies
import { mount, ReactWrapper, render, shallow } from 'enzyme';
import React, { ReactElement, ValidationMap } from 'react';
import { act as reactAct } from 'react-dom/test-utils';
1 change: 0 additions & 1 deletion packages/kbn-test-jest-helpers/src/find_test_subject.ts
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
* Side Public License, v 1.
*/

// eslint-disable-next-line import/no-extraneous-dependencies
import { ReactWrapper } from 'enzyme';

type Matcher = '=' | '~=' | '|=' | '^=' | '$=' | '*=';
1 change: 0 additions & 1 deletion packages/kbn-test-jest-helpers/src/random.ts
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
* Side Public License, v 1.
*/

// eslint-disable-next-line import/no-extraneous-dependencies
import Chance from 'chance';

const chance = new Chance();
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@

import React, { ComponentType } from 'react';
import { Store } from 'redux';
// eslint-disable-next-line import/no-extraneous-dependencies
import { ReactWrapper } from 'enzyme';
import { act } from 'react-dom/test-utils';

1 change: 0 additions & 1 deletion packages/kbn-test-jest-helpers/src/testbed/testbed.ts
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@
*/

import { Component as ReactComponent } from 'react';
// eslint-disable-next-line import/no-extraneous-dependencies
import { ComponentType, HTMLAttributes, ReactWrapper } from 'enzyme';

import { findTestSubject } from '../find_test_subject';
1 change: 0 additions & 1 deletion packages/kbn-test-jest-helpers/src/testbed/types.ts
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@
*/

import { Store } from 'redux';
// eslint-disable-next-line import/no-extraneous-dependencies
import { ReactWrapper as GenericReactWrapper } from 'enzyme';
import { LocationDescriptor } from 'history';

5 changes: 4 additions & 1 deletion packages/kbn-type-summarizer/package.json
Original file line number Diff line number Diff line change
@@ -3,5 +3,8 @@
"version": "1.0.0",
"license": "SSPL-1.0 OR Elastic License 2.0",
"main": "./target_node/index.js",
"private": true
"private": true,
"kibana": {
"devOnly": true
}
}
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
* Side Public License, v 1.
*/

// eslint-disable-next-line import/no-extraneous-dependencies
import { expectType } from 'tsd';
import { MethodKeysOf } from '../..';

Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
* Side Public License, v 1.
*/

// eslint-disable-next-line import/no-extraneous-dependencies
import { expectType } from 'tsd';
import { PublicContract } from '../..';

Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
* Side Public License, v 1.
*/

// eslint-disable-next-line import/no-extraneous-dependencies
import { expectType } from 'tsd';
import { PublicKeys } from '../..';

Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
* Side Public License, v 1.
*/

// eslint-disable-next-line import/no-extraneous-dependencies
import { expectAssignable, expectNotAssignable } from 'tsd';
import { PublicMethodsOf } from '../..';

Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
* Side Public License, v 1.
*/

// eslint-disable-next-line import/no-extraneous-dependencies
import { expectType } from 'tsd';
import { ShallowPromise } from '../..';

Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
* Side Public License, v 1.
*/

// eslint-disable-next-line import/no-extraneous-dependencies
import { expectAssignable } from 'tsd';
import { UnionToIntersection } from '../..';

Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
* Side Public License, v 1.
*/

// eslint-disable-next-line import/no-extraneous-dependencies
import { expectAssignable } from 'tsd';
import { UnwrapObservable, ObservableLike } from '../..';

1 change: 0 additions & 1 deletion packages/kbn-utility-types/src/tsd_tests/test_d/values.ts
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
* Side Public License, v 1.
*/

// eslint-disable-next-line import/no-extraneous-dependencies
import { expectAssignable } from 'tsd';
import { Values } from '../..';

Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
* Side Public License, v 1.
*/

// eslint-disable-next-line import/no-extraneous-dependencies
import { expectAssignable } from 'tsd';
import { Writable } from '../..';