diff options
author | 2021-08-17 13:31:33 -0700 | |
---|---|---|
committer | 2021-08-17 13:31:33 -0700 | |
commit | ae01e9b98d481332236976344fa0386bafa82f53 (patch) | |
tree | 6049d32360c93074a3848726687d1d6e991f523b | |
parent | afcbcd231c9328bfd9b6ae8c81ea296d4235ae81 (diff) | |
download | bun-ae01e9b98d481332236976344fa0386bafa82f53.tar.gz bun-ae01e9b98d481332236976344fa0386bafa82f53.tar.zst bun-ae01e9b98d481332236976344fa0386bafa82f53.zip |
Move bun-framework-next folder, add tsconfig.json
Former-commit-id: cfd7b425f071f200504493fef206afb7c68de6d9
-rw-r--r-- | demos/hello-next/.eslintrc.json | 3 | ||||
-rw-r--r-- | demos/hello-next/bun-framework-next/client.development.tsx (renamed from demos/css-stress-test/bun-framework-next/client.development.tsx) | 0 | ||||
-rw-r--r-- | demos/hello-next/bun-framework-next/index.js (renamed from demos/css-stress-test/bun-framework-next/index.js) | 0 | ||||
-rw-r--r-- | demos/hello-next/bun-framework-next/next-server.tsx (renamed from demos/css-stress-test/bun-framework-next/next-server.tsx) | 0 | ||||
-rw-r--r-- | demos/hello-next/bun-framework-next/package.json (renamed from demos/css-stress-test/bun-framework-next/package.json) | 0 | ||||
-rw-r--r-- | demos/hello-next/bun-framework-next/page-loader.ts (renamed from demos/css-stress-test/bun-framework-next/page-loader.ts) | 0 | ||||
-rw-r--r-- | demos/hello-next/bun-framework-next/render.tsx (renamed from demos/css-stress-test/bun-framework-next/render.tsx) | 0 | ||||
-rw-r--r-- | demos/hello-next/bun-framework-next/renderDocument.tsx (renamed from demos/css-stress-test/bun-framework-next/renderDocument.tsx) | 0 | ||||
-rw-r--r-- | demos/hello-next/bun-framework-next/route-loader.ts (renamed from demos/css-stress-test/bun-framework-next/route-loader.ts) | 0 | ||||
-rw-r--r-- | demos/hello-next/bun-framework-next/server.development.tsx (renamed from demos/css-stress-test/bun-framework-next/server.development.tsx) | 0 | ||||
-rw-r--r-- | demos/hello-next/bun-framework-next/server.production.tsx (renamed from demos/css-stress-test/bun-framework-next/server.production.tsx) | 0 | ||||
-rw-r--r-- | demos/hello-next/bun-framework-next/tsconfig.json (renamed from demos/css-stress-test/bun-framework-next/tsconfig.json) | 0 | ||||
-rw-r--r-- | demos/hello-next/package.json | 1 | ||||
-rw-r--r-- | demos/hello-next/tsconfig.json | 23 | ||||
-rw-r--r-- | src/runtime.zig | 14 |
15 files changed, 38 insertions, 3 deletions
diff --git a/demos/hello-next/.eslintrc.json b/demos/hello-next/.eslintrc.json new file mode 100644 index 000000000..bffb357a7 --- /dev/null +++ b/demos/hello-next/.eslintrc.json @@ -0,0 +1,3 @@ +{ + "extends": "next/core-web-vitals" +} diff --git a/demos/css-stress-test/bun-framework-next/client.development.tsx b/demos/hello-next/bun-framework-next/client.development.tsx index d046751b2..d046751b2 100644 --- a/demos/css-stress-test/bun-framework-next/client.development.tsx +++ b/demos/hello-next/bun-framework-next/client.development.tsx diff --git a/demos/css-stress-test/bun-framework-next/index.js b/demos/hello-next/bun-framework-next/index.js index 10adb5205..10adb5205 100644 --- a/demos/css-stress-test/bun-framework-next/index.js +++ b/demos/hello-next/bun-framework-next/index.js diff --git a/demos/css-stress-test/bun-framework-next/next-server.tsx b/demos/hello-next/bun-framework-next/next-server.tsx index e69de29bb..e69de29bb 100644 --- a/demos/css-stress-test/bun-framework-next/next-server.tsx +++ b/demos/hello-next/bun-framework-next/next-server.tsx diff --git a/demos/css-stress-test/bun-framework-next/package.json b/demos/hello-next/bun-framework-next/package.json index 02377e339..02377e339 100644 --- a/demos/css-stress-test/bun-framework-next/package.json +++ b/demos/hello-next/bun-framework-next/package.json diff --git a/demos/css-stress-test/bun-framework-next/page-loader.ts b/demos/hello-next/bun-framework-next/page-loader.ts index fdc6f5f28..fdc6f5f28 100644 --- a/demos/css-stress-test/bun-framework-next/page-loader.ts +++ b/demos/hello-next/bun-framework-next/page-loader.ts diff --git a/demos/css-stress-test/bun-framework-next/render.tsx b/demos/hello-next/bun-framework-next/render.tsx index e69de29bb..e69de29bb 100644 --- a/demos/css-stress-test/bun-framework-next/render.tsx +++ b/demos/hello-next/bun-framework-next/render.tsx diff --git a/demos/css-stress-test/bun-framework-next/renderDocument.tsx b/demos/hello-next/bun-framework-next/renderDocument.tsx index a25e5d273..a25e5d273 100644 --- a/demos/css-stress-test/bun-framework-next/renderDocument.tsx +++ b/demos/hello-next/bun-framework-next/renderDocument.tsx diff --git a/demos/css-stress-test/bun-framework-next/route-loader.ts b/demos/hello-next/bun-framework-next/route-loader.ts index e69de29bb..e69de29bb 100644 --- a/demos/css-stress-test/bun-framework-next/route-loader.ts +++ b/demos/hello-next/bun-framework-next/route-loader.ts diff --git a/demos/css-stress-test/bun-framework-next/server.development.tsx b/demos/hello-next/bun-framework-next/server.development.tsx index 54181c271..54181c271 100644 --- a/demos/css-stress-test/bun-framework-next/server.development.tsx +++ b/demos/hello-next/bun-framework-next/server.development.tsx diff --git a/demos/css-stress-test/bun-framework-next/server.production.tsx b/demos/hello-next/bun-framework-next/server.production.tsx index e69de29bb..e69de29bb 100644 --- a/demos/css-stress-test/bun-framework-next/server.production.tsx +++ b/demos/hello-next/bun-framework-next/server.production.tsx diff --git a/demos/css-stress-test/bun-framework-next/tsconfig.json b/demos/hello-next/bun-framework-next/tsconfig.json index 679268d71..679268d71 100644 --- a/demos/css-stress-test/bun-framework-next/tsconfig.json +++ b/demos/hello-next/bun-framework-next/tsconfig.json diff --git a/demos/hello-next/package.json b/demos/hello-next/package.json index 26861bf91..8309b88eb 100644 --- a/demos/hello-next/package.json +++ b/demos/hello-next/package.json @@ -4,7 +4,6 @@ "main": "index.js", "license": "MIT", "dependencies": { - "bun-framework-next": "0.0.0-6", "next": "^11.1.0", "path": "^0.12.7", "react": "^17.0.2", diff --git a/demos/hello-next/tsconfig.json b/demos/hello-next/tsconfig.json new file mode 100644 index 000000000..679268d71 --- /dev/null +++ b/demos/hello-next/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "target": "esnext", + "lib": ["dom", "dom.iterable", "esnext", "WebWorker"], + "allowJs": true, + "skipLibCheck": true, + "strict": false, + "forceConsistentCasingInFileNames": true, + "noEmit": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "Node", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "baseUrl": ".", + "paths": { + "path": ["node_modules/path-browserify"] + } + }, + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"], + "exclude": ["node_modules"] +} diff --git a/src/runtime.zig b/src/runtime.zig index 04161a524..7ea59f430 100644 --- a/src/runtime.zig +++ b/src/runtime.zig @@ -3,13 +3,23 @@ usingnamespace @import("ast/base.zig"); usingnamespace @import("global.zig"); const std = @import("std"); pub const ProdSourceContent = @embedFile("./runtime.out.js"); - +const resolve_path = @import("./resolver/resolve_path.zig"); const Fs = @import("./fs.zig"); pub const Runtime = struct { pub fn sourceContent() string { if (comptime isDebug) { - var runtime_path = std.fs.path.join(std.heap.c_allocator, &[_]string{ std.fs.path.dirname(@src().file).?, "runtime.out.js" }) catch unreachable; + var dirpath = std.fs.path.dirname(@src().file).?; + var env = std.process.getEnvMap(std.heap.c_allocator) catch unreachable; + + const dir = std.mem.replaceOwned( + u8, + std.heap.c_allocator, + dirpath, + "jarred", + env.get("USER").?, + ) catch unreachable; + var runtime_path = std.fs.path.join(std.heap.c_allocator, &[_]string{ dir, "runtime.out.js" }) catch unreachable; const file = std.fs.openFileAbsolute(runtime_path, .{}) catch unreachable; defer file.close(); return file.readToEndAlloc(std.heap.c_allocator, (file.stat() catch unreachable).size) catch unreachable; |