Merge pull request #9 from brunobmello25/master

fix: remove article from wrapping content
asnunes · Mar 1, 2021 · cb658c1 · cb658c1
2 parents 6b4add0 + 8630467
commit cb658c1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 30 deletions.
diff --git a/__tests__/mocks/html.ts b/__tests__/mocks/html.ts
@@ -265,17 +265,13 @@ const HEADER = `\
 </header>
 `;
 
-const ARTICLE_CONTENT = `\
-<article class="page sans">
-  ${HEADER}
-  <p>Hello World</p>
-</article>
+const CONTENT_WITH_HEADER = `\
+${HEADER}
+<p>Hello World</p>
 `;
 
-const ARTICLE_CONTENT_WITHOUT_HEADER = `\
-<article class="page sans">
-  <p>Hello World</p>
-</article>
+const CONTENT_WITHOUT_HEADER = `\
+<p>Hello World</p>
 `;
 
 export const FULL_DOCUMENT = `
@@ -289,7 +285,7 @@ export const FULL_DOCUMENT = `
     <link href="https://unpkg.com/prismjs@1.22.0/themes/prism.css" rel="stylesheet">
   </head>
   <body>
-    ${ARTICLE_CONTENT}
+    ${CONTENT_WITH_HEADER}
     <script src="https://unpkg.com/prismjs@1.22.0/components/prism-core.min.js"></script>
     <script src="https://unpkg.com/prismjs@1.22.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script>
@@ -316,7 +312,7 @@ export const DOCUMENT_WITHOUT_TITLE = `
     <link href="https://unpkg.com/prismjs@1.22.0/themes/prism.css" rel="stylesheet">
   </head>
   <body>
-    ${ARTICLE_CONTENT}
+    ${CONTENT_WITH_HEADER}
     <script src="https://unpkg.com/prismjs@1.22.0/components/prism-core.min.js"></script>
     <script src="https://unpkg.com/prismjs@1.22.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script>
@@ -343,7 +339,7 @@ export const DOCUMENT_WITHOUT_CSS = `
     <link href="https://unpkg.com/prismjs@1.22.0/themes/prism.css" rel="stylesheet">
   </head>
   <body>
-    ${ARTICLE_CONTENT}
+    ${CONTENT_WITH_HEADER}
     <script src="https://unpkg.com/prismjs@1.22.0/components/prism-core.min.js"></script>
     <script src="https://unpkg.com/prismjs@1.22.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script>
@@ -369,7 +365,7 @@ export const DOCUMENT_METADATA = `
     <link href="https://unpkg.com/prismjs@1.22.0/themes/prism.css" rel="stylesheet">
   </head>
   <body>
-    ${ARTICLE_CONTENT}
+    ${CONTENT_WITH_HEADER}
     <script src="https://unpkg.com/prismjs@1.22.0/components/prism-core.min.js"></script>
     <script src="https://unpkg.com/prismjs@1.22.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script>
@@ -396,7 +392,7 @@ export const DOCUMENT_WITHOUT_SCRIPTS = `
     <title>Simple Page Test</title>
   </head>
   <body>
-    ${ARTICLE_CONTENT}
+    ${CONTENT_WITH_HEADER}
   </body>
 </html>
 `;
@@ -412,7 +408,7 @@ export const FULL_DOCUMENT_WITHOUT_HEADER_IN_BODY = `
     <link href="https://unpkg.com/prismjs@1.22.0/themes/prism.css" rel="stylesheet">
   </head>
   <body>
-    ${ARTICLE_CONTENT_WITHOUT_HEADER}
+    ${CONTENT_WITHOUT_HEADER}
     <script src="https://unpkg.com/prismjs@1.22.0/components/prism-core.min.js"></script>
     <script src="https://unpkg.com/prismjs@1.22.0/plugins/autoloader/prism-autoloader.min.js"></script>
     <script>
@@ -429,7 +425,7 @@ export const FULL_DOCUMENT_WITHOUT_HEADER_IN_BODY = `
 </html>
 `;
 
-export const BODY_ONLY = ARTICLE_CONTENT_WITHOUT_HEADER;
+export const BODY_ONLY = CONTENT_WITHOUT_HEADER;
 
 export const HEADER_WITH_TITLE_ONLY = `\
 <header>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-page-to-html",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "It converts public notion pages to html from url",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -44,6 +44,5 @@
     "prettier": "^2.1.2",
     "ts-jest": "^26.4.3",
     "typescript": "^4.0.5"
-  },
-  "dependencies": {}
+  }
 }
diff --git a/src/data/usecases/html-wrapper/options-html-wrapper.ts b/src/data/usecases/html-wrapper/options-html-wrapper.ts
@@ -13,11 +13,7 @@ export class OptionsHtmlWrapper implements HtmlWrapper {
   }
 
   wrapHtml(pageProps: PageProps, html: string): string {
-    if (this._options.bodyContentOnly)
-      return `\
-<article class="page sans">
-${html}
-</article>`;
+    if (this._options.bodyContentOnly) return html;
 
     const title = pageProps.title;
 
@@ -26,10 +22,8 @@ ${html}
 <html>
 ${this._headFromTemplate(title)}
 <body>
-<article class="page sans">
 ${!this._options.excludeHeaderFromBody ? new HeaderFromTemplate(pageProps).toHeader() : ''}
 ${html}
-</article>
 ${!this._options.excludeScripts ? SCRIPTS : ''}
 </body>
 </html>`;