diff --git a/.github/workflows/npm-test.yml b/.github/workflows/npm-test.yml index 2f9ad83..74ee945 100644 --- a/.github/workflows/npm-test.yml +++ b/.github/workflows/npm-test.yml @@ -4,10 +4,13 @@ name: NPM Test on: ["pull_request"] jobs: npm_test: + strategy: + matrix: + os: ["ubuntu-20.04", "windows-latest"] if: "!contains(github.event.head_commit.message, 'skip ci')" name: Run NPM Test - runs-on: ubuntu-latest timeout-minutes: 30 + runs-on: ${{ matrix.os }} steps: - name: Checkout uses: actions/checkout@v1 diff --git a/nsm/scripts/generate-routes.js b/nsm/scripts/generate-routes.js index 2569117..e551f9e 100644 --- a/nsm/scripts/generate-routes.js +++ b/nsm/scripts/generate-routes.js @@ -41,6 +41,8 @@ async function generateNsmPagesManifest(rootDir, outputDir) { filenameWithoutExtension, ) + console.log({ filePathWithoutExtension }) + manifest[`/${filePathWithoutExtension}`] = `pages/${relativePagePath}` } @@ -56,16 +58,17 @@ async function generateNsmPagesManifest(rootDir, outputDir) { } function getStaticRoutesFiles({ nextless, staticFiles }) { + console.log("static files", JSON.stringify(staticFiles, null, 2)) return nextless ? "" : `, ${staticFiles - .filter((fp) => fp.startsWith("static/")) + .filter((fp) => fp.startsWith("static")) .map( (fp) => `"/_next/${fp}": serveStatic("${ fp.split(".").slice(-1)[0] - }", require("./generated_static/${fp}.ts").default)`, + }", require(path.resolve(__dirname, "./generated_static/${fp}.ts")).default)`, )}` } @@ -84,6 +87,7 @@ async function generateRouteFile({ return await prettier.format( `// @ts-nocheck import serveStatic from "./serve-static" + import path from "node:path" export default { ${Object.entries(pagesManifest) .filter(([route, fp]) => { @@ -164,12 +168,12 @@ async function generateRoutes({ onlyApiFiles = false }) { const staticDir = path.resolve(nextDir, "static") const staticFiles = (await glob("**/*", { cwd: staticDir, nodir: true })) - .map((fp) => `static/${fp}`) + .map((fp) => path.join('static', fp)) .concat( (await glob("**/*", { cwd: pagesDir, nodir: true })) .filter((fp) => !fp.startsWith("api")) .filter((fp) => !fp.endsWith(".nft.json")) - .map((fp) => `server/pages/${fp}`), + .map((fp) => path.join('server', 'pages', fp)), ) .filter((fp) => fp.includes("."))