trellis 3.1.10 → 3.1.13
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 +1 -1
- package/dist/cms/client.d.ts +1 -0
- package/dist/cms/client.d.ts.map +1 -1
- package/dist/cms/index.js +29 -9
- package/dist/cms/types.d.ts +5 -0
- package/dist/cms/types.d.ts.map +1 -1
- package/dist/engine.d.ts.map +1 -1
- package/dist/{index-jgda3xyv.js → index-3qrxzwe4.js} +25 -0
- package/dist/index.js +1 -1
- package/package.json +1 -1
package/dist/cli/index.js
CHANGED
package/dist/cms/client.d.ts
CHANGED
|
@@ -54,6 +54,7 @@ export declare class CmsClient {
|
|
|
54
54
|
_get<T>(path: string): Promise<T | undefined>;
|
|
55
55
|
/** @internal */
|
|
56
56
|
_entities(): Promise<RawEntity[]>;
|
|
57
|
+
_facts(): Promise<RawFact[]>;
|
|
57
58
|
/** @internal */
|
|
58
59
|
_entryById(id: string, schemaFacts?: RawFact[]): Promise<Entry | null>;
|
|
59
60
|
}
|
package/dist/cms/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/cms/client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,KAAK,EACL,qBAAqB,EACrB,eAAe,EACf,UAAU,EACV,WAAW,EACX,oBAAoB,EACpB,cAAc,EACd,WAAW,EACX,eAAe,EAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EAQL,KAAK,SAAS,EACd,KAAK,OAAO,EAEb,MAAM,eAAe,CAAC;AA4BvB,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAS;IACpC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAG1B;gBAEQ,IAAI,EAAE,gBAAgB;IAYlC,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpE,GAAG,EAAE,MAAM,GACV,aAAa,CAAC,CAAC,CAAC;IAInB,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,EAAE,EAAE,MAAM,GACT,QAAQ,CAAC,CAAC,CAAC;IAId,sDAAsD;IAChD,WAAW,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAiD1C,KAAK,IAAI,IAAI;IAQb;;;;;;OAMG;IACH,MAAM,CAAC,CAAC,EACN,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,EAC5B,MAAM,GAAE;QACN,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC;QACnD,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;KAC7B,GACL,WAAW;IAmDd,gBAAgB;IACV,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/cms/client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,KAAK,EACL,qBAAqB,EACrB,eAAe,EACf,UAAU,EACV,WAAW,EACX,oBAAoB,EACpB,cAAc,EACd,WAAW,EACX,eAAe,EAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EAQL,KAAK,SAAS,EACd,KAAK,OAAO,EAEb,MAAM,eAAe,CAAC;AA4BvB,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAS;IACpC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAG1B;gBAEQ,IAAI,EAAE,gBAAgB;IAYlC,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpE,GAAG,EAAE,MAAM,GACV,aAAa,CAAC,CAAC,CAAC;IAInB,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,EAAE,EAAE,MAAM,GACT,QAAQ,CAAC,CAAC,CAAC;IAId,sDAAsD;IAChD,WAAW,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAiD1C,KAAK,IAAI,IAAI;IAQb;;;;;;OAMG;IACH,MAAM,CAAC,CAAC,EACN,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,EAC5B,MAAM,GAAE;QACN,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC;QACnD,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;KAC7B,GACL,WAAW;IAmDd,gBAAgB;IACV,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IA8BnD,gBAAgB;IACV,SAAS,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAcjC,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAclC,gBAAgB;IACV,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;CAe7E;AAED,qBAAa,aAAa,CACxB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAGzD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM;gBADH,MAAM,EAAE,SAAS,EACzB,GAAG,EAAE,MAAM;IAGhB,IAAI,CAAC,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAoDjD,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAYtE;;;;;;OAMG;IACH,SAAS,CACP,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,EAC3B,IAAI,GAAE,oBAAyB,GAC9B,WAAW;IAWR,MAAM,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;CAI3C;AAED,qBAAa,QAAQ,CACnB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAGzD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,QAAQ,CAAC,EAAE,EAAE,MAAM;gBADF,MAAM,EAAE,SAAS,EACzB,EAAE,EAAE,MAAM;IAGf,GAAG,CAAC,IAAI,GAAE,UAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAY1D,SAAS,CACP,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,EAC5B,IAAI,GAAE,qBAA0B,GAC/B,WAAW;CAUf;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,GAAG,SAAS,CAEjE"}
|
package/dist/cms/index.js
CHANGED
|
@@ -288,7 +288,7 @@ class CmsClient {
|
|
|
288
288
|
async collections() {
|
|
289
289
|
const [entities, facts] = await Promise.all([
|
|
290
290
|
this._entities(),
|
|
291
|
-
this.
|
|
291
|
+
this._facts()
|
|
292
292
|
]);
|
|
293
293
|
const factsByEntity = groupFactsByEntity(facts ?? []);
|
|
294
294
|
const counts = new Map;
|
|
@@ -400,7 +400,16 @@ class CmsClient {
|
|
|
400
400
|
return;
|
|
401
401
|
if (!res.ok)
|
|
402
402
|
throw new Error(`Trellis CMS request failed (${res.status}) ${u.pathname}`);
|
|
403
|
-
|
|
403
|
+
const kind = res.headers.get("content-type") ?? "";
|
|
404
|
+
const text = await res.text();
|
|
405
|
+
if (!kind.toLowerCase().includes("application/json")) {
|
|
406
|
+
throw new Error(`Trellis CMS expected JSON (${res.status}) ${u.pathname}: ${text.slice(0, 120)}`);
|
|
407
|
+
}
|
|
408
|
+
try {
|
|
409
|
+
return JSON.parse(text);
|
|
410
|
+
} catch (err) {
|
|
411
|
+
throw new Error(`Trellis CMS invalid JSON (${res.status}) ${u.pathname}: ${text.slice(0, 120)}`, { cause: err });
|
|
412
|
+
}
|
|
404
413
|
}
|
|
405
414
|
async _entities() {
|
|
406
415
|
const out = [];
|
|
@@ -413,13 +422,24 @@ class CmsClient {
|
|
|
413
422
|
offset += MAX_ENTITIES_PER_FETCH;
|
|
414
423
|
}
|
|
415
424
|
}
|
|
425
|
+
async _facts() {
|
|
426
|
+
const out = [];
|
|
427
|
+
let offset = 0;
|
|
428
|
+
while (true) {
|
|
429
|
+
const page = await this._get(`/facts?limit=${MAX_FACTS_PER_FETCH}&offset=${offset}`) ?? [];
|
|
430
|
+
out.push(...page);
|
|
431
|
+
if (page.length < MAX_FACTS_PER_FETCH)
|
|
432
|
+
return out;
|
|
433
|
+
offset += MAX_FACTS_PER_FETCH;
|
|
434
|
+
}
|
|
435
|
+
}
|
|
416
436
|
async _entryById(id, schemaFacts) {
|
|
417
437
|
const detail = await this._get(`/entity/${encodeURIComponent(id)}`);
|
|
418
438
|
if (!detail)
|
|
419
439
|
return null;
|
|
420
440
|
const typeFact = detail.facts.find((f) => f.a === "type");
|
|
421
441
|
const type = typeof typeFact?.v === "string" ? typeFact.v : "unknown";
|
|
422
|
-
const facts = schemaFacts ?? await this.
|
|
442
|
+
const facts = schemaFacts ?? await this._facts() ?? [];
|
|
423
443
|
return applyFormulas(entryFromFacts({ id: detail.id, type }, detail.facts, detail.links), schemaFields(facts, [type]));
|
|
424
444
|
}
|
|
425
445
|
}
|
|
@@ -437,7 +457,7 @@ class CollectionRef {
|
|
|
437
457
|
const wantsExpand = opts.expand && opts.expand.length > 0;
|
|
438
458
|
const [allEntities, facts, links] = await Promise.all([
|
|
439
459
|
this.client._entities(),
|
|
440
|
-
this.client.
|
|
460
|
+
this.client._facts(),
|
|
441
461
|
this.client._get(`/links`)
|
|
442
462
|
]);
|
|
443
463
|
if (!allEntities)
|
|
@@ -478,7 +498,7 @@ class CollectionRef {
|
|
|
478
498
|
return this.client._share(key, () => this.list(listOpts), callback, { onError, equals });
|
|
479
499
|
}
|
|
480
500
|
async schema() {
|
|
481
|
-
const facts = await this.client.
|
|
501
|
+
const facts = await this.client._facts();
|
|
482
502
|
return schemaFields(facts ?? [], [this.key]);
|
|
483
503
|
}
|
|
484
504
|
}
|
|
@@ -539,7 +559,7 @@ const off = collection.subscribe(
|
|
|
539
559
|
(entries) => {
|
|
540
560
|
console.log("Updated:", entries);
|
|
541
561
|
},
|
|
542
|
-
{${exp}},
|
|
562
|
+
{${exp} onError: (err) => console.error("CMS subscription failed", err), },
|
|
543
563
|
);
|
|
544
564
|
// off(); // call to stop receiving updates
|
|
545
565
|
`;
|
|
@@ -555,7 +575,7 @@ const cms = ${clientLiteral(url, opts.directory)};
|
|
|
555
575
|
export function use${pascal(opts.collection)}() {
|
|
556
576
|
const [entries, setEntries] = useState<Entry[]>([]);
|
|
557
577
|
useEffect(() => {
|
|
558
|
-
const off = cms.collection("${opts.collection}").subscribe(setEntries, {${exp}});
|
|
578
|
+
const off = cms.collection("${opts.collection}").subscribe(setEntries, {${exp} onError: (err) => console.error("CMS subscription failed", err), });
|
|
559
579
|
return off;
|
|
560
580
|
}, []);
|
|
561
581
|
return entries;
|
|
@@ -576,7 +596,7 @@ const cms = ${clientLiteral(url, opts.directory)};
|
|
|
576
596
|
|
|
577
597
|
export function create${pascal(opts.collection)}() {
|
|
578
598
|
const [entries, setEntries] = createSignal<Entry[]>([]);
|
|
579
|
-
const off = cms.collection("${opts.collection}").subscribe(setEntries, {${exp}});
|
|
599
|
+
const off = cms.collection("${opts.collection}").subscribe(setEntries, {${exp} onError: (err) => console.error("CMS subscription failed", err), });
|
|
580
600
|
onCleanup(off);
|
|
581
601
|
return entries;
|
|
582
602
|
}
|
|
@@ -598,7 +618,7 @@ export function use${pascal(opts.collection)}() {
|
|
|
598
618
|
const entries = ref<Entry[]>([]);
|
|
599
619
|
const off = cms.collection("${opts.collection}").subscribe((next) => {
|
|
600
620
|
entries.value = next;
|
|
601
|
-
}, {${exp}});
|
|
621
|
+
}, {${exp} onError: (err) => console.error("CMS subscription failed", err), });
|
|
602
622
|
onUnmounted(off);
|
|
603
623
|
return entries;
|
|
604
624
|
}
|
package/dist/cms/types.d.ts
CHANGED
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
export type EntryStatus = 'draft' | 'published';
|
|
7
7
|
export type FieldKind = 'text' | 'rich_text' | 'number' | 'boolean' | 'date' | 'email' | 'url' | 'color' | 'select' | 'multiselect' | 'file' | 'formula' | 'reference' | 'image' | 'video' | 'audio';
|
|
8
|
+
export type DateRepeat = 'none' | 'daily' | 'weekly' | 'monthly' | 'yearly';
|
|
8
9
|
export type FieldDefinition = {
|
|
9
10
|
key: string;
|
|
10
11
|
label?: string;
|
|
@@ -14,6 +15,10 @@ export type FieldDefinition = {
|
|
|
14
15
|
options?: string[];
|
|
15
16
|
formula?: string;
|
|
16
17
|
target?: string;
|
|
18
|
+
min?: number;
|
|
19
|
+
max?: number;
|
|
20
|
+
step?: number;
|
|
21
|
+
repeat?: DateRepeat;
|
|
17
22
|
};
|
|
18
23
|
export type Entry<T extends Record<string, unknown> = Record<string, unknown>> = {
|
|
19
24
|
/** Stable entity id (e.g. "blog_post:abc123" or "BlogPost:abc"). */
|
package/dist/cms/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/cms/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,WAAW,CAAC;AAEhD,MAAM,MAAM,SAAS,GACjB,MAAM,GACN,WAAW,GACX,QAAQ,GACR,SAAS,GACT,MAAM,GACN,OAAO,GACP,KAAK,GACL,OAAO,GACP,QAAQ,GACR,aAAa,GACb,MAAM,GACN,SAAS,GACT,WAAW,GACX,OAAO,GACP,OAAO,GACP,OAAO,CAAC;AAEZ,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/cms/types.ts"],"names":[],"mappings":"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"}
|
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