From b614604effda51ca7c76c8901be78ced62b642b2 Mon Sep 17 00:00:00 2001 From: Marcin Aman Date: Thu, 28 May 2020 16:17:13 +0200 Subject: Update TS migration to current dev, move to a common package, rename to frontend --- .../src/main/components/app/index.scss | 21 ------- .../src/main/components/app/index.tsx | 11 ---- core/search-component/src/main/components/root.tsx | 43 --------------- .../src/main/components/search/search.tsx | 45 --------------- .../src/main/components/search/types.ts | 26 --------- core/search-component/src/main/scss/index.scss | 1 - core/search-component/tsconfig.json | 34 ------------ core/search-component/types/@jetbrains/index.d.ts | 3 - core/search-component/types/index.d.ts | 1 - plugins/base/build.gradle.kts | 8 +-- plugins/base/frontend/.gitignore | 3 + plugins/base/frontend/build.gradle.kts | 18 ++++++ plugins/base/frontend/package.json | 57 +++++++++++++++++++ plugins/base/frontend/postcss.config.js | 16 ++++++ .../frontend/src/main/components/app/index.scss | 21 +++++++ .../frontend/src/main/components/app/index.tsx | 50 +++++++++++++++++ plugins/base/frontend/src/main/components/root.tsx | 43 +++++++++++++++ .../frontend/src/main/components/search/search.tsx | 45 +++++++++++++++ .../frontend/src/main/components/search/types.ts | 26 +++++++++ plugins/base/frontend/src/main/scss/index.scss | 1 + .../frontend/src/main/types/@jetbrains/index.d.ts | 3 + plugins/base/frontend/stylelint.config.js | 4 ++ plugins/base/frontend/tsconfig.json | 30 ++++++++++ plugins/base/frontend/webpack.config.js | 64 ++++++++++++++++++++++ plugins/base/search-component/.gitignore | 3 - plugins/base/search-component/build.gradle.kts | 18 ------ plugins/base/search-component/package.json | 60 -------------------- plugins/base/search-component/postcss.config.js | 16 ------ .../src/main/js/search/app-root.js | 47 ---------------- plugins/base/search-component/stylelint.config.js | 4 -- plugins/base/search-component/webpack.config.js | 64 ---------------------- settings.gradle.kts | 4 +- 32 files changed, 388 insertions(+), 402 deletions(-) delete mode 100644 core/search-component/src/main/components/app/index.scss delete mode 100644 core/search-component/src/main/components/app/index.tsx delete mode 100644 core/search-component/src/main/components/root.tsx delete mode 100644 core/search-component/src/main/components/search/search.tsx delete mode 100644 core/search-component/src/main/components/search/types.ts delete mode 100644 core/search-component/src/main/scss/index.scss delete mode 100644 core/search-component/tsconfig.json delete mode 100644 core/search-component/types/@jetbrains/index.d.ts delete mode 100644 core/search-component/types/index.d.ts create mode 100644 plugins/base/frontend/.gitignore create mode 100644 plugins/base/frontend/build.gradle.kts create mode 100644 plugins/base/frontend/package.json create mode 100644 plugins/base/frontend/postcss.config.js create mode 100644 plugins/base/frontend/src/main/components/app/index.scss create mode 100644 plugins/base/frontend/src/main/components/app/index.tsx create mode 100644 plugins/base/frontend/src/main/components/root.tsx create mode 100644 plugins/base/frontend/src/main/components/search/search.tsx create mode 100644 plugins/base/frontend/src/main/components/search/types.ts create mode 100644 plugins/base/frontend/src/main/scss/index.scss create mode 100644 plugins/base/frontend/src/main/types/@jetbrains/index.d.ts create mode 100644 plugins/base/frontend/stylelint.config.js create mode 100644 plugins/base/frontend/tsconfig.json create mode 100644 plugins/base/frontend/webpack.config.js delete mode 100644 plugins/base/search-component/.gitignore delete mode 100644 plugins/base/search-component/build.gradle.kts delete mode 100644 plugins/base/search-component/package.json delete mode 100644 plugins/base/search-component/postcss.config.js delete mode 100644 plugins/base/search-component/src/main/js/search/app-root.js delete mode 100644 plugins/base/search-component/stylelint.config.js delete mode 100644 plugins/base/search-component/webpack.config.js diff --git a/core/search-component/src/main/components/app/index.scss b/core/search-component/src/main/components/app/index.scss deleted file mode 100644 index a7406115..00000000 --- a/core/search-component/src/main/components/app/index.scss +++ /dev/null @@ -1,21 +0,0 @@ -@import "src/main/scss/index"; - -html, -.app-root { - height: 100%; -} - -.search-root { - margin: 0; - padding: 0; - - background: var(--ring-content-background-color); - - font-family: var(--ring-font-family); - font-size: var(--ring-font-size); - line-height: var(--ring-line-height); -} - -.search-content { - margin: calc(var(--ring-unit) * 4); -} diff --git a/core/search-component/src/main/components/app/index.tsx b/core/search-component/src/main/components/app/index.tsx deleted file mode 100644 index 3427c1ce..00000000 --- a/core/search-component/src/main/components/app/index.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react'; -import {WithFuzzySearchFilter} from '../search/search'; -import './index.scss'; - -const App: React.FC = () => ( -
- -
-) - -export default App diff --git a/core/search-component/src/main/components/root.tsx b/core/search-component/src/main/components/root.tsx deleted file mode 100644 index 70ed9550..00000000 --- a/core/search-component/src/main/components/root.tsx +++ /dev/null @@ -1,43 +0,0 @@ -import React from 'react'; -import {render} from 'react-dom'; -import RedBox from 'redbox-react'; - -import App from "./app"; -import './app/index.scss'; - -const appEl = document.getElementById('searchBar'); -const rootEl = document.createElement('div'); - -let renderApp = () => { - render( - , - rootEl - ); -}; - -// @ts-ignore -if (module.hot) { - const renderAppHot = renderApp; - const renderError = (error: Error) => { - render( - , - rootEl - ); - }; - - renderApp = () => { - try { - renderAppHot(); - } catch (error) { - renderError(error); - } - }; - - // @ts-ignore - module.hot.accept('./app', () => { - setTimeout(renderApp); - }); -} - -renderApp(); -appEl!.appendChild(rootEl); diff --git a/core/search-component/src/main/components/search/search.tsx b/core/search-component/src/main/components/search/search.tsx deleted file mode 100644 index f0df0c98..00000000 --- a/core/search-component/src/main/components/search/search.tsx +++ /dev/null @@ -1,45 +0,0 @@ -import React, {useCallback, useState} from 'react'; -import {Select} from '@jetbrains/ring-ui'; -import '@jetbrains/ring-ui/components/input-size/input-size.scss'; -import {IWindow, Option, Props, State} from "./types"; - -const WithFuzzySearchFilterComponent: React.FC = ({data}: Props) => { - const [selected, onSelected] = useState