@qwik.dev/core 2.0.0-beta.23 → 2.0.0-beta.24

package/dist/backpatch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/backpatch",
-  "version": "2.0.0-beta.23-dev+03de42d",
+  "version": "2.0.0-beta.24-dev+314726b",
   "main": "index.mjs",
   "types": "index.d.ts",
   "private": true,

package/dist/build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/build",
-  "version": "2.0.0-beta.23-dev+03de42d",
+  "version": "2.0.0-beta.24-dev+314726b",
   "main": "index.mjs",
   "types": "index.d.ts",
   "private": true,

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/cli 2.0.0-beta.23-dev+03de42d
+ * @qwik.dev/core/cli 2.0.0-beta.24-dev+314726b
  * Copyright QwikDev. All Rights Reserved.
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://github.com/QwikDev/qwik/blob/main/LICENSE
@@ -13,10 +13,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __require = /* @__PURE__ */ ((x2) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x2, {
   get: (a2, b3) => (typeof require !== "undefined" ? require : a2)[b3]
 }) : x2)(function(x2) {
@@ -49,12 +45,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 
 // node_modules/.pnpm/sisteransi@1.0.5/node_modules/sisteransi/src/index.js
 var require_src = __commonJS({
@@ -3540,12 +3530,12 @@ var bgWhite = init(47, 49);
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 var AppCommand = class {
+  args;
+  task;
+  cwd;
+  _rootDir;
+  _rootPkgJson;
   constructor(opts) {
-    __publicField(this, "args");
-    __publicField(this, "task");
-    __publicField(this, "cwd");
-    __publicField(this, "_rootDir");
-    __publicField(this, "_rootPkgJson");
     this._rootDir = opts.rootDir;
     this.cwd = opts.cwd;
     this.args = opts.args.slice();
@@ -5049,7 +5039,7 @@ var killOnTimeout = async ({ kill, forceKillAfterDelay, context, controllerSigna
   try {
     await setTimeout2(forceKillAfterDelay, void 0, { signal: controllerSignal });
     if (kill("SIGKILL")) {
-      context.isForcefullyTerminated ?? (context.isForcefullyTerminated = true);
+      context.isForcefullyTerminated ??= true;
     }
   } catch {
   }
@@ -5072,7 +5062,7 @@ var validateCancelSignal = ({ cancelSignal }) => {
 var throwOnCancel = ({ subprocess, cancelSignal, gracefulCancel, context, controller }) => cancelSignal === void 0 || gracefulCancel ? [] : [terminateOnCancel(subprocess, cancelSignal, context, controller)];
 var terminateOnCancel = async (subprocess, cancelSignal, context, { signal }) => {
   await onAbortedSignal(cancelSignal, signal);
-  context.terminationReason ?? (context.terminationReason = "cancel");
+  context.terminationReason ??= "cancel";
   subprocess.kill();
   throw cancelSignal.reason;
 };
@@ -5647,7 +5637,7 @@ var sendOnAbort = async ({ subprocess, cancelSignal, forceKillAfterDelay, contex
     context,
     controllerSignal: signal
   });
-  context.terminationReason ?? (context.terminationReason = "gracefulCancel");
+  context.terminationReason ??= "gracefulCancel";
   throw cancelSignal.reason;
 };
 var getReason = ({ reason }) => {
@@ -5674,7 +5664,7 @@ var validateTimeout = ({ timeout }) => {
 var throwOnTimeout = (subprocess, timeout, context, controller) => timeout === 0 || timeout === void 0 ? [] : [killAfterTimeout(subprocess, timeout, context, controller)];
 var killAfterTimeout = async (subprocess, timeout, context, { signal }) => {
   await setTimeout3(timeout, void 0, { signal });
-  context.terminationReason ?? (context.terminationReason = "timeout");
+  context.terminationReason ??= "timeout";
   subprocess.kill();
   throw new DiscardedError();
 };
@@ -5954,61 +5944,54 @@ var a = Object.getPrototypeOf(
     }
   ).prototype
 );
-var _t, _n, _r, _e, _c_instances, s_fn, i_fn;
 var c = class {
+  #t;
+  #n;
+  #r = false;
+  #e = void 0;
   constructor(e2, t) {
-    __privateAdd(this, _c_instances);
-    __privateAdd(this, _t);
-    __privateAdd(this, _n);
-    __privateAdd(this, _r, false);
-    __privateAdd(this, _e);
-    __privateSet(this, _t, e2), __privateSet(this, _n, t);
+    this.#t = e2, this.#n = t;
   }
   next() {
-    const e2 = () => __privateMethod(this, _c_instances, s_fn).call(this);
-    return __privateSet(this, _e, __privateGet(this, _e) ? __privateGet(this, _e).then(e2, e2) : e2()), __privateGet(this, _e);
+    const e2 = () => this.#s();
+    return this.#e = this.#e ? this.#e.then(e2, e2) : e2(), this.#e;
   }
   return(e2) {
-    const t = () => __privateMethod(this, _c_instances, i_fn).call(this, e2);
-    return __privateGet(this, _e) ? __privateGet(this, _e).then(t, t) : t();
+    const t = () => this.#i(e2);
+    return this.#e ? this.#e.then(t, t) : t();
   }
-};
-_t = new WeakMap();
-_n = new WeakMap();
-_r = new WeakMap();
-_e = new WeakMap();
-_c_instances = new WeakSet();
-s_fn = async function() {
-  if (__privateGet(this, _r))
-    return {
-      done: true,
-      value: void 0
-    };
-  let e2;
-  try {
-    e2 = await __privateGet(this, _t).read();
-  } catch (t) {
-    throw __privateSet(this, _e, void 0), __privateSet(this, _r, true), __privateGet(this, _t).releaseLock(), t;
+  async #s() {
+    if (this.#r)
+      return {
+        done: true,
+        value: void 0
+      };
+    let e2;
+    try {
+      e2 = await this.#t.read();
+    } catch (t) {
+      throw this.#e = void 0, this.#r = true, this.#t.releaseLock(), t;
+    }
+    return e2.done && (this.#e = void 0, this.#r = true, this.#t.releaseLock()), e2;
   }
-  return e2.done && (__privateSet(this, _e, void 0), __privateSet(this, _r, true), __privateGet(this, _t).releaseLock()), e2;
-};
-i_fn = async function(e2) {
-  if (__privateGet(this, _r))
-    return {
-      done: true,
-      value: e2
-    };
-  if (__privateSet(this, _r, true), !__privateGet(this, _n)) {
-    const t = __privateGet(this, _t).cancel(e2);
-    return __privateGet(this, _t).releaseLock(), await t, {
+  async #i(e2) {
+    if (this.#r)
+      return {
+        done: true,
+        value: e2
+      };
+    if (this.#r = true, !this.#n) {
+      const t = this.#t.cancel(e2);
+      return this.#t.releaseLock(), await t, {
+        done: true,
+        value: e2
+      };
+    }
+    return this.#t.releaseLock(), {
       done: true,
       value: e2
     };
   }
-  return __privateGet(this, _t).releaseLock(), {
-    done: true,
-    value: e2
-  };
 };
 var n = /* @__PURE__ */ Symbol();
 function i() {
@@ -6178,9 +6161,9 @@ var getChunkType = (chunk) => {
 };
 var { toString: objectToString2 } = Object.prototype;
 var MaxBufferError = class extends Error {
+  name = "MaxBufferError";
   constructor() {
     super("maxBuffer exceeded");
-    __publicField(this, "name", "MaxBufferError");
   }
 };
 
@@ -6728,7 +6711,7 @@ function prettyMilliseconds(milliseconds, options) {
     if ((result.length === 0 || !options.colonNotation) && isZero(value) && !(options.colonNotation && short === "m")) {
       return;
     }
-    valueString ?? (valueString = String(value));
+    valueString ??= String(value);
     if (options.colonNotation) {
       const wholeDigits = valueString.includes(".") ? valueString.split(".")[0].length : valueString.length;
       const minLength = result.length > 0 ? 2 : 1;
@@ -7994,7 +7977,7 @@ var logOutputSync = ({ serializedResult, fdNumber, state, verboseInfo, encoding,
   try {
     logLinesSync(linesArray, fdNumber, verboseInfo);
   } catch (error) {
-    state.error ?? (state.error = error);
+    state.error ??= error;
   }
 };
 var writeToFiles = (serializedResult, stdioItems, outputFiles) => {
@@ -8036,7 +8019,7 @@ var getAllSync = ([, stdout, stderr], options) => {
 import { once as once4 } from "node:events";
 var waitForExit = async (subprocess, context) => {
   const [exitCode, signal] = await waitForExitOrError(subprocess);
-  context.isForcefullyTerminated ?? (context.isForcefullyTerminated = false);
+  context.isForcefullyTerminated ??= false;
   return [exitCode, signal];
 };
 var waitForExitOrError = async (subprocess) => {
@@ -8527,57 +8510,47 @@ var getHighWaterMark = (streams, objectMode) => {
   const highWaterMarks = streams.filter(({ readableObjectMode }) => readableObjectMode === objectMode).map(({ readableHighWaterMark }) => readableHighWaterMark);
   return Math.max(...highWaterMarks);
 };
-var _streams, _ended, _aborted, _onFinished, _unpipeEvent, _streamPromises;
 var MergedStream = class extends PassThroughStream {
-  constructor() {
-    super(...arguments);
-    __privateAdd(this, _streams, /* @__PURE__ */ new Set([]));
-    __privateAdd(this, _ended, /* @__PURE__ */ new Set([]));
-    __privateAdd(this, _aborted, /* @__PURE__ */ new Set([]));
-    __privateAdd(this, _onFinished);
-    __privateAdd(this, _unpipeEvent, /* @__PURE__ */ Symbol("unpipe"));
-    __privateAdd(this, _streamPromises, /* @__PURE__ */ new WeakMap());
-  }
+  #streams = /* @__PURE__ */ new Set([]);
+  #ended = /* @__PURE__ */ new Set([]);
+  #aborted = /* @__PURE__ */ new Set([]);
+  #onFinished;
+  #unpipeEvent = /* @__PURE__ */ Symbol("unpipe");
+  #streamPromises = /* @__PURE__ */ new WeakMap();
   add(stream) {
     validateStream(stream);
-    if (__privateGet(this, _streams).has(stream)) {
+    if (this.#streams.has(stream)) {
       return;
     }
-    __privateGet(this, _streams).add(stream);
-    __privateGet(this, _onFinished) ?? __privateSet(this, _onFinished, onMergedStreamFinished(this, __privateGet(this, _streams), __privateGet(this, _unpipeEvent)));
+    this.#streams.add(stream);
+    this.#onFinished ??= onMergedStreamFinished(this, this.#streams, this.#unpipeEvent);
     const streamPromise = endWhenStreamsDone({
       passThroughStream: this,
       stream,
-      streams: __privateGet(this, _streams),
-      ended: __privateGet(this, _ended),
-      aborted: __privateGet(this, _aborted),
-      onFinished: __privateGet(this, _onFinished),
-      unpipeEvent: __privateGet(this, _unpipeEvent)
+      streams: this.#streams,
+      ended: this.#ended,
+      aborted: this.#aborted,
+      onFinished: this.#onFinished,
+      unpipeEvent: this.#unpipeEvent
     });
-    __privateGet(this, _streamPromises).set(stream, streamPromise);
+    this.#streamPromises.set(stream, streamPromise);
     stream.pipe(this, { end: false });
   }
   async remove(stream) {
     validateStream(stream);
-    if (!__privateGet(this, _streams).has(stream)) {
+    if (!this.#streams.has(stream)) {
       return false;
     }
-    const streamPromise = __privateGet(this, _streamPromises).get(stream);
+    const streamPromise = this.#streamPromises.get(stream);
     if (streamPromise === void 0) {
       return false;
     }
-    __privateGet(this, _streamPromises).delete(stream);
+    this.#streamPromises.delete(stream);
     stream.unpipe(this);
     await streamPromise;
     return true;
   }
 };
-_streams = new WeakMap();
-_ended = new WeakMap();
-_aborted = new WeakMap();
-_onFinished = new WeakMap();
-_unpipeEvent = new WeakMap();
-_streamPromises = new WeakMap();
 var onMergedStreamFinished = async (passThroughStream, streams, unpipeEvent) => {
   updateMaxListeners(passThroughStream, PASSTHROUGH_LISTENERS_COUNT);
   const controller = new AbortController();
@@ -8847,17 +8820,17 @@ var kExitEmitter = /* @__PURE__ */ Symbol.for("signal-exit emitter");
 var global2 = globalThis;
 var ObjectDefineProperty = Object.defineProperty.bind(Object);
 var Emitter = class {
+  emitted = {
+    afterExit: false,
+    exit: false
+  };
+  listeners = {
+    afterExit: [],
+    exit: []
+  };
+  count = 0;
+  id = Math.random();
   constructor() {
-    __publicField(this, "emitted", {
-      afterExit: false,
-      exit: false
-    });
-    __publicField(this, "listeners", {
-      afterExit: [],
-      exit: []
-    });
-    __publicField(this, "count", 0);
-    __publicField(this, "id", Math.random());
     if (global2[kExitEmitter]) {
       return global2[kExitEmitter];
     }
@@ -8923,129 +8896,119 @@ var SignalExitFallback = class extends SignalExitBase {
   unload() {
   }
 };
-var _hupSig, _emitter, _process, _originalProcessEmit, _originalProcessReallyExit, _sigListeners, _loaded, _SignalExit_instances, processReallyExit_fn, processEmit_fn;
 var SignalExit = class extends SignalExitBase {
+  // "SIGHUP" throws an `ENOSYS` error on Windows,
+  // so use a supported signal instead
+  /* c8 ignore start */
+  #hupSig = process9.platform === "win32" ? "SIGINT" : "SIGHUP";
+  /* c8 ignore stop */
+  #emitter = new Emitter();
+  #process;
+  #originalProcessEmit;
+  #originalProcessReallyExit;
+  #sigListeners = {};
+  #loaded = false;
   constructor(process10) {
     super();
-    __privateAdd(this, _SignalExit_instances);
-    // "SIGHUP" throws an `ENOSYS` error on Windows,
-    // so use a supported signal instead
-    /* c8 ignore start */
-    __privateAdd(this, _hupSig, process9.platform === "win32" ? "SIGINT" : "SIGHUP");
-    /* c8 ignore stop */
-    __privateAdd(this, _emitter, new Emitter());
-    __privateAdd(this, _process);
-    __privateAdd(this, _originalProcessEmit);
-    __privateAdd(this, _originalProcessReallyExit);
-    __privateAdd(this, _sigListeners, {});
-    __privateAdd(this, _loaded, false);
-    __privateSet(this, _process, process10);
-    __privateSet(this, _sigListeners, {});
+    this.#process = process10;
+    this.#sigListeners = {};
     for (const sig of signals) {
-      __privateGet(this, _sigListeners)[sig] = () => {
-        const listeners = __privateGet(this, _process).listeners(sig);
-        let { count: count2 } = __privateGet(this, _emitter);
+      this.#sigListeners[sig] = () => {
+        const listeners = this.#process.listeners(sig);
+        let { count: count2 } = this.#emitter;
         const p2 = process10;
         if (typeof p2.__signal_exit_emitter__ === "object" && typeof p2.__signal_exit_emitter__.count === "number") {
           count2 += p2.__signal_exit_emitter__.count;
         }
         if (listeners.length === count2) {
           this.unload();
-          const ret = __privateGet(this, _emitter).emit("exit", null, sig);
-          const s2 = sig === "SIGHUP" ? __privateGet(this, _hupSig) : sig;
+          const ret = this.#emitter.emit("exit", null, sig);
+          const s2 = sig === "SIGHUP" ? this.#hupSig : sig;
           if (!ret)
             process10.kill(process10.pid, s2);
         }
       };
     }
-    __privateSet(this, _originalProcessReallyExit, process10.reallyExit);
-    __privateSet(this, _originalProcessEmit, process10.emit);
+    this.#originalProcessReallyExit = process10.reallyExit;
+    this.#originalProcessEmit = process10.emit;
   }
   onExit(cb, opts) {
-    if (!processOk(__privateGet(this, _process))) {
+    if (!processOk(this.#process)) {
       return () => {
       };
     }
-    if (__privateGet(this, _loaded) === false) {
+    if (this.#loaded === false) {
       this.load();
     }
     const ev = opts?.alwaysLast ? "afterExit" : "exit";
-    __privateGet(this, _emitter).on(ev, cb);
+    this.#emitter.on(ev, cb);
     return () => {
-      __privateGet(this, _emitter).removeListener(ev, cb);
-      if (__privateGet(this, _emitter).listeners["exit"].length === 0 && __privateGet(this, _emitter).listeners["afterExit"].length === 0) {
+      this.#emitter.removeListener(ev, cb);
+      if (this.#emitter.listeners["exit"].length === 0 && this.#emitter.listeners["afterExit"].length === 0) {
         this.unload();
       }
     };
   }
   load() {
-    if (__privateGet(this, _loaded)) {
+    if (this.#loaded) {
       return;
     }
-    __privateSet(this, _loaded, true);
-    __privateGet(this, _emitter).count += 1;
+    this.#loaded = true;
+    this.#emitter.count += 1;
     for (const sig of signals) {
       try {
-        const fn = __privateGet(this, _sigListeners)[sig];
+        const fn = this.#sigListeners[sig];
         if (fn)
-          __privateGet(this, _process).on(sig, fn);
+          this.#process.on(sig, fn);
       } catch (_3) {
       }
     }
-    __privateGet(this, _process).emit = (ev, ...a2) => {
-      return __privateMethod(this, _SignalExit_instances, processEmit_fn).call(this, ev, ...a2);
+    this.#process.emit = (ev, ...a2) => {
+      return this.#processEmit(ev, ...a2);
     };
-    __privateGet(this, _process).reallyExit = (code) => {
-      return __privateMethod(this, _SignalExit_instances, processReallyExit_fn).call(this, code);
+    this.#process.reallyExit = (code) => {
+      return this.#processReallyExit(code);
     };
   }
   unload() {
-    if (!__privateGet(this, _loaded)) {
+    if (!this.#loaded) {
       return;
     }
-    __privateSet(this, _loaded, false);
+    this.#loaded = false;
     signals.forEach((sig) => {
-      const listener = __privateGet(this, _sigListeners)[sig];
+      const listener = this.#sigListeners[sig];
       if (!listener) {
         throw new Error("Listener not defined for signal: " + sig);
       }
       try {
-        __privateGet(this, _process).removeListener(sig, listener);
+        this.#process.removeListener(sig, listener);
       } catch (_3) {
       }
     });
-    __privateGet(this, _process).emit = __privateGet(this, _originalProcessEmit);
-    __privateGet(this, _process).reallyExit = __privateGet(this, _originalProcessReallyExit);
-    __privateGet(this, _emitter).count -= 1;
-  }
-};
-_hupSig = new WeakMap();
-_emitter = new WeakMap();
-_process = new WeakMap();
-_originalProcessEmit = new WeakMap();
-_originalProcessReallyExit = new WeakMap();
-_sigListeners = new WeakMap();
-_loaded = new WeakMap();
-_SignalExit_instances = new WeakSet();
-processReallyExit_fn = function(code) {
-  if (!processOk(__privateGet(this, _process))) {
-    return 0;
-  }
-  __privateGet(this, _process).exitCode = code || 0;
-  __privateGet(this, _emitter).emit("exit", __privateGet(this, _process).exitCode, null);
-  return __privateGet(this, _originalProcessReallyExit).call(__privateGet(this, _process), __privateGet(this, _process).exitCode);
-};
-processEmit_fn = function(ev, ...args) {
-  const og = __privateGet(this, _originalProcessEmit);
-  if (ev === "exit" && processOk(__privateGet(this, _process))) {
-    if (typeof args[0] === "number") {
-      __privateGet(this, _process).exitCode = args[0];
+    this.#process.emit = this.#originalProcessEmit;
+    this.#process.reallyExit = this.#originalProcessReallyExit;
+    this.#emitter.count -= 1;
+  }
+  #processReallyExit(code) {
+    if (!processOk(this.#process)) {
+      return 0;
+    }
+    this.#process.exitCode = code || 0;
+    this.#emitter.emit("exit", this.#process.exitCode, null);
+    return this.#originalProcessReallyExit.call(this.#process, this.#process.exitCode);
+  }
+  #processEmit(ev, ...args) {
+    const og = this.#originalProcessEmit;
+    if (ev === "exit" && processOk(this.#process)) {
+      if (typeof args[0] === "number") {
+        this.#process.exitCode = args[0];
+      }
+      const ret = og.call(this.#process, ev, ...args);
+      this.#emitter.emit("exit", this.#process.exitCode, null);
+      return ret;
+    } else {
+      return og.call(this.#process, ev, ...args);
     }
-    const ret = og.call(__privateGet(this, _process), ev, ...args);
-    __privateGet(this, _emitter).emit("exit", __privateGet(this, _process).exitCode, null);
-    return ret;
-  } else {
-    return og.call(__privateGet(this, _process), ev, ...args);
   }
 };
 var process9 = globalThis.process;
@@ -9792,7 +9755,7 @@ var waitForSubprocessResult = async ({
       })
     ]);
   } catch (error) {
-    context.terminationReason ?? (context.terminationReason = "other");
+    context.terminationReason ??= "other";
     return Promise.all([
       { error },
       exitPromise,
@@ -12625,7 +12588,7 @@ async function installTsMorph() {
   }
   const loading = Y2();
   loading.start("Fetching migration tools..");
-  (packageJson.devDependencies ?? (packageJson.devDependencies = {}))["ts-morph"] = "23";
+  (packageJson.devDependencies ??= {})["ts-morph"] = "23";
   await writePackageJson(process.cwd(), packageJson);
   await runInstall();
   loading.stop("Migration tools have been loaded");
@@ -12945,7 +12908,7 @@ async function printHelp(app) {
   await runCommand2(Object.assign(app, { task: args[0], args }));
 }
 function printVersion() {
-  console.log("2.0.0-beta.23-dev+03de42d");
+  console.log("2.0.0-beta.24-dev+314726b");
 }
 export {
   runCli,