trellis 3.1.10 → 3.1.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/cli/index.js
CHANGED
package/dist/engine.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAWH,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAMrD,OAAO,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAmB,MAAM,gBAAgB,CAAC;AAE/E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,KAAK,SAAS,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,YAAY,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,WAAW,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,UAAU,EAA2B,MAAM,mBAAmB,CAAC;AAUxE,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAI7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -4256,6 +4256,29 @@ function readIgnorePatterns(rootPath) {
|
|
|
4256
4256
|
...parseIgnoreFile(join5(rootPath, ".trellisignore"))
|
|
4257
4257
|
];
|
|
4258
4258
|
}
|
|
4259
|
+
function hasTrellisGitignoreEntry(content) {
|
|
4260
|
+
return content.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0 && !line.startsWith("#")).some((line) => {
|
|
4261
|
+
const normalized = line.replace(/\/$/, "");
|
|
4262
|
+
return normalized === ".trellis" || normalized === "/.trellis";
|
|
4263
|
+
});
|
|
4264
|
+
}
|
|
4265
|
+
function ensureTrellisGitignoreEntry(rootPath) {
|
|
4266
|
+
const gitignorePath = join5(rootPath, ".gitignore");
|
|
4267
|
+
if (!existsSync4(gitignorePath)) {
|
|
4268
|
+
writeFileSync3(gitignorePath, `${TRELLIS_GITIGNORE_ENTRY}
|
|
4269
|
+
`);
|
|
4270
|
+
return;
|
|
4271
|
+
}
|
|
4272
|
+
const content = readFileSync4(gitignorePath, "utf-8");
|
|
4273
|
+
if (hasTrellisGitignoreEntry(content)) {
|
|
4274
|
+
return;
|
|
4275
|
+
}
|
|
4276
|
+
const separator = content.length === 0 || content.endsWith(`
|
|
4277
|
+
`) ? "" : `
|
|
4278
|
+
`;
|
|
4279
|
+
writeFileSync3(gitignorePath, `${content}${separator}${TRELLIS_GITIGNORE_ENTRY}
|
|
4280
|
+
`);
|
|
4281
|
+
}
|
|
4259
4282
|
|
|
4260
4283
|
class TrellisVcsEngine {
|
|
4261
4284
|
config;
|
|
@@ -4289,6 +4312,7 @@ class TrellisVcsEngine {
|
|
|
4289
4312
|
this.opLog = new JsonOpLog(join5(this.config.rootPath, ".trellis", "ops.json"));
|
|
4290
4313
|
}
|
|
4291
4314
|
async initRepo(opts) {
|
|
4315
|
+
ensureTrellisGitignoreEntry(this.config.rootPath);
|
|
4292
4316
|
const trellisDir = join5(this.config.rootPath, ".trellis");
|
|
4293
4317
|
if (!existsSync4(trellisDir)) {
|
|
4294
4318
|
mkdirSync3(trellisDir, { recursive: true });
|
|
@@ -4821,6 +4845,7 @@ class TrellisVcsEngine {
|
|
|
4821
4845
|
}
|
|
4822
4846
|
}
|
|
4823
4847
|
}
|
|
4848
|
+
var TRELLIS_GITIGNORE_ENTRY = ".trellis/";
|
|
4824
4849
|
var init_engine = __esm(() => {
|
|
4825
4850
|
init_eav_store();
|
|
4826
4851
|
init_fs_watcher();
|
package/dist/index.js
CHANGED
package/package.json
CHANGED