sv 0.5.8 → 0.5.10

package/dist/bin.js

@@ -25,7 +25,7 @@ import require$$0$3 from 'events';
 import { t as templates, c as create$2 } from './index-A89HFWzv.js';
 
 var name = "sv";
-var version = "0.5.8";
+var version = "0.5.10";
 var type = "module";
 var description = "A CLI for creating and updating SvelteKit projects";
 var license = "MIT";
@@ -10713,56 +10713,50 @@ function requireNamedTypes() {
   })(namedTypes);
   return namedTypes;
 }
-var hasRequiredMain;
-function requireMain() {
-  if (hasRequiredMain) return main$1;
-  hasRequiredMain = 1;
-  (function(exports) {
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.visit = exports.use = exports.Type = exports.someField = exports.PathVisitor = exports.Path = exports.NodePath = exports.namedTypes = exports.getSupertypeNames = exports.getFieldValue = exports.getFieldNames = exports.getBuilderName = exports.finalize = exports.eachField = exports.defineMethod = exports.builtInTypes = exports.builders = exports.astNodesAreEquivalent = void 0;
-    var tslib_12 = require$$0;
-    var fork_1 = tslib_12.__importDefault(requireFork());
-    var es_proposals_1 = tslib_12.__importDefault(requireEsProposals());
-    var jsx_1 = tslib_12.__importDefault(requireJsx());
-    var flow_1 = tslib_12.__importDefault(requireFlow());
-    var esprima_1 = tslib_12.__importDefault(requireEsprima$2());
-    var babel_12 = tslib_12.__importDefault(requireBabel());
-    var typescript_1 = tslib_12.__importDefault(requireTypescript());
-    var namedTypes_1 = requireNamedTypes();
-    Object.defineProperty(exports, "namedTypes", { enumerable: true, get: function() {
-      return namedTypes_1.namedTypes;
-    } });
-    var _a2 = (0, fork_1.default)([
-      // Feel free to add to or remove from this list of extension modules to
-      // configure the precise type hierarchy that you need.
-      es_proposals_1.default,
-      jsx_1.default,
-      flow_1.default,
-      esprima_1.default,
-      babel_12.default,
-      typescript_1.default
-    ]), astNodesAreEquivalent = _a2.astNodesAreEquivalent, builders = _a2.builders, builtInTypes = _a2.builtInTypes, defineMethod = _a2.defineMethod, eachField = _a2.eachField, finalize = _a2.finalize, getBuilderName = _a2.getBuilderName, getFieldNames = _a2.getFieldNames, getFieldValue = _a2.getFieldValue, getSupertypeNames = _a2.getSupertypeNames, n = _a2.namedTypes, NodePath = _a2.NodePath, Path = _a2.Path, PathVisitor = _a2.PathVisitor, someField = _a2.someField, Type = _a2.Type, use = _a2.use, visit = _a2.visit;
-    exports.astNodesAreEquivalent = astNodesAreEquivalent;
-    exports.builders = builders;
-    exports.builtInTypes = builtInTypes;
-    exports.defineMethod = defineMethod;
-    exports.eachField = eachField;
-    exports.finalize = finalize;
-    exports.getBuilderName = getBuilderName;
-    exports.getFieldNames = getFieldNames;
-    exports.getFieldValue = getFieldValue;
-    exports.getSupertypeNames = getSupertypeNames;
-    exports.NodePath = NodePath;
-    exports.Path = Path;
-    exports.PathVisitor = PathVisitor;
-    exports.someField = someField;
-    exports.Type = Type;
-    exports.use = use;
-    exports.visit = visit;
-    Object.assign(namedTypes_1.namedTypes, n);
-  })(main$1);
-  return main$1;
-}
+(function(exports) {
+  Object.defineProperty(exports, "__esModule", { value: true });
+  exports.visit = exports.use = exports.Type = exports.someField = exports.PathVisitor = exports.Path = exports.NodePath = exports.namedTypes = exports.getSupertypeNames = exports.getFieldValue = exports.getFieldNames = exports.getBuilderName = exports.finalize = exports.eachField = exports.defineMethod = exports.builtInTypes = exports.builders = exports.astNodesAreEquivalent = void 0;
+  var tslib_12 = require$$0;
+  var fork_1 = tslib_12.__importDefault(requireFork());
+  var es_proposals_1 = tslib_12.__importDefault(requireEsProposals());
+  var jsx_1 = tslib_12.__importDefault(requireJsx());
+  var flow_1 = tslib_12.__importDefault(requireFlow());
+  var esprima_1 = tslib_12.__importDefault(requireEsprima$2());
+  var babel_12 = tslib_12.__importDefault(requireBabel());
+  var typescript_1 = tslib_12.__importDefault(requireTypescript());
+  var namedTypes_1 = requireNamedTypes();
+  Object.defineProperty(exports, "namedTypes", { enumerable: true, get: function() {
+    return namedTypes_1.namedTypes;
+  } });
+  var _a2 = (0, fork_1.default)([
+    // Feel free to add to or remove from this list of extension modules to
+    // configure the precise type hierarchy that you need.
+    es_proposals_1.default,
+    jsx_1.default,
+    flow_1.default,
+    esprima_1.default,
+    babel_12.default,
+    typescript_1.default
+  ]), astNodesAreEquivalent = _a2.astNodesAreEquivalent, builders = _a2.builders, builtInTypes = _a2.builtInTypes, defineMethod = _a2.defineMethod, eachField = _a2.eachField, finalize = _a2.finalize, getBuilderName = _a2.getBuilderName, getFieldNames = _a2.getFieldNames, getFieldValue = _a2.getFieldValue, getSupertypeNames = _a2.getSupertypeNames, n = _a2.namedTypes, NodePath = _a2.NodePath, Path = _a2.Path, PathVisitor = _a2.PathVisitor, someField = _a2.someField, Type = _a2.Type, use = _a2.use, visit = _a2.visit;
+  exports.astNodesAreEquivalent = astNodesAreEquivalent;
+  exports.builders = builders;
+  exports.builtInTypes = builtInTypes;
+  exports.defineMethod = defineMethod;
+  exports.eachField = eachField;
+  exports.finalize = finalize;
+  exports.getBuilderName = getBuilderName;
+  exports.getFieldNames = getFieldNames;
+  exports.getFieldValue = getFieldValue;
+  exports.getSupertypeNames = getSupertypeNames;
+  exports.NodePath = NodePath;
+  exports.Path = Path;
+  exports.PathVisitor = PathVisitor;
+  exports.someField = someField;
+  exports.Type = Type;
+  exports.use = use;
+  exports.visit = visit;
+  Object.assign(namedTypes_1.namedTypes, n);
+})(main$1);
 var sourceMap$1 = {};
 var sourceMapGenerator$1 = {};
 var base64Vlq$1 = {};
