polen 0.10.0-next.22 → 0.10.0-next.23

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.
Files changed (13) hide show
  1. package/build/api/builder/builder.d.ts +4 -11
  2. package/build/api/builder/builder.d.ts.map +1 -1
  3. package/build/api/builder/builder.js +4 -3
  4. package/build/api/builder/builder.js.map +1 -1
  5. package/build/api/config/merge.d.ts.map +1 -1
  6. package/build/api/config/merge.js +8 -0
  7. package/build/api/config/merge.js.map +1 -1
  8. package/build/cli/commands/build.js +11 -7
  9. package/build/cli/commands/build.js.map +1 -1
  10. package/package.json +1 -1
  11. package/src/api/builder/builder.ts +8 -13
  12. package/src/api/config/merge.ts +13 -0
  13. package/src/cli/commands/build.ts +11 -7
package/build/api/builder/builder.d.ts CHANGED
@@ -1,15 +1,8 @@
1
- import { Config } from '#api/config/index';
2
- interface BuildConfigInput {
1
+ import type { ConfigInput } from '#api/config/configurator';
2
+ interface BuildInput {
3
3
  dir: string;
4
- architecture?: Config.BuildArchitecture;
5
- base?: string;
6
- server?: {
7
- port?: number;
8
- };
9
- advanced?: {
10
- debug?: boolean;
11
- };
4
+ overrides?: Partial<ConfigInput>;
12
5
  }
13
- export declare const build: (input: BuildConfigInput) => Promise<void>;
6
+ export declare const build: (input: BuildInput) => Promise<void>;
14
7
  export {};
15
8
  //# sourceMappingURL=builder.d.ts.map
package/build/api/builder/builder.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../src/api/builder/builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAK1C,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAA;IACX,YAAY,CAAC,EAAE,MAAM,CAAC,iBAAiB,CAAA;IACvC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE;QACP,IAAI,CAAC,EAAE,MAAM,CAAA;KACd,CAAA;IACD,QAAQ,CAAC,EAAE;QACT,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,CAAA;CACF;AAED,eAAO,MAAM,KAAK,GAAU,OAAO,gBAAgB,kBAqBlD,CAAA"}
1
+ {"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../src/api/builder/builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAM3D,UAAU,UAAU;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CACjC;AAED,eAAO,MAAM,KAAK,GAAU,OAAO,UAAU,kBAsB5C,CAAA"}
package/build/api/builder/builder.js CHANGED
@@ -6,11 +6,12 @@ import consola from 'consola';
6
6
  export const build = async (input) => {
7
7
  const viteUserConfig = await ConfigResolver.fromFile({
8
8
  dir: input.dir,
9
- overrides: input,
9
+ overrides: input.overrides,
10
10
  });
11
11
  const builder = await Vite.createBuilder(viteUserConfig);
12
12
  await builder.buildApp();
13
- if (input.architecture === `ssg`) {
13
+ const architecture = viteUserConfig._polen.build.architecture;
14
+ if (architecture === `ssg`) {
14
15
  consola.info(`Generating static site...`);
15
16
  await import(viteUserConfig._polen.paths.project.absolute.build.serverEntrypoint);
16
17
  // Clean up server file which should now be done being used for SSG geneation.
@@ -19,7 +20,7 @@ export const build = async (input) => {
19
20
  consola.success(`Done`);
20
21
  consola.info(`try it: npx serve ${viteUserConfig._polen.paths.project.relative.build.root} -p 4000`);
21
22
  }
22
- else if (input.architecture === `ssr`) {
23
+ else if (architecture === `ssr`) {
23
24
  consola.info(`try it: node ${viteUserConfig._polen.paths.project.relative.build.root}/app.js`);
24
25
  consola.info(`Then visit http://localhost:${viteUserConfig._polen.server.port}`);
25
26
  }
package/build/api/builder/builder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/api/builder/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAA;AACpC,OAAO,OAAO,MAAM,SAAS,CAAA;AAc7B,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EAAE,KAAuB,EAAE,EAAE;IACrD,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC;QACnD,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,SAAS,EAAE,KAAK;KACjB,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAA;IACxD,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAA;IAExB,IAAI,KAAK,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;QACzC,MAAM,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;QACjF,8EAA8E;QAC9E,MAAM,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;QACpF,kGAAkG;QAClG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvB,OAAO,CAAC,IAAI,CAAC,qBAAqB,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,CAAA;IACtG,CAAC;SAAM,IAAI,KAAK,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC,gBAAgB,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,CAAA;QAC9F,OAAO,CAAC,IAAI,CAAC,+BAA+B,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAClF,CAAC;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/api/builder/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAE3D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAA;AACpC,OAAO,OAAO,MAAM,SAAS,CAAA;AAO7B,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EAAE,KAAiB,EAAE,EAAE;IAC/C,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC;QACnD,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAA;IACxD,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAA;IAExB,MAAM,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAA;IAC7D,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;QACzC,MAAM,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;QACjF,8EAA8E;QAC9E,MAAM,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;QACpF,kGAAkG;QAClG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvB,OAAO,CAAC,IAAI,CAAC,qBAAqB,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,CAAA;IACtG,CAAC;SAAM,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;QAClC,OAAO,CAAC,IAAI,CAAC,gBAAgB,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,CAAA;QAC9F,OAAO,CAAC,IAAI,CAAC,+BAA+B,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAClF,CAAC;AACH,CAAC,CAAA"}
package/build/api/config/merge.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/api/config/merge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD;;;GAGG;AACH,eAAO,MAAM,WAAW,GACtB,MAAM,WAAW,EACjB,YAAY,WAAW,GAAG,SAAS,KAClC,WAoDF,CAAA"}
1
+ {"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/api/config/merge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD;;;GAGG;AACH,eAAO,MAAM,WAAW,GACtB,MAAM,WAAW,EACjB,YAAY,WAAW,GAAG,SAAS,KAClC,WAiEF,CAAA"}
package/build/api/config/merge.js CHANGED
@@ -21,6 +21,14 @@ export const mergeInputs = (base, overrides) => {
21
21
  if (base.server ?? overrides.server) {
22
22
  merged.server = spreadShallow(base.server, overrides.server);
23
23
  }
24
+ // Merge warnings config
25
+ if (base.warnings ?? overrides.warnings) {
26
+ merged.warnings = spreadShallow(base.warnings, overrides.warnings);
27
+ // Merge interactiveWithoutSchema config
28
+ if (base.warnings?.interactiveWithoutSchema ?? overrides.warnings?.interactiveWithoutSchema) {
29
+ merged.warnings.interactiveWithoutSchema = spreadShallow(base.warnings?.interactiveWithoutSchema, overrides.warnings?.interactiveWithoutSchema);
30
+ }
31
+ }
24
32
  // Merge advanced config
25
33
  if (base.advanced ?? overrides.advanced) {
26
34
  merged.advanced = spreadShallow(base.advanced, overrides.advanced);
package/build/api/config/merge.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../src/api/config/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAG7C;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,IAAiB,EACjB,SAAmC,EACtB,EAAE;IACf,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,MAAM,GAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IAE1D,+BAA+B;IAC/B,IAAI,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAA;IACjD,CAAC;IAED,qBAAqB;IACrB,IAAI,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QAClC,MAAM,CAAC,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,CAAA;IAC3D,CAAC;IAED,sBAAsB;IACtB,IAAI,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,CAAC,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAA;IAC9D,CAAC;IAED,wBAAwB;IACxB,IAAI,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,CAAC,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAA;QAElE,8BAA8B;QAC9B,IAAI,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC;YACtD,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAG,aAAa,CACnC,IAAI,CAAC,QAAQ,EAAE,KAAK,EACpB,SAAS,CAAC,QAAQ,EAAE,KAAK,CAC1B,CAAA;YAED,0BAA0B;YAC1B,IAAI,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,IAAI,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAClE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,GAAG;oBAC3B,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC;oBACrC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC;iBAC3C,CAAA;YACH,CAAC;QACH,CAAC;QAED,gCAAgC;QAChC,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;YACpD,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CACrC,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,EAAE,EACzB,SAAS,CAAC,QAAQ,EAAE,IAAI,IAAI,EAAE,CAC/B,CAAA;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}
1
+ {"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../src/api/config/merge.ts"],"names":[],"mappings":"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"}
package/build/cli/commands/build.js CHANGED
@@ -28,13 +28,17 @@ if (!await Api.Project.validateProjectDirectory(dir)) {
28
28
  }
29
29
  await Api.Builder.build({
30
30
  dir,
31
- architecture: args.architecture,
32
- base: args.base,
33
- server: {
34
- port: args.port,
35
- },
36
- advanced: {
37
- debug: args.debug,
31
+ overrides: {
32
+ build: {
33
+ architecture: args.architecture,
34
+ base: args.base,
35
+ },
36
+ server: {
37
+ port: args.port,
38
+ },
39
+ advanced: {
40
+ debug: args.debug,
41
+ },
38
42
  },
39
43
  });
40
44
  //# sourceMappingURL=build.js.map
package/build/cli/commands/build.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/cli/commands/build.ts"],"names":[],"mappings":"AAAA,cAAc;AACd,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE;KAC1B,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KACnD,SAAS,CACR,cAAc,EACd,gBAAgB,CACjB;KACA,SAAS,CACR,mBAAmB,EACnB,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,mDAAmD,CAAC,CAC1G;KACA,SAAS,CACR,WAAW,EACX,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,sDAAsD,CAAC,CACvF;KACA,SAAS,CACR,QAAQ,EACR,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CACvE;KACA,QAAQ,CAAC;IACR,UAAU,EAAE;QACV,WAAW,EAAE;YACX,QAAQ,EAAE;gBACR,oDAAoD;gBACpD,MAAM,EAAE,eAAe;gBACvB,OAAO,EAAE,KAAK;aACf;SACF;KACF;CACF,CAAC;KACD,KAAK,EAAE,CAAA;AAEV,MAAM,GAAG,GAAG,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAEvD,IAAI,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC;IACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC;AAED,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;IACtB,GAAG;IACH,YAAY,EAAE,IAAI,CAAC,YAAY;IAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;IACf,MAAM,EAAE;QACN,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB;IACD,QAAQ,EAAE;QACR,KAAK,EAAE,IAAI,CAAC,KAAK;KAClB;CACF,CAAC,CAAA"}
1
+ {"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/cli/commands/build.ts"],"names":[],"mappings":"AAAA,cAAc;AACd,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE;KAC1B,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KACnD,SAAS,CACR,cAAc,EACd,gBAAgB,CACjB;KACA,SAAS,CACR,mBAAmB,EACnB,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,mDAAmD,CAAC,CAC1G;KACA,SAAS,CACR,WAAW,EACX,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,sDAAsD,CAAC,CACvF;KACA,SAAS,CACR,QAAQ,EACR,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CACvE;KACA,QAAQ,CAAC;IACR,UAAU,EAAE;QACV,WAAW,EAAE;YACX,QAAQ,EAAE;gBACR,oDAAoD;gBACpD,MAAM,EAAE,eAAe;gBACvB,OAAO,EAAE,KAAK;aACf;SACF;KACF;CACF,CAAC;KACD,KAAK,EAAE,CAAA;AAEV,MAAM,GAAG,GAAG,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAEvD,IAAI,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC;IACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC;AAED,MAAM,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;IACtB,GAAG;IACH,SAAS,EAAE;QACT,KAAK,EAAE;YACL,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB;QACD,MAAM,EAAE;YACN,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB;QACD,QAAQ,EAAE;YACR,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB;KACF;CACF,CAAC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "polen",
3
- "version": "0.10.0-next.22",
3
+ "version": "0.10.0-next.23",
4
4
  "type": "module",
5
5
  "description": "A framework for delightful GraphQL developer portals",
6
6
  "author": {
package/src/api/builder/builder.ts CHANGED
@@ -1,31 +1,26 @@
1
1
  import { ConfigResolver } from '#api/config-resolver/index'
2
+ import type { ConfigInput } from '#api/config/configurator'
2
3
  import { Config } from '#api/config/index'
3
4
  import { Vite } from '#dep/vite/index'
4
5
  import { Fs } from '@wollybeard/kit'
5
6
  import consola from 'consola'
6
7
 
7
- interface BuildConfigInput {
8
+ interface BuildInput {
8
9
  dir: string
9
- architecture?: Config.BuildArchitecture
10
- base?: string
11
- server?: {
12
- port?: number
13
- }
14
- advanced?: {
15
- debug?: boolean
16
- }
10
+ overrides?: Partial<ConfigInput>
17
11
  }
18
12
 
19
- export const build = async (input: BuildConfigInput) => {
13
+ export const build = async (input: BuildInput) => {
20
14
  const viteUserConfig = await ConfigResolver.fromFile({
21
15
  dir: input.dir,
22
- overrides: input,
16
+ overrides: input.overrides,
23
17
  })
24
18
 
25
19
  const builder = await Vite.createBuilder(viteUserConfig)
26
20
  await builder.buildApp()
27
21
 
28
- if (input.architecture === `ssg`) {
22
+ const architecture = viteUserConfig._polen.build.architecture
23
+ if (architecture === `ssg`) {
29
24
  consola.info(`Generating static site...`)
30
25
  await import(viteUserConfig._polen.paths.project.absolute.build.serverEntrypoint)
31
26
  // Clean up server file which should now be done being used for SSG geneation.
@@ -33,7 +28,7 @@ export const build = async (input: BuildConfigInput) => {
33
28
  // todo: there is also some kind of prompt js asset that we probably need to clean up or review...
34
29
  consola.success(`Done`)
35
30
  consola.info(`try it: npx serve ${viteUserConfig._polen.paths.project.relative.build.root} -p 4000`)
36
- } else if (input.architecture === `ssr`) {
31
+ } else if (architecture === `ssr`) {
37
32
  consola.info(`try it: node ${viteUserConfig._polen.paths.project.relative.build.root}/app.js`)
38
33
  consola.info(`Then visit http://localhost:${viteUserConfig._polen.server.port}`)
39
34
  }
package/src/api/config/merge.ts CHANGED
@@ -31,6 +31,19 @@ export const mergeInputs = (
31
31
  merged.server = spreadShallow(base.server, overrides.server)
32
32
  }
33
33
 
34
+ // Merge warnings config
35
+ if (base.warnings ?? overrides.warnings) {
36
+ merged.warnings = spreadShallow(base.warnings, overrides.warnings)
37
+
38
+ // Merge interactiveWithoutSchema config
39
+ if (base.warnings?.interactiveWithoutSchema ?? overrides.warnings?.interactiveWithoutSchema) {
40
+ merged.warnings.interactiveWithoutSchema = spreadShallow(
41
+ base.warnings?.interactiveWithoutSchema,
42
+ overrides.warnings?.interactiveWithoutSchema,
43
+ )
44
+ }
45
+ }
46
+
34
47
  // Merge advanced config
35
48
  if (base.advanced ?? overrides.advanced) {
36
49
  merged.advanced = spreadShallow(base.advanced, overrides.advanced)
package/src/cli/commands/build.ts CHANGED
@@ -44,12 +44,16 @@ if (!await Api.Project.validateProjectDirectory(dir)) {
44
44
 
45
45
  await Api.Builder.build({
46
46
  dir,
47
- architecture: args.architecture,
48
- base: args.base,
49
- server: {
50
- port: args.port,
51
- },
52
- advanced: {
53
- debug: args.debug,
47
+ overrides: {
48
+ build: {
49
+ architecture: args.architecture,
50
+ base: args.base,
51
+ },
52
+ server: {
53
+ port: args.port,
54
+ },
55
+ advanced: {
56
+ debug: args.debug,
57
+ },
54
58
  },
55
59
  })