diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index cc4663fb..3346eda6 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -37,7 +37,7 @@ jobs: - name: Build with pandoc run: | npm ci - npm run pages "OASIS OData TC" + npm run pages - name: Upload artifact uses: actions/upload-pages-artifact@v3 diff --git a/lib/pages.js b/lib/pages.js index ef43d9f4..e393514f 100644 --- a/lib/pages.js +++ b/lib/pages.js @@ -8,7 +8,7 @@ function file(dir, title, filename) { console.log(`${dir}/${filename}`); pandoc( { - stdin: fs.createReadStream(`${__dirname}/../${dir}/${filename}`), + stdin: fs.createReadStream(`${dir}/${filename}`), stdout: fs.createWriteStream( `_site/${dir}/${filename === "README.md" ? "index.html" : filename.replace(/\.md$/, ".html")}`, ), @@ -23,11 +23,12 @@ function file(dir, title, filename) { } function directory(dir, title) { - if (fs.existsSync(`${__dirname}/../${dir}`)) { - fs.cpSync(`${__dirname}/../${dir}`, `_site/${dir}`, { - recursive: true, - }); - fs.readdirSync(`${__dirname}/../${dir}`) + if (fs.existsSync(dir)) { + if (dir !== ".") + fs.cpSync(`${dir}`, `_site/${dir}`, { + recursive: true, + }); + fs.readdirSync(dir) .filter((fn) => fn.endsWith(".md")) .forEach(function (filename) { file(dir, title, filename); @@ -39,7 +40,7 @@ fs.cpSync(`${__dirname}/../assets/styles`, `_site/styles`, { recursive: true, }); -file(".", "", "README.md"); +directory(".", ""); directory("docs", "Documents"); directory("examples", "Examples"); directory("vocabularies", "Vocabularies"); diff --git a/package.json b/package.json index 77217c4c..d4992cf9 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "url": "git+https://github.com/oasis-tcs/odata-vocabularies.git" }, "files": [ - "lib/*" + "lib/*", + "assets/*" ], "bin": { "odata-vocab2md": "lib/cli.js" @@ -32,7 +33,7 @@ }, "scripts": { "build": "node lib/transform.js", - "pages": "node lib/pages.js", + "pages": "node lib/pages.js \"OASIS OData TC\"", "test": "c8 -r html -r text mocha", "watch": "mocha --watch" },