aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.idea/compiler.xml2
-rw-r--r--core/build.gradle.kts4
-rw-r--r--core/search-component/.gitignore (renamed from search-component/.gitignore)0
-rw-r--r--core/search-component/build.gradle.kts (renamed from search-component/build.gradle.kts)2
-rw-r--r--core/search-component/package.json (renamed from search-component/package.json)0
-rw-r--r--core/search-component/postcss.config.js (renamed from search-component/postcss.config.js)0
-rw-r--r--core/search-component/src/main/js/search/app-root.js (renamed from search-component/src/main/js/search/app-root.js)0
-rw-r--r--core/search-component/src/main/js/search/app.css (renamed from search-component/src/main/js/search/app.css)0
-rw-r--r--core/search-component/src/main/js/search/app.js (renamed from search-component/src/main/js/search/app.js)0
-rw-r--r--core/search-component/src/main/js/search/search.js (renamed from search-component/src/main/js/search/search.js)5
-rw-r--r--core/search-component/stylelint.config.js (renamed from search-component/stylelint.config.js)0
-rw-r--r--core/search-component/webpack.config.js (renamed from search-component/webpack.config.js)0
-rw-r--r--settings.gradle.kts2
13 files changed, 8 insertions, 7 deletions
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ed6162d8..7ee14d19 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -25,6 +25,8 @@
<module name="dokka.buildSrc.main" target="1.8" />
<module name="dokka.buildSrc.test" target="1.8" />
<module name="dokka.core.main" target="1.8" />
+ <module name="dokka.core.search-component.main" target="1.8" />
+ <module name="dokka.core.search-component.test" target="1.8" />
<module name="dokka.core.test" target="1.8" />
<module name="dokka.core.testApi.main" target="1.8" />
<module name="dokka.core.testApi.test" target="1.8" />
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 2ea57e09..bcc74480 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -25,9 +25,9 @@ val sourceJar by tasks.registering(Jar::class) {
}
task("copy_search", Copy::class) {
- from(File(project(":search-component").projectDir, "dist/"))
+ from(File(project(":core:search-component").projectDir, "dist/"))
destinationDir = File(sourceSets.main.get().resources.sourceDirectories.singleFile, "dokka/scripts")
-}.dependsOn(":search-component:generateSearchFiles")
+}.dependsOn(":core:search-component:generateSearchFiles")
tasks {
processResources {
diff --git a/search-component/.gitignore b/core/search-component/.gitignore
index 9220c11f..9220c11f 100644
--- a/search-component/.gitignore
+++ b/core/search-component/.gitignore
diff --git a/search-component/build.gradle.kts b/core/search-component/build.gradle.kts
index ab123e51..ce747c5e 100644
--- a/search-component/build.gradle.kts
+++ b/core/search-component/build.gradle.kts
@@ -9,7 +9,7 @@ task("generateSearchFiles") {
tasks {
"npm_run_build" {
inputs.dir("$projectDir/src/main/js/search/")
- inputs.files("$projectDir/package.json", "$projectDir/*.config.js")
+ inputs.files("$projectDir/package.json", "$projectDir/webpack.config.js")
outputs.dir("$projectDir/dist/")
}
clean {
diff --git a/search-component/package.json b/core/search-component/package.json
index fa997c44..fa997c44 100644
--- a/search-component/package.json
+++ b/core/search-component/package.json
diff --git a/search-component/postcss.config.js b/core/search-component/postcss.config.js
index ce65774e..ce65774e 100644
--- a/search-component/postcss.config.js
+++ b/core/search-component/postcss.config.js
diff --git a/search-component/src/main/js/search/app-root.js b/core/search-component/src/main/js/search/app-root.js
index 25a374a5..25a374a5 100644
--- a/search-component/src/main/js/search/app-root.js
+++ b/core/search-component/src/main/js/search/app-root.js
diff --git a/search-component/src/main/js/search/app.css b/core/search-component/src/main/js/search/app.css
index 933237e0..933237e0 100644
--- a/search-component/src/main/js/search/app.css
+++ b/core/search-component/src/main/js/search/app.css
diff --git a/search-component/src/main/js/search/app.js b/core/search-component/src/main/js/search/app.js
index 64091607..64091607 100644
--- a/search-component/src/main/js/search/app.js
+++ b/core/search-component/src/main/js/search/app.js
diff --git a/search-component/src/main/js/search/search.js b/core/search-component/src/main/js/search/search.js
index ea51b9a7..a742f11d 100644
--- a/search-component/src/main/js/search/search.js
+++ b/core/search-component/src/main/js/search/search.js
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
-import {Select} from '@jetbrains/ring-ui/components/select/select';;
+import Select from '@jetbrains/ring-ui/components/select/select';
import '@jetbrains/ring-ui/components/input-size/input-size.scss';
class WithFuzzySearchFilterComponent extends Component {
@@ -44,8 +44,7 @@ export const WithFuzzySearchFilter = () => {
...page,
label: page.name,
key: i + 1,
- type: page.kind,
- icon: `${window.pathToRoot}${window.iconsFolderName}${page.kind}.png`
+ type: page.kind
}));
}
diff --git a/search-component/stylelint.config.js b/core/search-component/stylelint.config.js
index 02b3f4ac..02b3f4ac 100644
--- a/search-component/stylelint.config.js
+++ b/core/search-component/stylelint.config.js
diff --git a/search-component/webpack.config.js b/core/search-component/webpack.config.js
index a7b503b6..a7b503b6 100644
--- a/search-component/webpack.config.js
+++ b/core/search-component/webpack.config.js
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9f6d9421..cc86f4fc 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,7 @@
rootProject.name = "dokka"
include("core")
+include("core:search-component")
include("coreDependencies")
include("testApi")
include("test-tools")
@@ -13,7 +14,6 @@ include("plugins:gfm")
include("plugins:jekyll")
include("plugins:kotlin-as-java")
include("integration-tests:gradle-integration-tests")
-include("search-component")
pluginManagement {
val kotlin_version: String by settings