@comet/cli 7.16.0-canary-20250303141103 → 8.0.0-beta.1

package/lib/comet.js

@@ -1,5 +1,5 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 var commander_1 = require("commander");
 var generate_block_types_1 = require("./commands/generate-block-types");
 var site_configs_1 = require("./commands/site-configs");

package/lib/commands/generate-block-types.js

@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -46,7 +46,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateBlockTypes = void 0;
 var commander_1 = require("commander");
 var promises_1 = require("fs/promises");
@@ -78,7 +78,7 @@ function writeFieldType(field, blockNamePostfix) {
         }
     }
     else if (field.kind === "Enum") {
-        content += "\"".concat(field["enum"].join('" | "'), "\"");
+        content += "\"".concat(field.enum.join('" | "'), "\"");
     }
     else if (field.kind === "Block") {
         content += "".concat(field.block).concat(blockNamePostfix);
@@ -162,9 +162,11 @@ var generateBlockTypes = new commander_1.Command("generate-block-types")
                 return [4 /*yield*/, (0, prettier_1.resolveConfig)(process.cwd())];
             case 2:
                 prettierOptions = _a.sent();
-                content = (0, prettier_1.format)(content, __assign(__assign({}, prettierOptions), { parser: "typescript" }));
-                return [4 /*yield*/, (0, promises_1.writeFile)(options.outputFile, content)];
+                return [4 /*yield*/, (0, prettier_1.format)(content, __assign(__assign({}, prettierOptions), { parser: "typescript" }))];
             case 3:
+                content = _a.sent();
+                return [4 /*yield*/, (0, promises_1.writeFile)(options.outputFile, content)];
+            case 4:
                 _a.sent();
                 return [2 /*return*/];
         }

package/lib/commands/site-configs.js

@@ -26,13 +26,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -43,8 +53,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -92,13 +102,12 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectSiteConfigsCommand = void 0;
 /* eslint-disable no-console */
 var commander_1 = require("commander");
 var fs_1 = __importDefault(require("fs"));
 var path_1 = require("path");
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 exports.injectSiteConfigsCommand = new commander_1.Command("inject-site-configs")
     .description("Inject site-configs into a file")
     .requiredOption("-i, --in-file <file>", "The filename of a template file to inject.")
@@ -109,15 +118,14 @@ exports.injectSiteConfigsCommand = new commander_1.Command("inject-site-configs"
     .action(function (options) { return __awaiter(void 0, void 0, void 0, function () {
     var configFile, getSiteConfigs, str, getUrlFromDomain, replacerFunctions;
     return __generator(this, function (_a) {
-        var _b;
         switch (_a.label) {
             case 0:
                 configFile = "".concat(process.cwd(), "/").concat(options.siteConfigFile || "site-configs.ts");
-                return [4 /*yield*/, (_b = configFile, Promise.resolve().then(function () { return __importStar(require(_b)); }))];
+                return [4 /*yield*/, Promise.resolve("".concat(configFile)).then(function (s) { return __importStar(require(s)); })];
             case 1:
-                getSiteConfigs = (_a.sent())["default"];
+                getSiteConfigs = (_a.sent()).default;
                 console.log("inject-site-configs: Replace site-configs in ".concat(options.inFile));
-                str = fs_1["default"].readFileSync((0, path_1.resolve)(process.cwd(), options.inFile)).toString();
+                str = fs_1.default.readFileSync((0, path_1.resolve)(process.cwd(), options.inFile)).toString();
                 getUrlFromDomain = function (domain) {
                     return domain.includes("localhost") ? "http://".concat(domain) : "https://".concat(domain);
                 };
@@ -136,7 +144,7 @@ exports.injectSiteConfigsCommand = new commander_1.Command("inject-site-configs"
                             var _a;
                             return (__assign(__assign({}, siteConfig.public), { name: siteConfig.name, domains: siteConfig.domains, preloginEnabled: siteConfig.preloginEnabled || false, url: getUrlFromDomain((_a = siteConfig.domains.preliminary) !== null && _a !== void 0 ? _a : siteConfig.domains.main) }));
                         });
-                    }
+                    },
                 };
                 str = str.replace(/"({{ site:\/\/configs\/.*\/.* }})"/g, "'$1'"); // convert to single quotes
                 return [4 /*yield*/, replaceAsync(str, RegExp("{{ site://configs/(.*)/(.*) }}", "g"), function (substr, type, env) { return __awaiter(void 0, void 0, void 0, function () {
@@ -186,7 +194,7 @@ exports.injectSiteConfigsCommand = new commander_1.Command("inject-site-configs"
                     }); })];
             case 3:
                 str = _a.sent();
-                fs_1["default"].writeFileSync((0, path_1.resolve)(process.cwd(), options.outFile), str);
+                fs_1.default.writeFileSync((0, path_1.resolve)(process.cwd(), options.outFile), str);
                 return [2 /*return*/];
         }
     });

package/lib/index.js

@@ -1,2 +1,2 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/site-configs.types.js

@@ -1,2 +1,2 @@
 "use strict";
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@comet/cli",
-  "version": "7.16.0-canary-20250303141103",
+  "version": "8.0.0-beta.1",
   "repository": {
+    "directory": "packages/cli",
     "type": "git",
-    "url": "https://github.com/vivid-planet/comet",
-    "directory": "packages/cli"
+    "url": "https://github.com/vivid-planet/comet"
   },
   "license": "BSD-2-Clause",
   "main": "lib/index.js",
@@ -17,20 +17,17 @@
     "lib/*"
   ],
   "dependencies": {
-    "commander": "^9.2.0",
-    "prettier": "^2.7.1"
+    "commander": "^9.5.0",
+    "prettier": "^3.5.3",
+    "ts-node": "^10.9.2"
   },
   "devDependencies": {
-    "@comet/eslint-config": "7.16.0-canary-20250303141103",
-    "@types/node": "^22.0.0",
-    "eslint": "^8.0.0",
-    "npm-run-all": "^4.1.5",
-    "rimraf": "^3.0.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.0.0"
-  },
-  "peerDependencies": {
-    "ts-node": "^10.9.1"
+    "@comet/eslint-config": "^8.0.0-beta.1",
+    "@types/node": "^22.13.8",
+    "eslint": "^9.20.1",
+    "npm-run-all2": "^5.0.2",
+    "rimraf": "^6.0.1",
+    "typescript": "^5.7.3"
   },
   "publishConfig": {
     "access": "public",
@@ -41,7 +38,7 @@
     "clean": "rimraf lib",
     "dev": "tsc --watch",
     "lint": "run-p lint:prettier lint:eslint lint:tsc",
-    "lint:eslint": "eslint --max-warnings 0 src/ package.json",
+    "lint:eslint": "eslint --max-warnings 0 src/ **/*.json --no-warn-ignored",
     "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'",
     "lint:tsc": "tsc"
   }