diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2024-11-13 10:10:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-13 15:10:09 +0000 |
| commit | f091d1ad69b4e5217ae3272b641171781a372c4f (patch) | |
| tree | 4ef4f90ec8a6b5c977efb187449f8c59c45de5e1 /runtime | |
| parent | 6a4c6d83bacf5f03628a494778a30bce970f7cbc (diff) | |
feat(node): stabilize detecting if CJS via `"type": "commonjs"` in a package.json (#26439)
This will respect `"type": "commonjs"` in a package.json to determine if
`.js`/`.jsx`/`.ts`/.tsx` files are CJS or ESM. If the file is found to
be ESM it will be loaded as ESM though.
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/fmt_errors.rs | 7 | ||||
| -rw-r--r-- | runtime/web_worker.rs | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/runtime/fmt_errors.rs b/runtime/fmt_errors.rs index 4cd8a0634..28cd70296 100644 --- a/runtime/fmt_errors.rs +++ b/runtime/fmt_errors.rs @@ -310,14 +310,13 @@ fn get_suggestions_for_terminal_errors(e: &JsError) -> Vec<FixSuggestion> { { return vec![ FixSuggestion::info_multiline(&[ - cstr!("Deno supports CommonJS modules in <u>.cjs</> files, or when there's a <u>package.json</>"), - cstr!("with <i>\"type\": \"commonjs\"</> option and <i>--unstable-detect-cjs</> flag is used.") + cstr!("Deno supports CommonJS modules in <u>.cjs</> files, or when the closest"), + cstr!("<u>package.json</> has a <i>\"type\": \"commonjs\"</> option.") ]), FixSuggestion::hint_multiline(&[ "Rewrite this module to ESM,", cstr!("or change the file extension to <u>.cjs</u>,"), - cstr!("or add <u>package.json</> next to the file with <i>\"type\": \"commonjs\"</> option"), - cstr!("and pass <i>--unstable-detect-cjs</> flag."), + cstr!("or add <u>package.json</> next to the file with <i>\"type\": \"commonjs\"</> option."), ]), FixSuggestion::docs("https://docs.deno.com/go/commonjs"), ]; diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs index d81c82c50..e27229153 100644 --- a/runtime/web_worker.rs +++ b/runtime/web_worker.rs @@ -393,6 +393,13 @@ pub struct WebWorker { maybe_worker_metadata: Option<WorkerMetadata>, } +impl Drop for WebWorker { + fn drop(&mut self) { + // clean up the package.json thread local cache + node_resolver::PackageJsonThreadLocalCache::clear(); + } +} + impl WebWorker { pub fn bootstrap_from_options( services: WebWorkerServiceOptions, |