@@ -12533,7 +12527,7 @@ function requireUtil() {
   util$7.isTrailingCommaEnabled = util$7.getParentExportDeclaration = util$7.isExportDeclaration = util$7.fixFaultyLocations = util$7.getTrueLoc = util$7.composeSourceMaps = util$7.copyPos = util$7.comparePos = util$7.getUnionOfKeys = util$7.getOption = util$7.isBrowser = util$7.getLineTerminator = void 0;
   var tslib_12 = require$$0;
   var tiny_invariant_1 = tslib_12.__importDefault(requireTinyInvariant_cjs());
-  var types2 = tslib_12.__importStar(requireMain());
+  var types2 = tslib_12.__importStar(main$1);
   var n = types2.namedTypes;
   var source_map_1 = tslib_12.__importDefault(requireSourceMap());
   var SourceMapConsumer2 = source_map_1.default.SourceMapConsumer;
@@ -33963,7 +33957,7 @@ function requireComments() {
   comments.printComments = comments.attach = void 0;
   var tslib_12 = require$$0;
   var tiny_invariant_1 = tslib_12.__importDefault(requireTinyInvariant_cjs());
-  var types2 = tslib_12.__importStar(requireMain());
+  var types2 = tslib_12.__importStar(main$1);
   var n = types2.namedTypes;
   var isArray = types2.builtInTypes.array;
   var isObject = types2.builtInTypes.object;
@@ -34213,7 +34207,7 @@ function requireParser() {
   parser$1.parse = void 0;
   var tslib_12 = require$$0;
   var tiny_invariant_1 = tslib_12.__importDefault(requireTinyInvariant_cjs());
-  var types2 = tslib_12.__importStar(requireMain());
+  var types2 = tslib_12.__importStar(main$1);
   var b = types2.builders;
   var isObject = types2.builtInTypes.object;
   var isArray = types2.builtInTypes.array;
@@ -34404,7 +34398,7 @@ function requireFastPath() {
   Object.defineProperty(fastPath, "__esModule", { value: true });
   var tslib_12 = require$$0;
   var tiny_invariant_1 = tslib_12.__importDefault(requireTinyInvariant_cjs());
-  var types2 = tslib_12.__importStar(requireMain());
+  var types2 = tslib_12.__importStar(main$1);
   var util2 = tslib_12.__importStar(requireUtil());
   var n = types2.namedTypes;
   var isArray = types2.builtInTypes.array;
@@ -34841,7 +34835,7 @@ function requirePatcher() {
   var tslib_12 = require$$0;
   var tiny_invariant_1 = tslib_12.__importDefault(requireTinyInvariant_cjs());
   var linesModule = tslib_12.__importStar(requireLines());
-  var types2 = tslib_12.__importStar(requireMain());
+  var types2 = tslib_12.__importStar(main$1);
   var Printable = types2.namedTypes.Printable;
   var Expression = types2.namedTypes.Expression;
   var ReturnStatement = types2.namedTypes.ReturnStatement;
@@ -35153,7 +35147,7 @@ function requirePrinter() {
   printer.Printer = void 0;
   var tslib_12 = require$$0;
   var tiny_invariant_1 = tslib_12.__importDefault(requireTinyInvariant_cjs());
-  var types2 = tslib_12.__importStar(requireMain());
+  var types2 = tslib_12.__importStar(main$1);
   var comments_1 = requireComments();
   var fast_path_1 = tslib_12.__importDefault(requireFastPath());
   var lines_1 = requireLines();
@@ -37343,14 +37337,14 @@ function requirePrinter() {
   exports.run = exports.prettyPrint = exports.print = exports.visit = exports.types = exports.parse = void 0;
   var tslib_12 = require$$0;
   var fs_1 = tslib_12.__importDefault(require$$1$1);
-  var types2 = tslib_12.__importStar(requireMain());
+  var types2 = tslib_12.__importStar(main$1);
   exports.types = types2;
   var parser_1 = requireParser();
   Object.defineProperty(exports, "parse", { enumerable: true, get: function() {
     return parser_1.parse;
   } });
   var printer_1 = requirePrinter();
-  var ast_types_1 = requireMain();
+  var ast_types_1 = main$1;
   Object.defineProperty(exports, "visit", { enumerable: true, get: function() {
     return ast_types_1.visit;
   } });
@@ -45890,6 +45884,14 @@ function typeAnnotateExpression(node, type) {
   };
   return expression;
 }
+function satisfiesExpression(node, type) {
+  const expression = {
+    type: "TSSatisfiesExpression",
+    expression: node,
+    typeAnnotation: { type: "TSTypeReference", typeName: { type: "Identifier", name: type } }
+  };
+  return expression;
+}
 function createSpreadElement(expression) {
   return {
     type: "SpreadElement",
@@ -45974,6 +45976,7 @@ var common = /* @__PURE__ */ Object.freeze({
   expressionStatement,
   hasNode,
   hasTypeProp,
+  satisfiesExpression,
   statementFromString,
   typeAnnotateExpression
 });
@@ -51460,13 +51463,16 @@ var tailwindcss = defineAdder({
         const rootExport = object.createEmpty();
         if (typescript) {
           imports.addNamed(ast, "tailwindcss", { Config: "Config" }, true);
-          root = common.typeAnnotateExpression(rootExport, "Config");
+          root = common.satisfiesExpression(rootExport, "Config");
         }
         const { astNode: exportDeclaration, value: node } = exports.defaultExport(
           ast,
           root ?? rootExport
         );
-        const config = node.type === "TSAsExpression" ? node.expression : node;
+        const config = node.type === "TSSatisfiesExpression" ? node.expression : node;
+        if (config.type !== "ObjectExpression") {
+          throw new Error(`Unexpected tailwind config shape: ${config.type}`);
+        }
         if (!typescript) {
           common.addJsDocTypeComment(exportDeclaration, "import('tailwindcss').Config");
         }
@@ -51497,12 +51503,16 @@ var tailwindcss = defineAdder({
     {
       name: () => "src/app.css",
       content: ({ content }) => {
-        const { ast, generateCode } = parseCss(content);
         const layerImports = ["base", "components", "utilities"].map(
-          (layer) => `"tailwindcss/${layer}"`
+          (layer) => `tailwindcss/${layer}`
         );
+        if (layerImports.every((i) => content.includes(i))) {
+          return content;
+        }
+        const { ast, generateCode } = parseCss(content);
         const originalFirst = ast.first;
-        const nodes = addImports(ast, layerImports);
+        const specifiers = layerImports.map((i) => `'${i}'`);
+        const nodes = addImports(ast, specifiers);
         if (originalFirst !== ast.first && originalFirst?.type === "atrule" && originalFirst.name === "import") {
           originalFirst.raws.before = "\n";
         }
@@ -51720,7 +51730,8 @@ async function installDependencies(agent, cwd) {
   spinner$1.start("Installing dependencies...");
   try {
     const { command, args } = constructCommand(COMMANDS[agent].install, []);
-    await be(command, args, { nodeOptions: { cwd } });
+    const { stderr } = await be(command, args, { nodeOptions: { cwd } });
+    if (stderr) throw new Error(stderr);
     spinner$1.stop("Successfully installed dependencies");
   } catch (error) {
     spinner$1.stop("Failed to install dependencies", 2);
@@ -55563,6 +55574,7 @@ async function runAdders({
   );
   const details = adderDetails.concat(commDetails);
   details.sort((a, b) => {
+    if (!a.dependsOn && !b.dependsOn) return 0;
     if (!a.dependsOn) return -1;
     if (!b.dependsOn) return 1;
     return a.dependsOn.includes(b.id) ? 1 : b.dependsOn.includes(a.id) ? -1 : 0;
@@ -55588,7 +55600,10 @@ async function runAdders({
         );
         if (workspace.packageManager === "npm") args.unshift("--yes");
         try {
-          await be(command, args, { nodeOptions: { cwd: workspace.cwd, stdio: script.stdio } });
+          const { stderr } = await be(command, args, {
+            nodeOptions: { cwd: workspace.cwd, stdio: script.stdio }
+          });
+          if (stderr) throw new Error(stderr);
         } catch (error) {
           const typedError = error;
           throw new Error(
@@ -55707,10 +55722,11 @@ const create = new Command("create").description("scaffolds a new SvelteKit proj
     if (!packageManager) {
       initialSteps.push(`${i++}: ${highlight(`${pm} install`)}`);
     }
+    const pmRun = pm === "npm" ? "npm run dev --" : `${pm} dev`;
     const steps = [
       ...initialSteps,
       `${i++}: ${highlight('git init && git add -A && git commit -m "Initial commit"')} (optional)`,
-      `${i++}: ${highlight(`${pm} run dev -- --open`)}`,
+      `${i++}: ${highlight(`${pmRun} --open`)}`,
       "",
       `To close the dev server, hit ${highlight("Ctrl-C")}`,
       "",