tungsten 0.3.2 → 0.3.4

package/dist/Servers/hono/TungstenServerHono.js

@@ -1,51 +1,34 @@
-//import type { Response as ExpressResponse } from 'express'
-import { Hono } from 'hono';
 import { ContentNodeIsClassComponent } from "../../ContentNode.js";
 import { RoutingRedirect } from "../../routing/RoutingRedirect.js";
 import { cliTodo } from "../../cliOutput.js";
 import { RouteRedirectComponent } from "../../components/RouteRedirectComponent.js";
+import { WebRedirectComponent } from "../../components/WebRedirectComponent.js";
 import { $props, $type } from "../../contentNodeSymbols.js";
 import { WebRedirect } from "../../routing/WebRedirect.js";
-import { throwError } from "../../throwError.js";
-const app = new Hono();
-app.get(async c => {
-  const id = c.req.param('id');
-  c.res;
-  // ...
-});
-function debug(...texts) {
-  // console.log(...texts)
-}
 export class TungstenServerHono {
+  // Hono's c.redirect() builds a Response but doesn't send it - unlike Express's res.redirect()
+  // (which sends immediately), the caller here must return the Response itself for Hono to
+  // actually deliver it. Returns false when there's no redirect to make.
   handleRedirects(c /* any */, matchedRouteInfo) {
     // handle any redirect issued during routing
     if (matchedRouteInfo.data instanceof RoutingRedirect) {
       const redirect = matchedRouteInfo.data;
-      c.redirect(redirect.to, redirect.code);
-      return true;
+      return c.redirect(redirect.to, redirect.code);
     } else if (matchedRouteInfo.data instanceof WebRedirect) {
       const redirect = matchedRouteInfo.data;
-      c.redirect(redirect.to, redirect.code);
-      return true;
+      return c.redirect(redirect.to, redirect.code);
     }
-    // console.log('content', matchedRouteInfo.content)
-    // console.log('is func', typeof matchedRouteInfo.content !== 'function')
-    // console.log('ContentNodeIsClassComponent', ContentNodeIsClassComponent(matchedRouteInfo.content as any))
-    // console.log('instanceof', (matchedRouteInfo as any).content[$type] instanceof RedirectComponent)
-    // console.log('prototype instanceof', (matchedRouteInfo as any).content[$type].prototype instanceof RedirectComponent)
-    // console.log('__tungstenRedirect', (matchedRouteInfo as any).content[$type].__tungstenRedirect)
-    // console.log('$type', (matchedRouteInfo as any).content[$type])
-    //console.log('content[$type]', matchedRouteInfo.content[$type])
-    //console.log('instanceof', matchedRouteInfo.content instanceof RedirectComponent)
     if (typeof matchedRouteInfo.content !== 'function' && ContentNodeIsClassComponent(matchedRouteInfo.content)) {
       if (matchedRouteInfo.content[$type] === RouteRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof RouteRedirectComponent) {
         cliTodo('consider type of RedirectComponent props');
         const code = matchedRouteInfo.content[$props].code || 302;
         const to = matchedRouteInfo.content[$props].to;
-        c.redirect(to, code);
-        return true;
-      } else {
-        throwError('TungstenServerHono', 'Need to check for WebRedirectComponent here');
+        return c.redirect(to, code);
+      } else if (matchedRouteInfo.content[$type] === WebRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof WebRedirectComponent) {
+        cliTodo('consider type of RedirectComponent props');
+        const code = matchedRouteInfo.content[$props].code || 302;
+        const to = matchedRouteInfo.content[$props].to;
+        return c.redirect(to, code);
       }
     }
     return false;

package/dist/Servers/loadEnvsDev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadEnvsDev.d.ts","sourceRoot":"","sources":["../../src/Servers/loadEnvsDev.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAQpE,KAAK,UAAU,GAAG;IACd,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;CACf,CAAA;AAED,wBAAsB,WAAW,CAC7B,MAAM,EAAE,uBAAuB,EAE/B,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,UAAU,EAC7B,UAAU,EAAE,OAAO,EACnB,eAAe,UAAQ,iBAsH1B"}
+{"version":3,"file":"loadEnvsDev.d.ts","sourceRoot":"","sources":["../../src/Servers/loadEnvsDev.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAUpE,KAAK,UAAU,GAAG;IACd,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;CACf,CAAA;AAED,wBAAsB,WAAW,CAC7B,MAAM,EAAE,uBAAuB,EAE/B,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,UAAU,EAC7B,UAAU,EAAE,OAAO,EACnB,eAAe,UAAQ,iBAkI1B"}

package/dist/Servers/loadEnvsDev.js

@@ -7,6 +7,8 @@ import { cliLog, cliOut } from "../cliOutput.js";
 import { injectEnv } from "../env/injectEnv.js";
 import { throwError } from 'tungsten/throwError.js';
 import { tungstenCorePrivateEnvSchema } from "./tungstenCorePrivateEnvSchema.js";
+import { tungstenCorePublicEnvSchema } from "./tungstenCorePublicEnvSchema.js";
+import z from 'zod';
 export async function loadEnvsDev(config,
 //load: Load,
 iteration, initialProcessEnv, _firstLoad, useTestEnvFiles = false) {
@@ -42,7 +44,7 @@ iteration, initialProcessEnv, _firstLoad, useTestEnvFiles = false) {
       someEnvLoaded = true;
       if (_firstLoad) cliOut(`${fileName} loaded from ${filePath}`);
       //cliOut(fileName, JSON.stringify(env, null, 4))
-      injectEnv(env, tempEnv, prefix);
+      injectEnv(env, tempEnv, prefix, initialProcessEnv, config.suppressEnvOverwriteWarnings);
       //if (_firstLoad) console.log('loaded env file', fileName)
     } catch (e) {
       if (e !== null && typeof e === 'object' && 'errno' in e && e.errno === -4058) {
@@ -65,7 +67,7 @@ iteration, initialProcessEnv, _firstLoad, useTestEnvFiles = false) {
     // global.tungstenPrivateEnv = envSchemas.privateEnvSchema.parse(process.env)
     const result = envSchemas.privateEnvSchema.safeParse(tempEnv);
     if (!result.success) {
-      throwError('Your environment variables failed your privateEnvSchema validation', '\n' + JSON.stringify(result.error.format(), null, 4) + '\nenv: ' + JSON.stringify(tempEnv, null, 4)
+      throwError('Your environment variables failed your privateEnvSchema validation', '\n' + JSON.stringify(z.treeifyError(result.error), null, 4) + '\nenv: ' + JSON.stringify(tempEnv, null, 4)
       //+ '\nparsed env ' + JSON.stringify(tempEnv, null, 4)  
       );
     }
@@ -74,7 +76,7 @@ iteration, initialProcessEnv, _firstLoad, useTestEnvFiles = false) {
     if (!coreResult.success) {
       throwError('Your private environment variables don\'t meet the Tungsten requirements. Ensure your .env and privateEnvSchema provide an output meeting these requirements. You may need to coerce data to the correct type.',
       // eslint-disable-line max-len
-      '\n' + JSON.stringify(coreResult.error.format(), null, 4) + '\nenv: ' + JSON.stringify(tempEnv, null, 4)
+      '\n' + JSON.stringify(z.treeifyError(coreResult.error), null, 4) + '\nenv: ' + JSON.stringify(tempEnv, null, 4)
       //+ '\nparsed env ' + JSON.stringify(tempEnv, null, 4)  
       );
     }
@@ -89,9 +91,18 @@ iteration, initialProcessEnv, _firstLoad, useTestEnvFiles = false) {
     });
     const result = envSchemas.publicEnvSchema.safeParse(tempPublicEnv);
     if (!result.success) {
-      throwError('Public Env failed schema validation', '\n' + JSON.stringify(result.error.format(), null, 4) + '\nenv: ' + JSON.stringify(tempEnv, null, 4) + '\nparsed public env ' + JSON.stringify(tempPublicEnv, null, 4));
+      throwError('Public Env failed schema validation', '\n' + JSON.stringify(z.treeifyError(result.error), null, 4) + '\nenv: ' + JSON.stringify(tempEnv, null, 4) + '\nparsed public env ' + JSON.stringify(tempPublicEnv, null, 4));
     }
-    global.tungstenPublicEnv = result.data;
+    const coreResult = tungstenCorePublicEnvSchema.safeParse(result.data);
+    //console.log('coreResult', coreResult)
+    if (!coreResult.success) {
+      throwError('Your private environment variables don\'t meet the Tungsten requirements. Ensure your .env and privateEnvSchema provide an output meeting these requirements. You may need to coerce data to the correct type.',
+      // eslint-disable-line max-len
+      '\n' + JSON.stringify(z.treeifyError(coreResult.error), null, 4) + '\nenv: ' + JSON.stringify(tempEnv, null, 4)
+      //+ '\nparsed env ' + JSON.stringify(tempEnv, null, 4)  
+      );
+    }
+    global.tungstenPublicEnv = coreResult.data;
     //console.log('global.tungstenPublicEnv', global.tungstenPublicEnv)
     if (_firstLoad) cliOut('tungsten public env loaded and passed schema validation'); // save this so that we can show all messages about loading .env files first
   }

package/dist/Servers/routing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/Servers/routing.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAGlD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAGjE,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAE,iBAAiB,GAAG,IAAW,GAC5G,OAAO,CAAC,gBAAgB,CAAC,CA0D9B"}
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/Servers/routing.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAGlD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAIjE,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAE,iBAAiB,GAAG,IAAW,GAC5G,OAAO,CAAC,gBAAgB,CAAC,CA+D9B"}

package/dist/Servers/routing.js

@@ -1,5 +1,6 @@
 import { Default404 } from "../routing/Default404.js";
 import { matchPath } from "../routing/matchPath.js";
+import { makeTungstenErrorInfo } from "../routing/TungstenErrorInfo.js";
 import { jsx as _jsx } from "tungsten/jsxRuntime.js";
 export async function routing(location, routes, serverDataLoading = null) {
   let defaultRoute, _404Route, errorRoute;
@@ -25,7 +26,7 @@ export async function routing(location, routes, serverDataLoading = null) {
     if (match !== null) {
       const params = match.params;
       let data = undefined;
-      if (route.data) {
+      if ('data' in route) {
         if (serverDataLoading) serverDataLoading.value = true;
         data = await route.data(params, location, match.query);
         if (serverDataLoading) serverDataLoading.value = false;
@@ -50,11 +51,14 @@ export async function routing(location, routes, serverDataLoading = null) {
     params: {},
     content: _404Route.content
   };
-  if (errorRoute) return {
-    key: 'error',
-    params: {},
-    content: errorRoute.content
-  };
+  if (errorRoute) {
+    return {
+      key: 'error',
+      params: {},
+      content: errorRoute.content,
+      data: makeTungstenErrorInfo(new Error(`No route matched '${location}'`))
+    };
+  }
   return {
     key: null,
     params: {},

package/dist/Servers/tungstenCorePrivateEnvSchema.d.ts

@@ -1,9 +1,6 @@
 import { z } from 'zod';
 export declare const tungstenCorePrivateEnvSchema: z.ZodObject<{
     TUNGSTEN_SERVER_PORT: z.ZodOptional<z.ZodNumber>;
-    FRONTEND_PROTO: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"http">, z.ZodLiteral<"https">]>>;
-    FRONTEND_HOST: z.ZodOptional<z.ZodString>;
-    FRONTEND_PORT: z.ZodOptional<z.ZodNumber>;
     DEBUG: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$loose>;
 export type TungstenCorePrivateEnv = typeof tungstenCorePrivateEnvSchema._output;

package/dist/Servers/tungstenCorePrivateEnvSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tungstenCorePrivateEnvSchema.d.ts","sourceRoot":"","sources":["../../src/Servers/tungstenCorePrivateEnvSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAkBvB,eAAO,MAAM,4BAA4B;;;;;;iBASvC,CAAA;AAGF,MAAM,MAAM,sBAAsB,GAAG,OAAO,4BAA4B,CAAC,OAAO,CAAA"}
+{"version":3,"file":"tungstenCorePrivateEnvSchema.d.ts","sourceRoot":"","sources":["../../src/Servers/tungstenCorePrivateEnvSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAkBvB,eAAO,MAAM,4BAA4B;;;iBASvC,CAAA;AAGF,MAAM,MAAM,sBAAsB,GAAG,OAAO,4BAA4B,CAAC,OAAO,CAAA"}

package/dist/Servers/tungstenCorePrivateEnvSchema.js

@@ -14,9 +14,9 @@ const protoSchema = z.union([z.literal('http'), z.literal('https')]);
 const portSchema = z.number().gt(0);
 export const tungstenCorePrivateEnvSchema = z.looseObject({
   TUNGSTEN_SERVER_PORT: z.optional(portSchema),
-  FRONTEND_PROTO: z.optional(protoSchema),
-  FRONTEND_HOST: z.optional(z.string()),
-  FRONTEND_PORT: z.optional(portSchema),
+  // FRONTEND_PROTO: z.optional(protoSchema),
+  // FRONTEND_HOST: z.optional(z.string()),
+  // FRONTEND_PORT: z.optional(portSchema),
   DEBUG: z.optional(z.boolean())
   // SUPPRESS: z.optional(z.object({
   //     ORIGIN_MISMATCH_WARNING: z.optional(z.boolean())

package/dist/Servers/tungstenCorePublicEnvSchema.d.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+export declare const tungstenCorePublicEnvSchema: z.ZodObject<{
+    FRONTEND_PROTO: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"http">, z.ZodLiteral<"https">]>>;
+    FRONTEND_HOST: z.ZodOptional<z.ZodString>;
+    FRONTEND_PORT: z.ZodOptional<z.ZodNumber>;
+}, z.core.$loose>;
+export type TungstenCorePublicEnv = typeof tungstenCorePublicEnvSchema._output;
+//# sourceMappingURL=tungstenCorePublicEnvSchema.d.ts.map

package/dist/Servers/tungstenCorePublicEnvSchema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tungstenCorePublicEnvSchema.d.ts","sourceRoot":"","sources":["../../src/Servers/tungstenCorePublicEnvSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAWvB,eAAO,MAAM,2BAA2B;;;;iBAItC,CAAA;AAEF,MAAM,MAAM,qBAAqB,GAAG,OAAO,2BAA2B,CAAC,OAAO,CAAA"}

package/dist/Servers/tungstenCorePublicEnvSchema.js

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+// FRONTEND_PROTO/FRONTEND_HOST/FRONTEND_PORT are tungsten's own fields (used to
+// report the dev/prod server's own location - see DevServer.ts/ProdServer.ts).
+// Optional here because most apps keep them in the private env instead - see
+// tungstenCorePrivateEnvSchema.ts, which declares the same three fields. An
+// app is free to declare either or both; the servers check private first,
+// then public.
+const protoSchema = z.union([z.literal('http'), z.literal('https')]);
+const portSchema = z.number().gt(0);
+export const tungstenCorePublicEnvSchema = z.looseObject({
+  FRONTEND_PROTO: z.optional(protoSchema),
+  FRONTEND_HOST: z.optional(z.string()),
+  FRONTEND_PORT: z.optional(portSchema)
+});

package/dist/Store/InternalStoreSchema.d.ts

@@ -1,7 +1,9 @@
 import type { MatchedRouteInfo } from '../Servers/MatchedRouteInfo.js';
+import type { PopMessage } from '../PopMessage.type.js';
 export declare class InternalStoreSchema {
     location: string;
     matchedRouteInfo: MatchedRouteInfo;
+    popMessages: PopMessage[];
     constructor(location: string, matchedRouteInfo: MatchedRouteInfo);
 }
 //# sourceMappingURL=InternalStoreSchema.d.ts.map

package/dist/Store/InternalStoreSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InternalStoreSchema.d.ts","sourceRoot":"","sources":["../../src/Store/InternalStoreSchema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEtE,qBAAa,mBAAmB;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,EAAE,gBAAgB,CAAA;gBACtB,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB;CAInE"}
+{"version":3,"file":"InternalStoreSchema.d.ts","sourceRoot":"","sources":["../../src/Store/InternalStoreSchema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAEvD,qBAAa,mBAAmB;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,WAAW,EAAE,UAAU,EAAE,CAAK;gBAClB,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB;CAInE"}

package/dist/Store/InternalStoreSchema.js

@@ -5,6 +5,7 @@ export class InternalStoreSchema {
   constructor(location, matchedRouteInfo) {
     _defineProperty(this, "location", void 0);
     _defineProperty(this, "matchedRouteInfo", void 0);
+    _defineProperty(this, "popMessages", []);
     this.location = location;
     this.matchedRouteInfo = matchedRouteInfo;
   }

package/dist/api/Request.d.ts

@@ -1,2 +1,2 @@
-export { Request } from 'express';
+export type { Request } from 'express';
 //# sourceMappingURL=Request.d.ts.map

package/dist/api/Request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../src/api/Request.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA"}
+{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../../src/api/Request.ts"],"names":[],"mappings":"AACA,YAAY,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA"}

package/dist/api/Response.d.ts

@@ -1,2 +1,2 @@
-export { Response } from 'express';
+export type { Response } from 'express';
 //# sourceMappingURL=Response.d.ts.map

package/dist/api/Response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Response.d.ts","sourceRoot":"","sources":["../../src/api/Response.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA"}
+{"version":3,"file":"Response.d.ts","sourceRoot":"","sources":["../../src/api/Response.ts"],"names":[],"mappings":"AACA,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA"}

package/dist/babelPlugins/BabelExtractComponentStylesheet.d.ts

@@ -0,0 +1,13 @@
+import type { ClassProperty } from '@babel/types';
+import type { Babel, NodePath, PluginPass } from './BabelTypes.js';
+type Opts = {
+    onStylesheet: (rel: string, sourceFile: string) => void;
+};
+export declare function MakeBabelExtractComponentStylesheet(opts: Opts): (_babel: Babel) => {
+    name: string;
+    visitor: {
+        ClassProperty(path: NodePath<ClassProperty>, state: PluginPass): void;
+    };
+};
+export {};
+//# sourceMappingURL=BabelExtractComponentStylesheet.d.ts.map

package/dist/babelPlugins/BabelExtractComponentStylesheet.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BabelExtractComponentStylesheet.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelExtractComponentStylesheet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAElE,KAAK,IAAI,GAAG;IACR,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAA;CAC1D,CAAA;AAKD,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,IACV,QAAQ,KAAK;;;4BAI7B,QAAQ,CAAC,aAAa,CAAC,SAAS,UAAU;;EAc7E"}

package/dist/babelPlugins/BabelExtractComponentStylesheet.js

@@ -0,0 +1,24 @@
+// Reads and erases the `$stylesheet` static emitted by BabelTransformComponentStyles. The value
+// names a css file inside the package; it is extracted here so the file can be copied into the
+// build, and removed so it never reaches the browser.
+export function MakeBabelExtractComponentStylesheet(opts) {
+  return function BabelExtractComponentStylesheet(_babel) {
+    return {
+      name: 'extract-component-stylesheet',
+      visitor: {
+        ClassProperty(path, state) {
+          const {
+            key,
+            value
+          } = path.node;
+          if (key.type !== 'Identifier' || key.name !== '$stylesheet') return;
+          if (value === null || value === undefined || value.type !== 'StringLiteral') return;
+          const sourceFile = state.filename;
+          if (typeof sourceFile !== 'string') return;
+          opts.onStylesheet(value.value, sourceFile);
+          path.remove();
+        }
+      }
+    };
+  };
+}

package/dist/babelPlugins/BabelTransformComponentStyles.d.ts

@@ -8,6 +8,8 @@ type Opts = {
     cssOutputFile?: string;
     cssModulesOutputDir?: string;
     functionNames?: string[];
+    modulePrefix?: string;
+    watch?: boolean;
 };
 export declare function MakeBabelTransformComponentStyles(opts: Opts): (babel: Babel) => {
     name: string;

package/dist/babelPlugins/BabelTransformComponentStyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BabelTransformComponentStyles.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformComponentStyles.ts"],"names":[],"mappings":"AAwCA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAc,MAAM,iBAAiB,CAAA;AAa7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAmPvD,KAAK,IAAI,GAAG;IACR,iBAAiB,EAAE,MAAM,CAAA;IACzB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,wBAAwB,EAAE,MAAM,CAAA;IAChC,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CAC3B,CAAA;AAID,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,IAAI,IA4LV,OAAO,KAAK;;;;6BAMjC,MAAM;;mBAIZ,MAAM;;;uCAkBkB,QAAQ,CAAC,wBAAwB,CAAC;sBAf3D,MAAM;kBACV;gBACF,IAAI;qCATS,MAAM;kBASL;aACjB;+BACkB,MAAM;;;EAuKpC"}
+{"version":3,"file":"BabelTransformComponentStyles.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformComponentStyles.ts"],"names":[],"mappings":"AAwCA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAc,MAAM,iBAAiB,CAAA;AAa7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAmPvD,KAAK,IAAI,GAAG;IACR,iBAAiB,EAAE,MAAM,CAAA;IACzB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,wBAAwB,EAAE,MAAM,CAAA;IAChC,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IAKxB,YAAY,CAAC,EAAE,MAAM,CAAA;IAIrB,KAAK,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAID,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,IAAI,IAkMV,OAAO,KAAK;;;;6BAMjC,MAAM;;mBAIZ,MAAM;;;uCAkBkB,QAAQ,CAAC,wBAAwB,CAAC;sBAf3D,MAAM;kBACV;gBACF,IAAI;qCATS,MAAM;kBASL;aACjB;+BACkB,MAAM;;;EAsLpC"}

package/dist/babelPlugins/BabelTransformComponentStyles.js

@@ -6,7 +6,7 @@
 // that can be applied to component output at runtime
 // (I think)
 import fs from 'fs';
-import { join, dirname, basename, sep, relative } from 'path';
+import { join, dirname, basename, relative } from 'path';
 import * as sass from 'sass';
 import postcss from 'postcss';
 import { mapToArray as objectMapToArray } from 'sxy-lib/objects.js';
@@ -195,7 +195,7 @@ export function MakeBabelTransformComponentStyles(opts) {
     'ReactZoneScss': ReactZoneScss
     //'Less': Less,
   };
-  const watchStyles = opts.cssOutputFile || opts.cssModulesOutputDir;
+  const watchStyles = opts.watch !== false && (opts.cssOutputFile !== '' || opts.cssModulesOutputDir !== '');
   // should this code be moved to babel - pre?
   // prepare the css file by creating a blank file or clearing the existing file
   if (opts.cssOutputFile) {
@@ -259,14 +259,19 @@ export function MakeBabelTransformComponentStyles(opts) {
     if (name === undefined) {
       throwError('BabelTransformComponentStyles', `could not derive a module name from ${relFilePath}`);
     }
-    const parts = relFilePath.split(sep);
+    // Forward slash, not `sep`: relFilePath is sliced from a path that
+    // slash() has already normalised, so on Windows splitting by `\` gave
+    // a single part and every module name collapsed to its bare filename —
+    // platform-dependent class names, and two components sharing a filename
+    // scoped identically.
+    const parts = relFilePath.split('/');
     if (name === 'index') {
       parts.pop();
     } else {
       parts[parts.length - 1] = name;
     }
     if (index > 1) parts.push(index);
-    const moduleName = parts.join('-');
+    const moduleName = (opts.modulePrefix ?? '') + parts.join('-');
     return moduleName;
   }
   function writeOutIfNeeded(css, names, opts) {
@@ -409,8 +414,19 @@ export function MakeBabelTransformComponentStyles(opts) {
               names,
               transformedCss
             } = tagName === 'ReactZoneScss' ? cssToReactZoneStyles(css, fullFilePath, moduleName) : cssToLocalClassNames(css, fullFilePath, moduleName);
-            stylesheets[moduleName] = moduleName + '.css';
+            // `#` is a fragment delimiter in the `@import "i/….css"`
+            // the manifest is built from, so it cannot survive into
+            // a filename. The prefix's trailing `-` keeps the result
+            // readable and distinct.
+            stylesheets[moduleName] = moduleName.replaceAll('#', '') + '.css';
             writeOutIfNeeded(transformedCss, names, opts);
+            // Kept out of the style object, which ships to the browser: a separate
+            // static the build can extract and then erase.
+            const classBody = path.findParent(parent => parent.isClassBody());
+            if (classBody !== null && classBody.isClassBody()) {
+              classBody.node.body.push(t.classProperty(t.identifier('$stylesheet'), t.stringLiteral(`${individualFolderName}/${stylesheets[moduleName]}`), null, null, false, true // static
+              ));
+            }
             // increment for the next one
             state.__stylesheetIndex++;
             state.file.opts.stylesheetIndex++;

package/dist/babelPlugins/BabelTransformPackageImports.d.ts

@@ -40,6 +40,7 @@ export type DependencyGraphNode = {
     cacheLocation: string;
     finalLocation: string;
     dependencies?: Dependencies;
+    stylesheet?: string;
 };
 export type DependencyGraphNodeWithIdentifier = DependencyGraphNode & {
     fileIdentifier: string;

package/dist/babelPlugins/BabelTransformPackageImports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BabelTransformPackageImports.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformPackageImports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BabelTransformPackageImports.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformPackageImports.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAOrD,OAAO,EAGH,QAAQ,EACX,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AA8B5C,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAA;AAErE,MAAM,MAAM,QAAQ,GAAG;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,QAAQ,CAAA;IACd,WAAW,EAAE,WAAW,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,CAAA;AAEnD,MAAM,MAAM,WAAW,GAAG;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACtC,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,WAAW,CAAA;IACjB,iBAAiB,EAAE,MAAM,CAAA;IACzB,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;CACxB,CAAA;AAGD,MAAM,MAAM,WAAW,GAAG;IACtB,CAAC,GAAG,EAAC,MAAM,GAAG,WAAW,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG;IACvC,KAAK,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,CAAC,GAAG,EAAC,MAAM,GAAG,cAAc,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B,IAAI,EAAE,QAAQ,CAAA;IACd,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,YAAY,CAAA;IAE3B,UAAU,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,iCAAiC,GAAG,mBAAmB,GAAG;IAClE,cAAc,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;CACrC,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,EAAE,CAAA;AAEnC,KAAK,IAAI,GAAG;IACR,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,MAAM,CAAA;IACrB,iBAAiB,EAAE,MAAM,CAAA;IACzB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,2BAA2B,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IAChD,kBAAkB,EAAE,eAAe,CAAA;IACnC,eAAe,EAAE,eAAe,CAAA;IAChC,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IAGxC,QAAQ,EAAE,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,CAAA;CAC/C,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;AAC3D,MAAM,MAAM,qBAAqB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,WAAW,CAAA;AACjE,MAAM,MAAM,oCAAoC,GAC1C,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,KAAK,MAAM,CAAA;AACpG,MAAM,MAAM,kCAAkC,GACxC,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAmC,MAAM,CAAA;AAChF,MAAM,MAAM,uCAAuC,GAC7C,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAmC,MAAM,CAAA;AAChF,MAAM,MAAM,oBAAoB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,KAAK,MAAM,CAAA;AACrF,MAAM,MAAM,gBAAgB,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,KAAK,MAAM,CAAA;AA0DzF,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,IAAI;eAm2BpC,SAAS;;kCAkBmB,QAAQ,CAAC,iBAAiB,CAAC;;;EA8H7E"}

package/dist/babelPlugins/BabelTransformPackageImports.js

@@ -21,6 +21,8 @@ const babelPluginSyntaxImportAssertions = babelPluginSyntaxImportAssertionsModul
 import { init as lexerInit, parse as lexerParse } from 'cjs-module-lexer';
 lexerInit();
 import { MakeBabelTransformCjsToFunction } from "./BabelTransformCjsToFunction.js";
+import { MakeBabelExtractComponentStylesheet } from "./BabelExtractComponentStylesheet.js";
+import { recordFrameworkStylesheet } from "../build/frameworkStylesheets.js";
 import { MakeBabelTransformDependencyImportsEsm } from "./transformPackageImports/BabelTransformDependencyImportsEsm.js";
 import { MakeBabelTransformDependencyImportsCjs } from "./transformPackageImports/BabelTransformDependencyImportsCjs.js";
 import { frameworkDistFolder, packageName as frameworkPackageName, packageName, packagesFolder /*, packagesCacheInfoName*/ } from "../settings.js";
@@ -325,7 +327,7 @@ export function MakeBabelTransformPackageImports(opts) {
     //console.log('packageDir', packageDir)
     return getPackageInfo(packageDir);
   };
-  function makeModifyImportsEsmBabelOptions(nonEsmDeps) {
+  function makeModifyImportsEsmBabelOptions(nonEsmDeps, onStylesheet) {
     return {
       plugins: [babelPluginSyntaxImportAssertions, MakeBabelTransformDependencyImportsEsm({
         nonEsmDeps
@@ -335,11 +337,13 @@ export function MakeBabelTransformPackageImports(opts) {
         getExternalImportFinalImportLocation,
         getFileFinalLocation,
         makeCjsEntryFile
+      }), MakeBabelExtractComponentStylesheet({
+        onStylesheet
       })]
     };
   }
-  async function babelFileEsm(file /*, packageInfo*/, nonEsmDeps) {
-    const result = await babelTransformFileAsync(file, makeModifyImportsEsmBabelOptions(nonEsmDeps.map(d => d.webLocation)));
+  async function babelFileEsm(file /*, packageInfo*/, nonEsmDeps, onStylesheet) {
+    const result = await babelTransformFileAsync(file, makeModifyImportsEsmBabelOptions(nonEsmDeps.map(d => d.webLocation), onStylesheet));
     if (result === null) {
       throw new TungstenError(`BabelTransformPackageImports error: sub file babel transform (1) returned null: ${file}`);
     }
@@ -400,14 +404,14 @@ export function MakeBabelTransformPackageImports(opts) {
     //if (file.includes('domexception')) console.log('transformed imports', code)
     return result.code;
   }
-  function addToDependencyGraphFromFileInfo(fileInfo, dependencies) {
-    return addToDependencyGraph(fileInfo.fileIdentifier, fileInfo.file, fileInfo.cacheDest, fileInfo.finalDest, fileInfo.packageInfo.type, dependencies);
+  function addToDependencyGraphFromFileInfo(fileInfo, dependencies, stylesheet) {
+    return addToDependencyGraph(fileInfo.fileIdentifier, fileInfo.file, fileInfo.cacheDest, fileInfo.finalDest, fileInfo.packageInfo.type, dependencies, stylesheet);
   }
   function addToDependencyGraphFromCacheNode(fileIdentifier, cacheNode, dependencies) {
     //throw new TungstenError(`addToDependencyGraphFromCacheNode() not implemented yet`)
-    return addToDependencyGraph(fileIdentifier, cacheNode.originalLocation, cacheNode.cacheLocation, cacheNode.finalLocation, cacheNode.type, dependencies);
+    return addToDependencyGraph(fileIdentifier, cacheNode.originalLocation, cacheNode.cacheLocation, cacheNode.finalLocation, cacheNode.type, dependencies, cacheNode.stylesheet);
   }
-  function addToDependencyGraph(fileIdentifier, file, cacheLocation, finalLocation, fileType, dependencies) {
+  function addToDependencyGraph(fileIdentifier, file, cacheLocation, finalLocation, fileType, dependencies, stylesheet) {
     //console.log('addToDependencyGraph')
     //console.log(type, file, dependencies.length)
     opts.dependencyGraph[fileIdentifier] = {
@@ -417,6 +421,11 @@ export function MakeBabelTransformPackageImports(opts) {
       finalLocation: finalLocation
     };
     if (dependencies) opts.dependencyGraph[fileIdentifier].dependencies = dependencies;
+    // both paths land here, so a restored file contributes its css as a transformed one does
+    if (stylesheet !== undefined) {
+      opts.dependencyGraph[fileIdentifier].stylesheet = stylesheet;
+      recordFrameworkStylesheet(getPackageDirForFile(file), stylesheet);
+    }
   }
   function resolveFile(file) {
     //console.log('resolve file', file)
@@ -447,6 +456,7 @@ export function MakeBabelTransformPackageImports(opts) {
       finalDest,
       packageInfo
     } = fileInfo;
+    let stylesheet;
     //try {
     const dependencies = getFileDependencies(fileInfo, sourceFilename, history);
     // cliInfo(`deps for ${file}`)
@@ -464,7 +474,9 @@ export function MakeBabelTransformPackageImports(opts) {
     if (hasJavascriptFileExtension(file)) {
       if (getModuleFormatForFile(file) === 'esm' && file.endsWith('.js') || file.endsWith('.mjs')) {
         try {
-          const code = await babelFileEsm(file /*, packageInfo*/, nonEsmDependenciesFull);
+          const code = await babelFileEsm(file /*, packageInfo*/, nonEsmDependenciesFull, rel => {
+            stylesheet = rel;
+          });
           //console.log('writing file', cacheDest)
           //console.log('writing file', finalDest)
           await fsPromises.writeFile(cacheDest, code); // rel contains the slash at start
@@ -494,7 +506,7 @@ export function MakeBabelTransformPackageImports(opts) {
       await fsPromises.copyFile(file, finalDest);
     }
     const dependenciesFileIndentifiers = dependenciesFull.map(d => d.fileIdentifier);
-    addToDependencyGraphFromFileInfo(fileInfo, dependenciesFileIndentifiers);
+    addToDependencyGraphFromFileInfo(fileInfo, dependenciesFileIndentifiers, stylesheet);
     // add deps to dependencyGraph
     // returns the deps
     await processDependencies(dependenciesFull, sourceFilename, [...history, file]);

package/dist/babelPlugins/BabelTypes.d.ts

@@ -1,6 +1,6 @@
 import type * as BabelCore from '@babel/core';
-export { BabelCore };
-export { NodePath, PluginPass } from '@babel/core';
+export type { BabelCore };
+export type { NodePath, PluginPass } from '@babel/core';
 export type Babel = typeof BabelCore;
 export * as BabelTypes from '@babel/types';
 //# sourceMappingURL=BabelTypes.d.ts.map

package/dist/babelPlugins/BabelTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BabelTypes.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,SAAS,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,CAAA;AACpB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAClD,MAAM,MAAM,KAAK,GAAG,OAAO,SAAS,CAAC;AAErC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAA"}
+{"version":3,"file":"BabelTypes.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,SAAS,MAAM,aAAa,CAAA;AAC7C,YAAY,EAAE,SAAS,EAAE,CAAA;AACzB,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACvD,MAAM,MAAM,KAAK,GAAG,OAAO,SAAS,CAAC;AAErC,OAAO,KAAK,UAAU,MAAM,cAAc,CAAA"}

package/dist/babelPlugins/BabelTypes.js

@@ -1,3 +1,2 @@
-export { NodePath } from '@babel/core';
 //import type { types as Types } from '@babel/core';
 export * as BabelTypes from '@babel/types';

package/dist/bin/commands/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/build.ts"],"names":[],"mappings":"AAyCA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/build.ts"],"names":[],"mappings":"AAqDA,OAAO,EAAE,CAAA"}

package/dist/bin/commands/build.js

@@ -1,10 +1,13 @@
 // build
 import chalk from 'chalk-extensions';
 import { Framework } from "../../Framework.js";
-import { cliOut, cliNews } from "../../cliOutput.js";
+import { cliOut, cliNews, cliWarn } from "../../cliOutput.js";
 import { staticSiteFolder } from "../../settings.js";
+import { createTimeProfiler } from "../../timeProfiler.js";
+const profile = process.argv.slice(3).includes('--profile');
 //// prep the app
 const sxyFramework = new Framework();
+sxyFramework.profiler = createTimeProfiler(profile);
 await sxyFramework.init();
 await sxyFramework.clean('prod');
 await sxyFramework.build('prod');
@@ -24,4 +27,11 @@ if (sxyFramework.config.staticSite) {
 } else {
   cliNews(`Production build complete`);
 }
-process.exit(0);
+// The build no longer holds anything open, so it ends by draining the event loop - hard-exiting
+// here used to abort the process outright when an fs-extra copy still had a chmod in flight
+// (libuv `!(handle->flags & UV_HANDLE_CLOSING)`). Safety net only, in case a future change
+// leaks a handle again: unref'd, so a clean build still exits the moment it is done.
+setTimeout(() => {
+  cliWarn(`Build finished but something is still holding the process open - exiting anyway.`);
+  process.exit(0);
+}, 10_000).unref();

package/dist/bin/commands/compile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/compile.ts"],"names":[],"mappings":"AAgRA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/compile.ts"],"names":[],"mappings":"AAuRA,OAAO,EAAE,CAAA"}

package/dist/bin/commands/compile.js

@@ -3,12 +3,13 @@ import { promises as fsPromises } from 'fs';
 import { removeRecursive } from "../../removeRecursive.js";
 import { compileJavascript } from "../../build/compileJavascript.js";
 import { compileStyles } from "../../build/compileStyles.js";
+import { writeFrameworkCss } from "../../build/frameworkStylesheets.js";
 import { copyAssets } from "../../build/copyAssets.js";
 import { copyPublicFiles } from "../../build/copyPublicFiles.js";
 import { createClientFiles } from "../../build/createClientFiles.js";
 import { createInstanceConfigFile } from "../../build/createInstanceConfigFile.js";
 import { getUserConfig } from "../../getUserConfig.js";
-import { buildCodeSubPath, assetsFolder, clientFolder, componentCssFolder, devBuildOuterFolder, packagesCacheFolder, packagesFolder, publicFolder, staticFolder } from "../../settings.js";
+import { buildCodeSubPath, assetsFolder, clientFolder, componentCssFolder, devBuildOuterFolder, frameworkCssFolder, packagesCacheFolder, packagesFolder, publicFolder, staticFolder } from "../../settings.js";
 import { cliError, cliNews, cliOut } from "../../cliOutput.js";
 const targetOptions = {
   '--js': 'js',
@@ -121,7 +122,9 @@ async function markReady() {
 await clearReadyFile();
 const cleanTasks = [];
 if (clean && targets.has('js')) {
-  cleanTasks.push(removeRecursive(buildCodeLocation), removeRecursive(join(buildLocation, componentCssFolder)), removeRecursive(join(buildLocation, packagesFolder)), removeRecursive(packagesCacheLocation));
+  cleanTasks.push(removeRecursive(buildCodeLocation), removeRecursive(join(buildLocation, componentCssFolder)),
+  // else a component the app no longer imports keeps its stale stylesheet linked
+  removeRecursive(join(buildLocation, frameworkCssFolder)), removeRecursive(join(buildLocation, packagesFolder)), removeRecursive(packagesCacheLocation));
 }
 if (clean && targets.has('css')) {
   cleanTasks.push(removeRecursive(join(buildLocation, staticFolder)));
@@ -171,6 +174,8 @@ if (targets.has('public')) {
   compilationTasks.push(copyPublicFiles(projectDir, config, buildLocation, watch));
 }
 const compilationResults = await Promise.allSettled(compilationTasks);
+// after the js task: the package walk that records the stylesheets runs inside it
+if (targets.has('js')) await writeFrameworkCss(buildLocation);
 const failures = compilationResults.filter(result => result.status === 'rejected').map(result => result.reason);
 const initialSuccess = failures.length === 0 && javascriptInitialSuccess;
 if (initialSuccess) {

package/dist/bin/commands/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/dev.ts"],"names":[],"mappings":"AA2CA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/dev.ts"],"names":[],"mappings":"AAqDA,OAAO,EAAE,CAAA"}