diff --git a/build.gradle b/build.gradle index ece1ff641..26314f8f6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,14 @@ plugins { id 'org.springframework.boot' version '2.5.2' id 'io.spring.dependency-management' version '1.0.11.RELEASE' - id "org.asciidoctor.convert" version "1.5.9.2" + id "org.asciidoctor.jvm.convert" version "3.3.2" id 'java' } +configurations { + asciidoctorExt +} + group = 'nextstep' version = '0.0.1-SNAPSHOT' sourceCompatibility = '1.8' @@ -31,7 +35,7 @@ dependencies { implementation 'io.jsonwebtoken:jjwt:0.9.1' // rest docs - asciidoctor 'org.springframework.restdocs:spring-restdocs-asciidoctor:2.0.5.RELEASE' + asciidoctorExt 'org.springframework.restdocs:spring-restdocs-asciidoctor:2.0.5.RELEASE' testImplementation 'org.springframework.restdocs:spring-restdocs-restassured:2.0.5.RELEASE' // test @@ -61,6 +65,7 @@ task testDocument(type: Test) { asciidoctor { inputs.dir snippetsDir + configurations 'asciidoctorExt' dependsOn test } @@ -72,8 +77,8 @@ bootJar { } task copyDocument(type: Copy) { - dependsOn testDocument + dependsOn asciidoctor - from file("build/asciidoc/html5/index.html") + from file("build/docs/asciidoc") into file("src/main/resources/static/docs") } \ No newline at end of file diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 13076db73..0a7e25891 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -9724,9 +9724,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "minipass": { @@ -15409,7 +15409,8 @@ }, "ssri": { "version": "6.0.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { "figgy-pudding": "^3.5.1" diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc index 44b1421ae..6519fda8c 100644 --- a/src/docs/asciidoc/index.adoc +++ b/src/docs/asciidoc/index.adoc @@ -6,4 +6,9 @@ :toclevels: 2 :sectlinks: -include::path.adoc[] \ No newline at end of file +[[path]] +== 지하철 경로 + +=== 경로 조회 + +operation::path[snippets='http-request,http-response'] \ No newline at end of file diff --git a/src/docs/asciidoc/path.adoc b/src/docs/asciidoc/path.adoc deleted file mode 100644 index 2a15a9cbb..000000000 --- a/src/docs/asciidoc/path.adoc +++ /dev/null @@ -1,12 +0,0 @@ -[[path]] -== 지하철 경로 - -=== 경로 조회 - -==== Request - -include::{snippets}/path/http-request.adoc[] - -==== Response - -include::{snippets}/path/http-response.adoc[] \ No newline at end of file