summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/dts/lib.deno.unstable.d.ts10
-rw-r--r--cli/main.rs1
-rw-r--r--cli/tests/testdata/compat/worker/worker_test.mjs2
-rw-r--r--cli/tests/testdata/event_listener_error_immediate_exit_worker.ts2
-rw-r--r--cli/tests/testdata/no_prompt.ts5
-rw-r--r--cli/tests/testdata/set_exit_code_in_worker.ts2
-rw-r--r--cli/tests/testdata/unstable_worker.ts8
-rw-r--r--cli/tests/testdata/worker_drop_handle_race_terminate.js7
-rw-r--r--cli/tests/testdata/workers/parent_read_check_worker.js8
-rw-r--r--cli/tests/testdata/workers/test.ts104
-rw-r--r--cli/tests/unit/worker_permissions_test.ts10
11 files changed, 24 insertions, 135 deletions
diff --git a/cli/dts/lib.deno.unstable.d.ts b/cli/dts/lib.deno.unstable.d.ts
index 6e9cf7789..d5797eb83 100644
--- a/cli/dts/lib.deno.unstable.d.ts
+++ b/cli/dts/lib.deno.unstable.d.ts
@@ -1135,9 +1135,6 @@ declare function fetch(
declare interface WorkerOptions {
/** UNSTABLE: New API.
*
- * Set deno.namespace to `true` to make `Deno` namespace and all of its
- * methods available to the worker environment. Defaults to `false`.
- *
* Configure permissions options to change the level of access the worker will
* have. By default it will have no permissions. Note that the permissions
* of a worker can't be extended beyond its parent's permissions reach.
@@ -1154,7 +1151,6 @@ declare interface WorkerOptions {
* new URL("deno_worker.ts", import.meta.url).href, {
* type: "module",
* deno: {
- * namespace: true,
* permissions: {
* read: true,
* },
@@ -1163,11 +1159,7 @@ declare interface WorkerOptions {
* );
* ```
*/
- // TODO(Soremwar)
- // `deno: boolean` is kept for backwards compatibility with the previous
- // worker options implementation. Remove for 2.0.
- deno?: boolean | {
- namespace?: boolean;
+ deno?: {
/** Set to `"none"` to disable all the permissions in the worker. */
permissions?: Deno.PermissionOptions;
};
diff --git a/cli/main.rs b/cli/main.rs
index ef9267088..9bbe8cfcb 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -172,7 +172,6 @@ fn create_web_worker_callback(
preload_module_cb,
format_js_error_fn: Some(Arc::new(format_js_error)),
source_map_getter: Some(Box::new(ps.clone())),
- use_deno_namespace: args.use_deno_namespace,
worker_type: args.worker_type,
maybe_inspector_server,
get_error_class_fn: Some(&crate::errors::get_error_class_name),
diff --git a/cli/tests/testdata/compat/worker/worker_test.mjs b/cli/tests/testdata/compat/worker/worker_test.mjs
index 215605487..7caf6196b 100644
--- a/cli/tests/testdata/compat/worker/worker_test.mjs
+++ b/cli/tests/testdata/compat/worker/worker_test.mjs
@@ -2,7 +2,7 @@ import { deferred } from "../../../../../test_util/std/async/deferred.ts";
const promise = deferred();
const url = new URL("./worker.mjs", import.meta.url);
-const worker = new Worker(url.href, { type: "module", deno: true });
+const worker = new Worker(url.href, { type: "module" });
worker.onmessage = (e) => {
const pid = e.data.pid;
diff --git a/cli/tests/testdata/event_listener_error_immediate_exit_worker.ts b/cli/tests/testdata/event_listener_error_immediate_exit_worker.ts
index 87e2ecb19..2ea3b8a62 100644
--- a/cli/tests/testdata/event_listener_error_immediate_exit_worker.ts
+++ b/cli/tests/testdata/event_listener_error_immediate_exit_worker.ts
@@ -1,4 +1,4 @@
new Worker(
new URL("event_listener_error_immediate_exit.ts", import.meta.url).href,
- { type: "module", deno: { namespace: true } },
+ { type: "module" },
);
diff --git a/cli/tests/testdata/no_prompt.ts b/cli/tests/testdata/no_prompt.ts
index 88dccc458..f3d503f63 100644
--- a/cli/tests/testdata/no_prompt.ts
+++ b/cli/tests/testdata/no_prompt.ts
@@ -1,7 +1,4 @@
-new Worker("data:,setTimeout(() => Deno.exit(2), 200)", {
- type: "module",
- deno: { namespace: true },
-});
+new Worker("data:,setTimeout(() => Deno.exit(2), 200)", { type: "module" });
try {
await Deno.run({ cmd: ["ps"] });
diff --git a/cli/tests/testdata/set_exit_code_in_worker.ts b/cli/tests/testdata/set_exit_code_in_worker.ts
index 1df6a76d0..c49c6efb2 100644
--- a/cli/tests/testdata/set_exit_code_in_worker.ts
+++ b/cli/tests/testdata/set_exit_code_in_worker.ts
@@ -2,7 +2,7 @@ import { deferred } from "../../../test_util/std/async/deferred.ts";
const worker = new Worker(
new URL("set_exit_code_worker.js", import.meta.url).href,
- { type: "module", deno: { namespace: true } },
+ { type: "module" },
);
const promise1 = deferred();
diff --git a/cli/tests/testdata/unstable_worker.ts b/cli/tests/testdata/unstable_worker.ts
index 429754dfe..a3b89a180 100644
--- a/cli/tests/testdata/unstable_worker.ts
+++ b/cli/tests/testdata/unstable_worker.ts
@@ -1,12 +1,6 @@
const w = new Worker(
new URL("workers/worker_unstable.ts", import.meta.url).href,
- {
- type: "module",
- deno: {
- namespace: true,
- },
- name: "Unstable Worker",
- },
+ { type: "module", name: "Unstable Worker" },
);
w.postMessage({});
diff --git a/cli/tests/testdata/worker_drop_handle_race_terminate.js b/cli/tests/testdata/worker_drop_handle_race_terminate.js
index dfdd9c561..fc9a4e6b2 100644
--- a/cli/tests/testdata/worker_drop_handle_race_terminate.js
+++ b/cli/tests/testdata/worker_drop_handle_race_terminate.js
@@ -22,10 +22,7 @@ const WORKER2 = getCodeBlobUrl(`
const WORKER1 = getCodeBlobUrl(`
console.log("Worker 1");
- const worker = new Worker(
- ${JSON.stringify(WORKER2)},
- { type: "module", deno: { namespace: true } }
- );
+ const worker = new Worker(${JSON.stringify(WORKER2)}, { type: "module" });
worker.addEventListener("message", () => {
console.log("Terminating");
@@ -34,7 +31,7 @@ const WORKER1 = getCodeBlobUrl(`
});
`);
-new Worker(WORKER1, { type: "module", deno: { namespace: true } });
+new Worker(WORKER1, { type: "module" });
// Don't kill the process before worker 2 is finished.
setTimeout(() => {}, 3000);
diff --git a/cli/tests/testdata/workers/parent_read_check_worker.js b/cli/tests/testdata/workers/parent_read_check_worker.js
index 87ea6bded..c2c0977c0 100644
--- a/cli/tests/testdata/workers/parent_read_check_worker.js
+++ b/cli/tests/testdata/workers/parent_read_check_worker.js
@@ -1,12 +1,6 @@
const worker = new Worker(
new URL("./read_check_granular_worker.js", import.meta.url).href,
- {
- type: "module",
- deno: {
- namespace: true,
- permissions: "none",
- },
- },
+ { type: "module", deno: { permissions: "none" } },
);
onmessage = ({ data }) => {
diff --git a/cli/tests/testdata/workers/test.ts b/cli/tests/testdata/workers/test.ts
index 8877c9564..9a178a1d5 100644
--- a/cli/tests/testdata/workers/test.ts
+++ b/cli/tests/testdata/workers/test.ts
@@ -273,37 +273,19 @@ Deno.test({
Deno.test({
name: "worker with Deno namespace",
fn: async function () {
- const regularWorker = new Worker(
- new URL("non_deno_worker.js", import.meta.url),
- { type: "module" },
- );
const denoWorker = new Worker(
new URL("deno_worker.ts", import.meta.url),
- {
- type: "module",
- deno: {
- namespace: true,
- permissions: "inherit",
- },
- },
+ { type: "module", deno: { permissions: "inherit" } },
);
- const promise1 = deferred();
- regularWorker.onmessage = (e) => {
- regularWorker.terminate();
- promise1.resolve(e.data);
- };
-
- const promise2 = deferred();
+ const promise = deferred();
denoWorker.onmessage = (e) => {
denoWorker.terminate();
- promise2.resolve(e.data);
+ promise.resolve(e.data);
};
- regularWorker.postMessage("Hello World");
- assertEquals(await promise1, "Hello World");
denoWorker.postMessage("Hello World");
- assertEquals(await promise2, "Hello World");
+ assertEquals(await promise, "Hello World");
},
});
@@ -394,13 +376,7 @@ Deno.test({
Deno.test("Worker inherits permissions", async function () {
const worker = new Worker(
new URL("./read_check_worker.js", import.meta.url).href,
- {
- type: "module",
- deno: {
- namespace: true,
- permissions: "inherit",
- },
- },
+ { type: "module", deno: { permissions: "inherit" } },
);
const promise = deferred();
@@ -416,15 +392,7 @@ Deno.test("Worker inherits permissions", async function () {
Deno.test("Worker limit children permissions", async function () {
const worker = new Worker(
new URL("./read_check_worker.js", import.meta.url).href,
- {
- type: "module",
- deno: {
- namespace: true,
- permissions: {
- read: false,
- },
- },
- },
+ { type: "module", deno: { permissions: { read: false } } },
);
const promise = deferred();
@@ -443,7 +411,6 @@ Deno.test("Worker limit children permissions granularly", async function () {
{
type: "module",
deno: {
- namespace: true,
permissions: {
env: ["foo"],
hrtime: true,
@@ -493,13 +460,7 @@ Deno.test("Nested worker limit children permissions", async function () {
/** This worker has permissions but doesn't grant them to its children */
const worker = new Worker(
new URL("./parent_read_check_worker.js", import.meta.url).href,
- {
- type: "module",
- deno: {
- namespace: true,
- permissions: "inherit",
- },
- },
+ { type: "module", deno: { permissions: "inherit" } },
);
const promise = deferred();
worker.onmessage = ({ data }) => promise.resolve(data);
@@ -544,15 +505,7 @@ Deno.test({
() => {
const worker = new Worker(
new URL("./deno_worker.ts", import.meta.url).href,
- {
- type: "module",
- deno: {
- namespace: true,
- permissions: {
- env: true,
- },
- },
- },
+ { type: "module", deno: { permissions: { env: true } } },
);
worker.terminate();
},
@@ -565,13 +518,7 @@ Deno.test({
Deno.test("Worker with disabled permissions", async function () {
const worker = new Worker(
new URL("./no_permissions_worker.js", import.meta.url).href,
- {
- type: "module",
- deno: {
- namespace: true,
- permissions: "none",
- },
- },
+ { type: "module", deno: { permissions: "none" } },
);
const promise = deferred();
@@ -587,13 +534,7 @@ Deno.test("Worker with disabled permissions", async function () {
Deno.test("Worker permissions are not inherited with empty permission object", async function () {
const worker = new Worker(
new URL("./permission_echo.js", import.meta.url).href,
- {
- type: "module",
- deno: {
- namespace: true,
- permissions: {},
- },
- },
+ { type: "module", deno: { permissions: {} } },
);
const promise = deferred();
@@ -617,15 +558,7 @@ Deno.test("Worker permissions are not inherited with empty permission object", a
Deno.test("Worker permissions are not inherited with single specified permission", async function () {
const worker = new Worker(
new URL("./permission_echo.js", import.meta.url).href,
- {
- type: "module",
- deno: {
- namespace: true,
- permissions: {
- net: true,
- },
- },
- },
+ { type: "module", deno: { permissions: { net: true } } },
);
const promise = deferred();
@@ -720,17 +653,8 @@ Deno.test({
fn: async function () {
const result = deferred();
const worker = new Worker(
- new URL(
- "./http_worker.js",
- import.meta.url,
- ).href,
- {
- type: "module",
- deno: {
- namespace: true,
- permissions: "inherit",
- },
- },
+ new URL("./http_worker.js", import.meta.url).href,
+ { type: "module", deno: { permissions: "inherit" } },
);
worker.onmessage = () => {
result.resolve();
@@ -870,7 +794,7 @@ Deno.test({
* self.onmessage = function() {self.postMessage(Deno.memoryUsage())}
*/
"data:application/typescript;base64,c2VsZi5vbm1lc3NhZ2UgPSBmdW5jdGlvbigpIHtzZWxmLnBvc3RNZXNzYWdlKERlbm8ubWVtb3J5VXNhZ2UoKSl9",
- { type: "module", name: "tsWorker", deno: true },
+ { type: "module", name: "tsWorker" },
);
w.postMessage(null);
diff --git a/cli/tests/unit/worker_permissions_test.ts b/cli/tests/unit/worker_permissions_test.ts
index 145862402..2c21d6fa6 100644
--- a/cli/tests/unit/worker_permissions_test.ts
+++ b/cli/tests/unit/worker_permissions_test.ts
@@ -11,15 +11,7 @@ Deno.test(
"../testdata/workers/env_read_check_worker.js",
import.meta.url,
).href,
- {
- type: "module",
- deno: {
- namespace: true,
- permissions: {
- env: ["test", "OTHER"],
- },
- },
- },
+ { type: "module", deno: { permissions: { env: ["test", "OTHER"] } } },
);
worker.onmessage = ({ data }) => {
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 11:19:20 +0000