Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
.vscode
target
src/lib
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# We're using a submodule instead of a git dependency because cargo errors
# on Windows when installing the Deno repo due to the submodules within
# the Deno repo due to long paths
[submodule "deno"]
path = deno
url = https://github.com/denoland/deno
Expand Down
21 changes: 21 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"editor.formatOnSave": true,
"[rust]": {
"editor.defaultFormatter": "rust-lang.rust-analyzer"
},
"[typescript]": {
"editor.defaultFormatter": "denoland.vscode-deno"
},
"[json]": {
"editor.defaultFormatter": "denoland.vscode-deno"
},
"[yaml]": {
"editor.defaultFormatter": "denoland.vscode-deno"
},
// generally I wouldn't commit this file to source control, but
// this setting is necessary in order to get this repo working
// in vscode
"rust-analyzer.linkedProjects": [
"./src/rs_lib/Cargo.toml"
]
}
2 changes: 1 addition & 1 deletion deno
Submodule deno updated 139 files
1 change: 0 additions & 1 deletion deno.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
},
"exports": "./src/mod.ts",
"exclude": [
".vscode",
"deno",
"src/rs_lib/target",
"target",
Expand Down
22 changes: 11 additions & 11 deletions src/rs_lib/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/rs_lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ wasm-bindgen-futures = "=0.4.50"
async-trait = "0.1.73"
deno_error = "=0.6.1"
deno_path_util = "=0.4.0"
deno_semver = "=0.8.0"
deno_semver = "=0.8.1"
url = "2.5"

[dependencies.deno_ast]
Expand All @@ -31,7 +31,7 @@ version = "=0.22.2"
features = ["sync"]

[dependencies.deno_config]
version = "=0.56.0"
version = "=0.57.0"
features = ["workspace","sync"]

[dependencies.deno_graph]
Expand Down
3 changes: 3 additions & 0 deletions src/rs_lib/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@ impl DenoWorkspace {
unstable_sloppy_imports: true,
npm_system_info: npm_system_info()?,
node_resolver_options: NodeResolverOptions {
// todo: support these
prefer_browser_field: false,
bundle_mode: false,
conditions: NodeConditionOptions {
conditions: options
.node_conditions
Expand Down
9 changes: 9 additions & 0 deletions tests/jsx/main.test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { assert } from "node:console";
import {
assertResponseText,
createLoader,
Expand Down Expand Up @@ -30,6 +31,14 @@ console.log(_jsxTemplate($$_tpl_1));
${mainJsxSourceMappingURL}`,
);

// resolves jsx-dev
const jsx = loader.resolve(
"react/jsx-dev-runtime",
mainTsx,
ResolutionMode.Import,
);
assert(jsx.startsWith("file:"));

{
const newLoader = await workspace.createLoader({
entrypoints: [mainJsx, mainTsxUrl],
Expand Down