Skip to content

Commit

Permalink
remove legacy styles and placeholder replacement logic
Browse files Browse the repository at this point in the history
  • Loading branch information
spalger committed Jul 24, 2020
1 parent ed1b245 commit 5b6c5c6
Show file tree
Hide file tree
Showing 48 changed files with 332 additions and 1,700 deletions.
5 changes: 0 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@
"angular-route": "^1.7.9",
"angular-sanitize": "^1.7.9",
"angular-sortable-view": "^0.0.17",
"autoprefixer": "^9.7.4",
"bluebird": "3.5.5",
"boom": "^7.2.0",
"brace": "0.11.1",
Expand Down Expand Up @@ -434,7 +433,6 @@
"has-ansi": "^3.0.0",
"iedriver": "^3.14.2",
"intl-messageformat-parser": "^1.4.0",
"is-path-inside": "^2.1.0",
"jest": "^25.5.4",
"jest-canvas-mock": "^2.2.0",
"jest-circus": "^25.5.4",
Expand All @@ -455,14 +453,11 @@
"murmurhash3js": "3.0.1",
"mutation-observer": "^1.0.3",
"nock": "12.0.3",
"node-sass": "^4.13.1",
"normalize-path": "^3.0.0",
"nyc": "^15.0.1",
"pixelmatch": "^5.1.0",
"pkg-up": "^2.0.0",
"pngjs": "^3.4.0",
"postcss": "^7.0.26",
"postcss-url": "^8.0.0",
"prettier": "^2.0.5",
"proxyquire": "1.8.0",
"react-popper-tooltip": "^2.10.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-kibana/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"eslint-plugin-no-unsanitized": "^3.0.2",
"eslint-plugin-prefer-object-spread": "^1.2.1",
"eslint-plugin-react": "^7.17.0",
"eslint-plugin-react-hooks": "^2.3.0"
"eslint-plugin-react-hooks": "^4.0.4"
}
}
1 change: 1 addition & 0 deletions packages/kbn-optimizer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"loader-utils": "^1.2.3",
"node-sass": "^4.13.0",
"normalize-path": "^3.0.0",
"postcss": "^7.0.32",
"postcss-loader": "^3.0.0",
"raw-loader": "^3.1.0",
"resolve-url-loader": "^3.1.1",
Expand Down
22 changes: 0 additions & 22 deletions packages/kbn-ui-framework/doc_site/postcss.config.js

This file was deleted.

1 change: 0 additions & 1 deletion packages/kbn-ui-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"@elastic/eui": "0.0.55",
"@kbn/babel-preset": "1.0.0",
"@kbn/optimizer": "1.0.0",
"autoprefixer": "^9.7.4",
"babel-loader": "^8.0.6",
"brace": "0.11.1",
"chalk": "^2.4.2",
Expand Down
1 change: 0 additions & 1 deletion src/core/MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -1322,7 +1322,6 @@ This table shows where these uiExports have moved to in the New Platform. In mos
| `savedObjectTypes` | | Part of SavedObjects, see [#33587](https://github.com/elastic/kibana/issues/33587) |
| `search` | | |
| `shareContextMenuExtensions` | | |
| `styleSheetPaths` | | |
| `taskDefinitions` | | Should be an API on the taskManager plugin. |
| `uiCapabilities` | [`core.application.register`](/docs/development/core/public/kibana-plugin-core-public.applicationsetup.register.md) | |
| `uiSettingDefaults` | [`core.uiSettings.register`](/docs/development/core/server/kibana-plugin-core-server.uisettingsservicesetup.md) | |
Expand Down
2 changes: 1 addition & 1 deletion src/core/server/rendering/rendering_service.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class RenderingService implements CoreService<InternalRenderingServiceSet
const metadata: RenderingMetadata = {
strictCsp: http.csp.strict,
uiPublicUrl: `${basePath}/ui`,
bootstrapScriptUrl: `${basePath}/bundles/app/${appId}/bootstrap.js`,
bootstrapScriptUrl: `${basePath}/bootstrap.js`,
i18n: i18n.translate,
locale: i18n.getLocale(),
darkMode: settings.user?.['theme:darkMode']?.userValue
Expand Down
1 change: 1 addition & 0 deletions src/dev/jest/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export default {
'<rootDir>/src/cli_plugin',
'<rootDir>/packages/kbn-test/target/functional_test_runner',
'<rootDir>/src/dev',
'<rootDir>/src/optimize',
'<rootDir>/src/legacy/utils',
'<rootDir>/src/setup_node_env',
'<rootDir>/packages',
Expand Down
94 changes: 0 additions & 94 deletions src/dev/sass/build_sass.js

This file was deleted.

20 changes: 0 additions & 20 deletions src/dev/sass/index.js

This file was deleted.

47 changes: 0 additions & 47 deletions src/dev/sass/run_build_sass_cli.js

This file was deleted.

2 changes: 0 additions & 2 deletions src/legacy/core_plugins/kibana/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/

import Fs from 'fs';
import { resolve } from 'path';
import { promisify } from 'util';

import { getUiSettingDefaults } from './server/ui_setting_defaults';
Expand All @@ -40,7 +39,6 @@ export default function (kibana) {
},

uiExports: {
styleSheetPaths: resolve(__dirname, 'public/index.scss'),
uiSettingDefaults: getUiSettingDefaults(),
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import { SavedObjectsLegacyManagementDefinition } from '../../../core/server/sav
export type InitPluginFunction = (server: Server) => void;
export interface UiExports {
injectDefaultVars?: (server: Server) => { [key: string]: any };
styleSheetPaths?: string;
savedObjectsManagement?: SavedObjectsLegacyManagementDefinition;
mappings?: unknown;
visTypes?: string[];
Expand Down
2 changes: 0 additions & 2 deletions src/legacy/plugin_discovery/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ export interface LegacyPluginOptions {
hacks: string[];
visualize: string[];
devTools: string[];
styleSheetPaths: string;
injectDefaultVars: (server: Server) => Record<string, any>;
noParse: string[];
home: string[];
mappings: any;
migrations: any;
Expand Down
4 changes: 0 additions & 4 deletions src/legacy/server/kbn_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import { savedObjectsMixin } from './saved_objects/saved_objects_mixin';
import { capabilitiesMixin } from './capabilities';
import { serverExtensionsMixin } from './server_extensions';
import { uiMixin } from '../ui';
import { sassMixin } from './sass';
import { i18nMixin } from './i18n';

/**
Expand Down Expand Up @@ -124,9 +123,6 @@ export default class KbnServer {
// watch bundle server is running
optimizeMixin,

// transpiles SCSS into CSS
sassMixin,

// initialize the plugins
Plugins.initializeMixin,

Expand Down
Binary file removed src/legacy/server/sass/__fixtures__/images/img.png
Binary file not shown.
6 changes: 0 additions & 6 deletions src/legacy/server/sass/__fixtures__/index.scss

This file was deleted.

Loading

0 comments on commit 5b6c5c6

Please sign in to comment.