@powerhousedao/builder-tools 4.1.0-dev.5 → 4.1.0-dev.8

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.
@@ -46,7 +46,7 @@ export async function buildConnect(options) {
46
46
  await buildAndBundleCss(projectStylesPath, externalPackagesStylesPath);
47
47
  // Add a link to the built project styles, since the original Connect build does not know about them
48
48
  const connectBuildIndexHtmlPath = join(connectBuildDistDir, "index.html");
49
- await appendToHtmlHead(connectBuildIndexHtmlPath, `<noscript><link rel="stylesheet" href="./${CONNECT_BUILD_ASSETS_DIR_NAME}/${CONNECT_BUILD_EXTERNAL_PACKAGES_CSS_FILE_NAME}"></noscript>`);
49
+ await appendToHtmlHead(connectBuildIndexHtmlPath, `<link rel="stylesheet" href="./${CONNECT_BUILD_ASSETS_DIR_NAME}/${CONNECT_BUILD_EXTERNAL_PACKAGES_CSS_FILE_NAME}">`);
50
50
  // Add base tag to index.html
51
51
  await prependToHtmlHead(connectBuildIndexHtmlPath, `<base href="${base}${base.endsWith("/") ? "" : "/"}">`);
52
52
  }
@@ -1 +1 @@
1
- {"version":3,"file":"build.js","sourceRoot":"","sources":["../../connect-build/build.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"build.js","sourceRoot":"","sources":["../../connect-build/build.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
- import postcss from "postcss";
2
1
  /** Runs esbuild to bundle the external packages */
3
2
  export declare function bundleExternalPackages(externalPackagesImportScriptPath: string, connectBuildDistDirPath: string): Promise<import("esbuild").BuildResult<{
4
3
  entryPoints: string[];
@@ -28,5 +27,7 @@ export declare function bundleExternalPackages(externalPackagesImportScriptPath:
28
27
  /** Copies the assets from the project to the connect build dist assets directory */
29
28
  export declare function copyAssets(projectAssetsDir: string, connectBuildAssetsDir: string): Promise<void>;
30
29
  /** Builds and bundles the CSS with tailwind */
31
- export declare function buildAndBundleCss(inputPath: string, outputPath: string): Promise<postcss.Result<postcss.Root> | undefined>;
30
+ export declare function buildAndBundleCss(inputPath: string, outputPath: string): Promise<{
31
+ css: string;
32
+ }>;
32
33
  //# sourceMappingURL=helpers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../connect-build/helpers.ts"],"names":[],"mappings":"AAKA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,mDAAmD;AACnD,wBAAsB,sBAAsB,CAC1C,gCAAgC,EAAE,MAAM,EACxC,uBAAuB,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;IAqChC;AAED,oFAAoF;AACpF,wBAAsB,UAAU,CAC9B,gBAAgB,EAAE,MAAM,EACxB,qBAAqB,EAAE,MAAM,iBAa9B;AAED,+CAA+C;AAC/C,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qDAY5E"}
1
+ {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../connect-build/helpers.ts"],"names":[],"mappings":"AAMA,mDAAmD;AACnD,wBAAsB,sBAAsB,CAC1C,gCAAgC,EAAE,MAAM,EACxC,uBAAuB,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;IAqChC;AAED,oFAAoF;AACpF,wBAAsB,UAAU,CAC9B,gBAAgB,EAAE,MAAM,EACxB,qBAAqB,EAAE,MAAM,iBAa9B;AAED,+CAA+C;AAC/C,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;;GA0C5E"}
@@ -1,9 +1,8 @@
1
- import tailwindPostcssPlugin from "@tailwindcss/postcss";
2
1
  import { build } from "esbuild";
3
2
  import { nodeModulesPolyfillPlugin } from "esbuild-plugins-node-modules-polyfill";
4
3
  import { existsSync } from "fs";
5
4
  import { cp, mkdir, readFile, writeFile } from "fs/promises";
6
- import postcss from "postcss";
5
+ import { dirname, resolve } from "path";
7
6
  /** Runs esbuild to bundle the external packages */
8
7
  export async function bundleExternalPackages(externalPackagesImportScriptPath, connectBuildDistDirPath) {
9
8
  const result = await build({
@@ -60,16 +59,37 @@ export async function copyAssets(projectAssetsDir, connectBuildAssetsDir) {
60
59
  /** Builds and bundles the CSS with tailwind */
61
60
  export async function buildAndBundleCss(inputPath, outputPath) {
62
61
  try {
63
- const inputCss = await readFile(inputPath, "utf8");
64
- const result = await postcss([tailwindPostcssPlugin]).process(inputCss, {
65
- from: inputPath,
66
- to: outputPath,
62
+ const projectDir = dirname(inputPath);
63
+ const tempCssPath = resolve(projectDir, "dist/style.css");
64
+ // Ensure directories exist
65
+ await mkdir(dirname(outputPath), { recursive: true });
66
+ await mkdir(dirname(tempCssPath), { recursive: true });
67
+ const { spawn } = await import("child_process");
68
+ // Use a proper spawn wrapper instead of promisify(spawn)
69
+ await new Promise((resolve, reject) => {
70
+ const child = spawn("npx", ["@tailwindcss/cli", "-i", inputPath, "-o", tempCssPath], {
71
+ cwd: projectDir,
72
+ stdio: "inherit",
73
+ });
74
+ child.on("close", (code) => {
75
+ if (code === 0) {
76
+ resolve(code);
77
+ }
78
+ else {
79
+ reject(new Error(`CSS build failed with exit code ${code}`));
80
+ }
81
+ });
82
+ child.on("error", (error) => {
83
+ reject(error);
84
+ });
67
85
  });
68
- await writeFile(outputPath, result.css, "utf8");
69
- return result;
86
+ const builtCss = await readFile(tempCssPath, "utf8");
87
+ await writeFile(outputPath, builtCss, "utf8");
88
+ return { css: builtCss };
70
89
  }
71
90
  catch (error) {
72
91
  console.error("Error building and bundling CSS", { error });
92
+ throw error;
73
93
  }
74
94
  }
75
95
  //# sourceMappingURL=helpers.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../connect-build/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,mDAAmD;AACnD,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,gCAAwC,EACxC,uBAA+B;IAE/B,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC;QACzB,WAAW,EAAE,CAAC,gCAAgC,CAAC;QAC/C,MAAM,EAAE,uBAAuB;QAC/B,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,OAAO;QACjB,QAAQ,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC;QAChC,MAAM,EAAE;YACN,sBAAsB,EAAE,cAAc;SACvC;QACD,MAAM,EAAE;YACN,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,SAAS;SACnB;QACD,OAAO,EAAE;YACP,yBAAyB,CAAC;gBACxB,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC;gBAC9B,OAAO,EAAE;oBACP,MAAM,EAAE,KAAK;oBACb,OAAO,EAAE,IAAI;iBACd;aACF,CAAC;SACH;KACF,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,oFAAoF;AACpF,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,gBAAwB,EACxB,qBAA6B;IAE7B,IAAI,CAAC;QACH,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAClC,OAAO;QACT,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,CAAC;YACvC,MAAM,KAAK,CAAC,qBAAqB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,EAAE,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED,+CAA+C;AAC/C,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,SAAiB,EAAE,UAAkB;IAC3E,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE;YACtE,IAAI,EAAE,SAAS;YACf,EAAE,EAAE,UAAU;SACf,CAAC,CAAC;QACH,MAAM,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAChD,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../connect-build/helpers.ts"],"names":[],"mappings":"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"}