Skip to content

Commit

Permalink
Revert "Deno fix #6131 (#6248)" (#6281)
Browse files Browse the repository at this point in the history
* Revert "Deno fix #6131 (#6248)"

This reverts commit ef5cea4.

* Create gold-months-live.md
  • Loading branch information
matthewp authored Feb 17, 2023
1 parent 7a717d6 commit 609b249
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 58 deletions.
5 changes: 5 additions & 0 deletions .changeset/gold-months-live.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/deno": patch
---

Revert prerender fix
14 changes: 4 additions & 10 deletions packages/astro/src/core/build/plugins/plugin-ssr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export function vitePluginSSR(internals: BuildInternals, adapter: AstroAdapter):
},
load(id) {
if (id === resolvedVirtualModuleId) {
return `import * as _adapter from '${adapter.serverEntrypoint}';
return `import * as adapter from '${adapter.serverEntrypoint}';
import * as _main from '${pagesVirtualModuleId}';
import { deserializeManifest as _deserializeManifest } from 'astro/app';
const _manifest = Object.assign(_deserializeManifest('${manifestReplace}'), {
Expand All @@ -47,7 +47,7 @@ const _args = ${adapter.args ? JSON.stringify(adapter.args) : 'undefined'};
export * from '${pagesVirtualModuleId}';
${
adapter.exports
? `const _exports = _adapter.createExports(_manifest, _args);
? `const _exports = adapter.createExports(_manifest, _args);
${adapter.exports
.map((name) => {
if (name === 'default') {
Expand All @@ -61,15 +61,9 @@ export { _default as default };`;
`
: ''
}
export const adapter = _adapter
${
adapter.name !== '@astrojs/deno'
? `
const _start = 'start';
if(_start in _adapter) {
_adapter[_start](_manifest, _args);
}`
: ''
if(_start in adapter) {
adapter[_start](_manifest, _args);
}`;
}
return void 0;
Expand Down
2 changes: 0 additions & 2 deletions packages/integrations/deno/src/code-constant.ts

This file was deleted.

4 changes: 1 addition & 3 deletions packages/integrations/deno/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import esbuild from 'esbuild';
import * as fs from 'fs';
import * as npath from 'path';
import { fileURLToPath } from 'url';
import * as CONSTANT from './code-constant';

interface BuildConfig {
server: URL;
Expand Down Expand Up @@ -71,8 +70,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
'astro:build:done': async () => {
const entryUrl = new URL(_buildConfig.serverEntry, _buildConfig.server);
const pth = fileURLToPath(entryUrl);
const content = await fs.readFileSync(pth, 'utf8');
await fs.writeFileSync(pth, `${CONSTANT.DEFAULTIMPORT}${content}${CONSTANT.DEFAULTSTART}`);

await esbuild.build({
target: 'es2020',
platform: 'browser',
Expand Down
21 changes: 7 additions & 14 deletions packages/integrations/deno/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@
import type { SSRManifest } from 'astro';
import { App } from 'astro/app';

// @ts-ignore
import { Server } from 'https://deno.land/[email protected]/http/server.ts';
// @ts-ignore
import { fetch } from 'https://deno.land/x/file_fetch/mod.ts';


interface Options {
port?: number;
hostname?: string;
start?: boolean;
}

// @ts-ignore
let _server: Server | undefined = undefined;
let _startPromise: Promise<void> | undefined = undefined;

Expand Down Expand Up @@ -36,18 +41,7 @@ export function start(manifest: SSRManifest, options: Options) {
// try to fetch a static file instead
const url = new URL(request.url);
const localPath = new URL('./' + app.removeBase(url.pathname), clientRoot);
const stringLocalPath = localPath.toString();
// @ts-ignore
const extendName = fileExtension(stringLocalPath);
const fileResp = await fetch(
!extendName
? `${
stringLocalPath.endsWith('/')
? `${stringLocalPath}index.html`
: `${stringLocalPath}/index.html`
}`
: stringLocalPath
);
const fileResp = await fetch(localPath.toString());

// If the static file can't be found
if (fileResp.status == 404) {
Expand All @@ -68,7 +62,6 @@ export function start(manifest: SSRManifest, options: Options) {
};

const port = options.port ?? 8085;
// @ts-ignore
_server = new Server({
port,
hostname: options.hostname ?? '0.0.0.0',
Expand Down
20 changes: 0 additions & 20 deletions packages/integrations/deno/test/basics.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,23 +143,3 @@ Deno.test({
sanitizeResources: false,
sanitizeOps: false,
});

Deno.test({
name: 'perendering',
permissions: defaultTestPermissions,
async fn() {
await startApp(async (baseUrl: URL) => {
const resp = await fetch(new URL('perendering', baseUrl));
assertEquals(resp.status, 200);

const html = await resp.text();
assert(html);

const doc = new DOMParser().parseFromString(html, `text/html`);
const h1 = doc!.querySelector('h1');
assertEquals(h1!.innerText, 'test');
});
},
sanitizeResources: false,
sanitizeOps: false,
});

This file was deleted.

0 comments on commit 609b249

Please sign in to comment.