@qwik.dev/core 2.0.0-beta.16 → 2.0.0-beta.18

package/dist/backpatch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/backpatch",
-  "version": "2.0.0-beta.16-dev+a83ccf3",
+  "version": "2.0.0-beta.18-dev+a8081d4",
   "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.16-dev+a83ccf3",
+  "version": "2.0.0-beta.18-dev+a8081d4",
   "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.16-dev+a83ccf3
+ * @qwik.dev/core/cli 2.0.0-beta.18-dev+a8081d4
  * 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
@@ -407,7 +407,7 @@ var init_dist = __esm({
     xD = ["up", "down", "left", "right", "space", "enter", "cancel"];
     B = { actions: new Set(xD), aliases: /* @__PURE__ */ new Map([["k", "up"], ["j", "down"], ["h", "left"], ["l", "right"], ["", "cancel"], ["escape", "cancel"]]) };
     AD = globalThis.process.platform.startsWith("win");
-    S = Symbol("clack:cancel");
+    S = /* @__PURE__ */ Symbol("clack:cancel");
     gD = Object.defineProperty;
     vD = (e2, u2, t) => u2 in e2 ? gD(e2, u2, { enumerable: true, configurable: true, writable: true, value: t }) : e2[u2] = t;
     h = (e2, u2, t) => (vD(e2, typeof u2 != "symbol" ? u2 + "" : u2, t), t);
@@ -800,9 +800,9 @@ var require_which_pm_runs = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/identifier.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/identifier.js
 var require_identifier = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/identifier.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/identifier.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.identifierRegex = exports.reservedIdentifiers = void 0;
@@ -867,9 +867,9 @@ var require_identifier = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/token.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/token.js
 var require_token = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/token.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/token.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonToken = exports.JsonTokenType = void 0;
@@ -902,9 +902,9 @@ var require_token = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/error.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/error.js
 var require_error = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/error.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/error.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonParseError = exports.JsonError = void 0;
@@ -926,9 +926,9 @@ var require_error = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/lexer.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/lexer.js
 var require_lexer = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/lexer.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/lexer.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonLexer = void 0;
@@ -1138,9 +1138,9 @@ var require_lexer = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/location.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/location.js
 var require_location = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/location.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/location.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.SourceLocation = exports.SourcePosition = void 0;
@@ -1168,9 +1168,9 @@ var require_location = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/node.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/node.js
 var require_node = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/node.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/node.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonNode = void 0;
@@ -1190,9 +1190,9 @@ var require_node = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/compositeNode.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/compositeNode.js
 var require_compositeNode = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/compositeNode.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/compositeNode.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonCompositeNode = void 0;
@@ -1222,9 +1222,9 @@ var require_compositeNode = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/valueNode.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/valueNode.js
 var require_valueNode = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/valueNode.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/valueNode.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonValueNode = void 0;
@@ -1242,9 +1242,9 @@ var require_valueNode = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/tokenNode.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/tokenNode.js
 var require_tokenNode = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/tokenNode.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/tokenNode.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonTokenNode = void 0;
@@ -1277,9 +1277,9 @@ var require_tokenNode = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/manipulator.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/manipulator.js
 var require_manipulator = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/manipulator.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/manipulator.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.NodeManipulator = exports.NodeMatcher = void 0;
@@ -1516,9 +1516,9 @@ var require_manipulator = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/factory.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/factory.js
 var require_factory = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/factory.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/factory.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonValueFactory = void 0;
@@ -1547,9 +1547,9 @@ var require_factory = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/identifierNode.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/identifierNode.js
 var require_identifierNode = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/identifierNode.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/identifierNode.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonIdentifierNode = void 0;
@@ -1608,9 +1608,9 @@ var require_identifierNode = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/primitiveNode.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/primitiveNode.js
 var require_primitiveNode = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/primitiveNode.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/primitiveNode.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonPrimitiveNode = void 0;
@@ -1697,9 +1697,9 @@ var require_primitiveNode = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/propertyNode.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/propertyNode.js
 var require_propertyNode = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/propertyNode.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/propertyNode.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonPropertyNode = void 0;
@@ -1790,9 +1790,9 @@ var require_propertyNode = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/structureNode.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/structureNode.js
 var require_structureNode = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/structureNode.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/structureNode.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonStructureNode = exports.StructureDelimiter = void 0;
@@ -1912,10 +1912,7 @@ var require_structureNode = __commonJS({
             }
             if (leadingIndentation) {
               if (indentationSize > 0 && manipulator.matchesNext((node) => endToken.isEquivalent(node))) {
-                manipulator.node(new tokenNode_1.JsonTokenNode({
-                  type: token_1.JsonTokenType.NEWLINE,
-                  value: "\n"
-                }));
+                manipulator.node(this.getNewlineToken(formatting));
                 if (manipulator.matchesToken(token_1.JsonTokenType.WHITESPACE) && manipulator.matchesNext(manipulator_1.NodeMatcher.NEWLINE, manipulator_1.NodeMatcher.WHITESPACE)) {
                   manipulator.remove();
                 }
@@ -1926,10 +1923,7 @@ var require_structureNode = __commonJS({
             }
             previousMatched = currentMatched;
             if (manipulator.matchesPreviousToken(token_1.JsonTokenType.LINE_COMMENT)) {
-              manipulator.insert(new tokenNode_1.JsonTokenNode({
-                type: token_1.JsonTokenType.NEWLINE,
-                value: "\n"
-              }));
+              manipulator.insert(this.getNewlineToken(formatting));
             } else if (manipulator.position > 1 && !currentMatched && manipulator.matchesPreviousToken(token_1.JsonTokenType.BLOCK_COMMENT) && !manipulator.matchesToken(token_1.JsonTokenType.WHITESPACE)) {
               manipulator.previous();
               const trailingSpace = manipulator.matchesPreviousToken(token_1.JsonTokenType.WHITESPACE);
@@ -2047,6 +2041,9 @@ var require_structureNode = __commonJS({
               lineIndentationSize = token.value.includes("	") ? token.value.replace(/[^\t]/g, "").length : token.value.replace(/[^ ]/g, "").length;
             }
           }
+          if (NEWLINE(token)) {
+            formatting.lineEnding = token.value.includes("\r\n") ? "crlf" : "lf";
+          }
           if (inlineComma && index > 0 && tokens[index - 1].depth === 0) {
             if (!NEWLINE(token)) {
               blockFormatting.commaSpacing = WHITESPACE(token);
@@ -2126,10 +2123,7 @@ var require_structureNode = __commonJS({
         if (indentationSize <= 0 && !leadingIndentation && !trailingIndentation) {
           return;
         }
-        const newLine = new tokenNode_1.JsonTokenNode({
-          type: token_1.JsonTokenType.NEWLINE,
-          value: "\n"
-        });
+        const newLine = this.getNewlineToken(formatting);
         manipulator.token(newLine, optional);
         if (manipulator.matchesToken(token_1.JsonTokenType.WHITESPACE)) {
           manipulator.next();
@@ -2147,6 +2141,12 @@ var require_structureNode = __commonJS({
           value: char.repeat(indentationLevel * indentationSize)
         });
       }
+      getNewlineToken(formatting) {
+        return new tokenNode_1.JsonTokenNode({
+          type: token_1.JsonTokenType.NEWLINE,
+          value: formatting.lineEnding === "crlf" ? "\r\n" : "\n"
+        });
+      }
       static *iterate(parent, maxDepth, parents = []) {
         for (const child of parent.children) {
           if (child instanceof tokenNode_1.JsonTokenNode) {
@@ -2197,9 +2197,9 @@ var require_structureNode = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/arrayNode.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/arrayNode.js
 var require_arrayNode = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/arrayNode.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/arrayNode.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonArrayNode = void 0;
@@ -2308,9 +2308,9 @@ var require_arrayNode = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/objectNode.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/objectNode.js
 var require_objectNode = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/objectNode.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/objectNode.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonObjectNode = void 0;
@@ -2582,9 +2582,9 @@ var require_objectNode = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/index.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/index.js
 var require_node2 = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/node/index.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/node/index.js"(exports) {
     "use strict";
     var __createBinding = exports && exports.__createBinding || (Object.create ? (function(o2, m2, k3, k22) {
       if (k22 === void 0) k22 = k3;
@@ -2617,9 +2617,9 @@ var require_node2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/parser.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/parser.js
 var require_parser = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/parser.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/parser.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.JsonParser = void 0;
@@ -2852,17 +2852,17 @@ var require_parser = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/formatting.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/formatting.js
 var require_formatting = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/formatting.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/formatting.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
   }
 });
 
-// node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/index.js
+// node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/index.js
 var require_json5_parser = __commonJS({
-  "node_modules/.pnpm/@croct+json5-parser@0.2.1/node_modules/@croct/json5-parser/index.js"(exports) {
+  "node_modules/.pnpm/@croct+json5-parser@0.2.2/node_modules/@croct/json5-parser/index.js"(exports) {
     "use strict";
     var __createBinding = exports && exports.__createBinding || (Object.create ? (function(o2, m2, k3, k22) {
       if (k22 === void 0) k22 = k3;
@@ -5625,7 +5625,7 @@ async function printHelp(app) {
   await runCommand2(Object.assign(app, { task: args[0], args }));
 }
 function printVersion() {
-  console.log("2.0.0-beta.16-dev+a83ccf3");
+  console.log("2.0.0-beta.18-dev+a8081d4");
 }
 export {
   runCli,