tungsten 0.4.10 → 0.4.12

package/dist/build/compileJavascript.js

@@ -6,21 +6,26 @@ import fs, { promises as fsPromises } from 'fs';
 import slash from 'slash';
 import serializeJavascript from 'serialize-javascript';
 import { globby } from 'globby';
-import { packagesCacheFolder } from "../settings.js";
-import { makeBabelUserDevConfig } from "./makeBabelUserDevConfig.js";
-import { makeBabelUserProdConfig } from "./makeBabelUserProdConfig.js";
-import { cliOut, cliLog, cliError, cliWarn } from "../cliOutput.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
-import { createTimeProfiler, isProfiling, tally } from "../timeProfiler.js";
-import { tallyBabelPlugins } from "./tallyBabelPlugins.js";
-import { TungstenError } from "../TungstenError.js";
-import { getFrameworkDir } from "../getFrameworkDir.js";
+import { devRawBuildFolder, packagesCacheFolder, prodRawBuildFolder, stylesCacheFolder } from '../settings.js';
+import { frameworkVersion } from './frameworkDestLocation.js';
+import { makeBabelUserDevConfig } from './makeBabelUserDevConfig.js';
+import { makeBabelUserProdConfig } from './makeBabelUserProdConfig.js';
+import { makeBabelRawConfig } from './makeBabelRawConfig.js';
+import { cliOut, cliLog, cliError, cliWarn } from '../cliOutput.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { createTimeProfiler, isProfiling, tallied } from '../timeProfiler.js';
+import { tallyBabelPlugins } from './tallyBabelPlugins.js';
+import { TungstenError } from '../TungstenError.js';
+import { getFrameworkDir } from '../getFrameworkDir.js';
 // The graph writeDependencyGraph() left behind on the previous run, naming a compiled copy of every
 // package file in the packages cache. Missing or unreadable just means everything is compiled from
 // source, which is what happened on every run before this was read back.
+// Nodes are keyed by package version only, so a graph another tungsten version wrote is discarded:
+// the transform may have changed. frameworkVersion here is a free option - any stamp works.
 async function loadDependencyGraph(location) {
   if (!fs.existsSync(location)) return {};
   try {
     const graphModule = await import(pathToFileURL(location).href);
+    if (graphModule.version !== frameworkVersion) return {};
     return graphModule.graph ?? {};
   } catch (error) {
     cliWarn(`Could not read the package cache at ${location}, compiling packages from source`);
@@ -33,6 +38,9 @@ async function loadDependencyGraph(location) {
 export async function compileJavascript(projectDir, appConfig, codeLocation, sourceLocation, styleImportBase, buildLocation, buildCodeLocation, mode, watch = true, options = {}) {
   if (options.quiet !== true) cliOut(`Compiling app code`);
   const compilePackages = options.packages !== false;
+  // codeLocation's .ts/.tsx are sources too, compiled to .js by babel; .d.ts is never one
+  const typescript = appConfig.typescript === true;
+  const rawBuildLocation = options.rawBuildLocation ?? join(projectDir, mode === 'dev' ? devRawBuildFolder : prodRawBuildFolder);
   let dependencyGraphDir = '';
   let dependencyGraphLocation = '';
   let oldDependencyGraph = {};
@@ -54,35 +62,48 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
   if (mode === 'dev') {
     dependencyGraphDir = options.packagesCacheLocation ?? join(projectDir, packagesCacheFolder);
     dependencyGraphLocation = join(dependencyGraphDir, '.dependency-graph.js');
-    oldDependencyGraph = await loadDependencyGraph(dependencyGraphLocation);
+    oldDependencyGraph = options.fresh === true ? {} : await loadDependencyGraph(dependencyGraphLocation);
     dependencyGraph = {};
     importAliases = {};
     promises = [];
-    config = makeBabelUserDevConfig(projectDir, codeLocation, sourceLocation, styleImportBase, buildLocation, buildCodeLocation, dependencyGraphDir, skipPackageCompilationFiles, oldDependencyGraph, dependencyGraph, importAliases, promises, watch, options.hmr === true, compilePackages);
+    config = makeBabelUserDevConfig(projectDir, codeLocation, sourceLocation, typescript, styleImportBase, buildLocation, buildCodeLocation, dependencyGraphDir, options.stylesCacheLocation ?? join(projectDir, stylesCacheFolder), options.fresh === true, skipPackageCompilationFiles, oldDependencyGraph, dependencyGraph, importAliases, promises, watch, options.hmr === true, compilePackages);
   } else {
-    config = makeBabelUserProdConfig(projectDir, codeLocation, sourceLocation, styleImportBase, watch);
+    config = makeBabelUserProdConfig(projectDir, codeLocation, sourceLocation, typescript, styleImportBase, watch);
   }
   config.root = getFrameworkDir();
+  const rawConfig = makeBabelRawConfig(typescript);
+  rawConfig.root = config.root;
   // per-plugin attribution of the transform's time, only when someone is looking: the wrappers
   // run per AST node
   if (isProfiling()) {
     config.plugins = tallyBabelPlugins(config.plugins);
+    rawConfig.plugins = tallyBabelPlugins(rawConfig.plugins);
     if (mode === 'dev' && compilePackages) {
-      cliWarn(`profiling serves linked packages from the packages cache -` + ` delete ${dependencyGraphDir} after rebuilding one, or this run compiles stale code`);
+      cliWarn(`profiling serves linked packages from the packages cache -` + ` pass --fresh after rebuilding one, or this run compiles stale code`);
     }
   }
   // compile with the API
   const codeLocationLength = codeLocation.length + 1;
+  // a source's path within the build: every compiled extension becomes .js
+  function outputRel(file) {
+    const rel = file.slice(codeLocationLength);
+    if (rel.endsWith('.jsx')) return rel.slice(0, -1);
+    if (typescript && rel.endsWith('.tsx')) return `${rel.slice(0, -3)}js`;
+    if (typescript && rel.endsWith('.ts')) return `${rel.slice(0, -2)}js`;
+    return rel;
+  }
   const transformPromises = [];
   const failedFiles = new Set();
   const pendingExportWipes = new Map();
   const exportWipeGraceMs = 5000;
+  // A source goes through the client pipeline, the raw one, both, or neither - see
+  // refreshSelections() below for what decides that
   async function transformFile(file) {
     //if (options.quiet !== true) console.log('transforming file', file)
+    const client = isClient(file);
+    const raw = isRaw(file);
+    if (!client && !raw) return;
     try {
-      let rel = file.slice(codeLocationLength);
-      if (rel.endsWith('.jsx')) rel = rel.slice(0, -1);
-      const dest = join(buildCodeLocation, rel);
       // tsc's own watch/incremental emit can leave this file genuinely blank for a
       // stretch while it recomputes - not a write-in-progress chokidar's
       // awaitWriteFinish can wait out, but a real (if temporary) empty file on disk.
@@ -93,64 +114,12 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
         failedFiles.delete(file);
         return;
       }
-      // Sync, so this can be tallied exactly - nothing else runs during it. Babel's work is
-      // cpu-bound on one thread either way, so the async API's 291 concurrent calls bought
-      // no parallelism, only scheduling. The plugins defer their async work into
-      // opts.promises rather than awaiting in a visitor, which is what makes sync viable.
-      const babelStart = performance.now();
-      const result = babelTransformFileSync(file, config);
-      tally('babel transform', performance.now() - babelStart);
-      if (result === null) throw new TungstenError(`Err: babel transform on file ${file} returned null`);
-      const {
-        code
-      } = result;
-      if (code === null || code === undefined) {
-        throw new TungstenError(`Err: code from babel transform on file ${file} was null or undefined: ${typeof code}`);
-      }
-      // tsc's incremental watch can, for one transient pass right after a save, emit
-      // `export {};` for a file that previously had real exports - its own convention
-      // for "this module has nothing to export", produced here as a self-correcting
-      // glitch rather than a real edit (confirmed via tsc's own transient
-      // "has no exported member" watch error). Quarantine it behind a timer rather than
-      // overwrite the last-good compiled output immediately: tsc's follow-up pass moments
-      // later normally retriggers this watcher with the real content, cancelling the
-      // quarantine below. But if nothing ever corrects it (a genuine edit really does
-      // remove every export), accept the quarantined content once the grace period lapses
-      // instead of hiding it forever.
-      if (code.trim() === 'export {};' && fs.existsSync(dest)) {
-        const previousCode = fs.readFileSync(dest, 'utf8');
-        if (previousCode.trim() !== 'export {};' && previousCode.trim() !== '') {
-          if (!pendingExportWipes.has(file)) {
-            const timer = setTimeout(() => {
-              void acceptQuarantinedExportWipe(file);
-            }, exportWipeGraceMs);
-            pendingExportWipes.set(file, {
-              dest,
-              code,
-              timer
-            });
-          } else {
-            // keep the original timer (grace period counts from the first sighting),
-            // just refresh the content that'll be written if it elapses
-            const pending = pendingExportWipes.get(file);
-            if (pending !== undefined) pending.code = code;
-          }
-          failedFiles.delete(file);
-          return;
-        }
+      if (client) {
+        transformTo(file, config, join(buildCodeLocation, outputRel(file)), 'babel transform', true);
       }
-      // real content arrived - cancel any quarantine still pending for this file
-      const pendingWipe = pendingExportWipes.get(file);
-      if (pendingWipe !== undefined) {
-        clearTimeout(pendingWipe.timer);
-        pendingExportWipes.delete(file);
+      if (raw) {
+        transformTo(file, rawConfig, join(rawBuildLocation, outputRel(file)), 'babel transform (raw)', false);
       }
-      await fsPromises.mkdir(dirname(dest), {
-        recursive: true
-      });
-      //// Using the sync version here, because the promise version keeps bugging out - node bug?
-      //await fsPromises.writeFile(dest, code)
-      fs.writeFileSync(dest, code);
       failedFiles.delete(file);
     } catch (e) {
       failedFiles.add(file);
@@ -159,28 +128,84 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
       throw e;
     }
   }
+  // One pipeline's transform and write. Sync, so it can be tallied exactly - nothing else runs
+  // during it. Babel's work is cpu-bound on one thread either way, so the async API's 291
+  // concurrent calls bought no parallelism, only scheduling. The plugins defer their async work
+  // into opts.promises rather than awaiting in a visitor, which is what makes sync viable.
+  function transformTo(file, babelConfig, dest, tallyName, guardExportWipe) {
+    const result = tallied(tallyName, () => babelTransformFileSync(file, babelConfig));
+    if (result === null) throw new TungstenError(`Err: babel transform on file ${file} returned null`);
+    const {
+      code
+    } = result;
+    if (code === null || code === undefined) {
+      throw new TungstenError(`Err: code from babel transform on file ${file} was null or undefined: ${typeof code}`);
+    }
+    // tsc's incremental watch can, for one transient pass right after a save, emit
+    // `export {};` for a file that previously had real exports - its own convention
+    // for "this module has nothing to export", produced here as a self-correcting
+    // glitch rather than a real edit (confirmed via tsc's own transient
+    // "has no exported member" watch error). Quarantine it behind a timer rather than
+    // overwrite the last-good compiled output immediately: tsc's follow-up pass moments
+    // later normally retriggers this watcher with the real content, cancelling the
+    // quarantine below. But if nothing ever corrects it (a genuine edit really does
+    // remove every export), accept the quarantined content once the grace period lapses
+    // instead of hiding it forever. The client tree's guard only - the raw tree is not served.
+    if (guardExportWipe && code.trim() === 'export {};' && fs.existsSync(dest)) {
+      const previousCode = fs.readFileSync(dest, 'utf8');
+      if (previousCode.trim() !== 'export {};' && previousCode.trim() !== '') {
+        if (!pendingExportWipes.has(file)) {
+          const timer = setTimeout(() => {
+            void acceptQuarantinedExportWipe(file);
+          }, exportWipeGraceMs);
+          pendingExportWipes.set(file, {
+            dest,
+            code,
+            timer
+          });
+        } else {
+          // keep the original timer (grace period counts from the first sighting),
+          // just refresh the content that'll be written if it elapses
+          const pending = pendingExportWipes.get(file);
+          if (pending !== undefined) pending.code = code;
+        }
+        return;
+      }
+    }
+    // real content arrived - cancel any quarantine still pending for this file
+    if (guardExportWipe) {
+      const pendingWipe = pendingExportWipes.get(file);
+      if (pendingWipe !== undefined) {
+        clearTimeout(pendingWipe.timer);
+        pendingExportWipes.delete(file);
+      }
+    }
+    fs.mkdirSync(dirname(dest), {
+      recursive: true
+    });
+    //// Using the sync version here, because the promise version keeps bugging out - node bug?
+    fs.writeFileSync(dest, code);
+  }
   async function deleteTransformedFile(file) {
-    let rel = file.slice(codeLocationLength);
-    if (rel.endsWith('.jsx')) rel = rel.slice(0, -1);
-    const dest = join(buildCodeLocation, rel);
     const pendingWipe = pendingExportWipes.get(file);
     if (pendingWipe !== undefined) {
       clearTimeout(pendingWipe.timer);
       pendingExportWipes.delete(file);
     }
-    try {
-      await fsPromises.unlink(dest);
-    } catch (error) {
-      const fileError = error;
-      if (fileError.code !== 'ENOENT') throw error;
+    // whichever trees hold it
+    for (const dest of [join(buildCodeLocation, outputRel(file)), join(rawBuildLocation, outputRel(file))]) {
+      try {
+        await fsPromises.unlink(dest);
+      } catch (error) {
+        const fileError = error;
+        if (fileError.code !== 'ENOENT') throw error;
+      }
     }
     failedFiles.delete(file);
   }
   async function copyFile(file) {
     try {
-      let rel = file.slice(codeLocationLength);
-      if (rel.endsWith('.jsx')) rel = rel.slice(0, -1);
-      const dest = join(buildCodeLocation, rel);
+      const dest = join(buildCodeLocation, outputRel(file));
       await fsPromises.mkdir(dirname(dest), {
         recursive: true
       });
@@ -194,9 +219,7 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
   }
   async function deleteFile(file) {
     try {
-      let rel = file.slice(codeLocationLength);
-      if (rel.endsWith('.jsx')) rel = rel.slice(0, -1);
-      const dest = join(buildCodeLocation, rel);
+      const dest = join(buildCodeLocation, outputRel(file));
       await fsPromises.unlink(dest);
     } catch (e) {
       cliError(`Tungsten: Error deleting file ${file}`);
@@ -205,11 +228,12 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
     }
   }
   // get a list of files
-  const watchGlob = slash(`${codeLocation}/**/*.js{,x}`);
+  const watchGlob = slash(`${codeLocation}/**/*.{js,jsx${typescript ? ',ts,tsx' : ''}}`);
   // typed rather than inferred from the pushes: it is captured by a closure below, which stops
   // typescript widening it from the pushes
   const ignored = [];
   ignored.push(slash(`${buildLocation}/**`));
+  if (typescript) ignored.push(slash(`${codeLocation}/**/*.d.ts`));
   if (appConfig.ignoreDirs !== undefined && appConfig.ignoreDirs !== '') {
     const ignoreDirs = typeof appConfig.ignoreDirs === 'string' ? [appConfig.ignoreDirs] : appConfig.ignoreDirs;
     ignored.push(...ignoreDirs.map(folder => slash(`${codeLocation}/${folder}/**`)));
@@ -235,6 +259,35 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
     }
   }
   if (appConfig.exclude !== undefined) ignored.push(slash(`${codeLocation}/${appConfig.exclude}`));
+  // Which sources each pipeline compiles. Unset, client is everything and raw is nothing; a file
+  // may be in both. Dirs and patterns are relative to codeDir. The ignores are not applied
+  // here - every file that reaches isClient/isRaw has already passed them, in the initial glob
+  // or in the watcher - so "client minus ignores" holds. Sets rather than matchers, refreshed on
+  // the watcher's `add`, like skipPackageCompilationFiles.
+  const sourceExtensions = `*.{js,jsx${typescript ? ',ts,tsx' : ''}}`;
+  function selectionGlobs(dirs, patterns) {
+    if (dirs === undefined && patterns === undefined) return null;
+    const list = value => value === undefined || value === '' ? [] : typeof value === 'string' ? [value] : value;
+    return [...list(dirs).map(dir => `${dir}/**/${sourceExtensions}`), ...list(patterns)];
+  }
+  const clientSelection = selectionGlobs(appConfig.clientDirs, appConfig.clientPatterns);
+  const rawSelection = selectionGlobs(appConfig.rawDirs, appConfig.rawPatterns);
+  let clientFiles = null;
+  let rawFiles = new Set();
+  async function selectedFiles(selection) {
+    const files = await globby(selection, {
+      cwd: codeLocation,
+      absolute: true
+    });
+    return new Set(files.map(file => slash(file)));
+  }
+  async function refreshSelections() {
+    clientFiles = clientSelection === null ? null : await selectedFiles(clientSelection);
+    rawFiles = rawSelection === null ? new Set() : await selectedFiles(rawSelection);
+  }
+  const isClient = file => clientFiles === null || clientFiles.has(file);
+  const isRaw = file => rawFiles.has(file);
+  await refreshSelections();
   //console.log('appConfig', appConfig)
   //console.log('ignored', ignored)
   //cliWarn(watchGlob)
@@ -276,7 +329,7 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
         recursive: true
       });
     }
-    fs.writeFileSync(dependencyGraphLocation, `export const graph = ${serializeJavascript(dependencyGraph)}`);
+    fs.writeFileSync(dependencyGraphLocation, `export const version = ${serializeJavascript(frameworkVersion)}\n` + `export const graph = ${serializeJavascript(dependencyGraph)}`);
   }
   async function acceptQuarantinedExportWipe(file) {
     const pending = pendingExportWipes.get(file);
@@ -299,7 +352,8 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
     }
     await options.onCycleComplete?.({
       success,
-      file
+      file,
+      client: true
     });
   }
   if (!watch) {
@@ -337,7 +391,10 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
           if (event === 'unlink') {
             await deleteTransformedFile(file);
           } else {
-            if (event === 'add') await refreshSkipPackageCompilationFiles();
+            if (event === 'add') {
+              await refreshSkipPackageCompilationFiles();
+              await refreshSelections();
+            }
             await transformFile(file);
           }
           const failures = await settleDeferredWork();
@@ -348,7 +405,8 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
         }
         await options.onCycleComplete?.({
           success,
-          file
+          file,
+          client: isClient(file)
         });
       }).catch(error => {
         cliError('Tungsten: Error completing JavaScript watch cycle');

package/dist/build/compileStyles.js

@@ -5,10 +5,10 @@ import { pathToFileURL } from 'url';
 import { promises as fsPromises, utimesSync } from 'fs';
 import * as sass from 'sass';
 import { globby } from 'globby';
-import { staticFolder } from "../settings.js";
-import { cliError, cliOut } from "../cliOutput.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
-import { throwError } from "../throwError.js";
-import { resolveSassImport, resolveScssImport } from "./resolveSassScssImports.js";
+import { staticFolder } from '../settings.js';
+import { cliError, cliOut } from '../cliOutput.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { throwError } from '../throwError.js';
+import { resolveSassImport, resolveScssImport } from './resolveSassScssImports.js';
 function debug(...texts) {
   //console.log(...texts)
 }

package/dist/build/compileUserApp.d.ts

@@ -2,5 +2,5 @@ import type { CompilationInfo } from './CompilationInfo.js';
 import type { FrameworkConfigComplete } from '../FrameworkConfig.js';
 import type { Mode } from '../Mode.js';
 import { type TimeProfiler } from '../timeProfiler.js';
-export declare function compileUserApp(projectDir: string, appConfig: FrameworkConfigComplete, mode: Mode, profiler?: TimeProfiler, quiet?: boolean, tests?: boolean): Promise<CompilationInfo>;
+export declare function compileUserApp(projectDir: string, appConfig: FrameworkConfigComplete, mode: Mode, profiler?: TimeProfiler, quiet?: boolean, tests?: boolean, fresh?: boolean): Promise<CompilationInfo>;
 //# sourceMappingURL=compileUserApp.d.ts.map

package/dist/build/compileUserApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compileUserApp.d.ts","sourceRoot":"","sources":["../../src/build/compileUserApp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAWtC,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAI1E,wBAAsB,cAAc,CAChC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,EAClE,QAAQ,GAAE,YAAwC,EAAE,KAAK,UAAQ,EAAE,KAAK,UAAQ,GACjF,OAAO,CAAC,eAAe,CAAC,CA4E1B"}
+{"version":3,"file":"compileUserApp.d.ts","sourceRoot":"","sources":["../../src/build/compileUserApp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAWtC,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAI1E,wBAAsB,cAAc,CAChC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,EAClE,QAAQ,GAAE,YAAwC,EAAE,KAAK,UAAQ,EAAE,KAAK,UAAQ,EAAE,KAAK,UAAQ,GAChG,OAAO,CAAC,eAAe,CAAC,CAgF1B"}

package/dist/build/compileUserApp.js

@@ -1,15 +1,15 @@
 import { join } from 'path';
-import { compileJavascript } from "./compileJavascript.js";
-import { compileStyles } from "./compileStyles.js";
-import { copyAssets } from "./copyAssets.js";
-import { copyPublicFiles } from "./copyPublicFiles.js";
-import { buildCodeSubPath, bundleFolder, devBuildOuterFolder, frameworkCssFile, frameworkCssFolder, prodBuildFolder } from "../settings.js";
-import { combineComponentCss } from "./combineComponentCss.js";
-import { writeFrameworkCss } from "./frameworkStylesheets.js";
-import { emitReloadEvent } from "../hmr/liveReloadHub.js";
-import { createTimeProfiler } from "../timeProfiler.js";
+import { compileJavascript } from './compileJavascript.js';
+import { compileStyles } from './compileStyles.js';
+import { copyAssets } from './copyAssets.js';
+import { copyPublicFiles } from './copyPublicFiles.js';
+import { buildCodeSubPath, bundleFolder, devBuildOuterFolder, frameworkCssFile, frameworkCssFolder, prodBuildFolder } from '../settings.js';
+import { combineComponentCss } from './combineComponentCss.js';
+import { writeFrameworkCss } from './frameworkStylesheets.js';
+import { emitReloadEvent } from '../hmr/liveReloadHub.js';
+import { createTimeProfiler } from '../timeProfiler.js';
 //import { compileEnv } from './compileEnv.js'
-export async function compileUserApp(projectDir, appConfig, mode, profiler = createTimeProfiler(false), quiet = false, tests = false) {
+export async function compileUserApp(projectDir, appConfig, mode, profiler = createTimeProfiler(false), quiet = false, tests = false, fresh = false) {
   const codeLocation = join(projectDir, appConfig.codeDir);
   const relSourceDir = appConfig.sourceDir !== undefined && appConfig.sourceDir !== '' ? appConfig.sourceDir : appConfig.codeDir;
   const sourceLocation = join(projectDir, relSourceDir);
@@ -23,13 +23,16 @@ export async function compileUserApp(projectDir, appConfig, mode, profiler = cre
   const compileJavascriptPromise = profiler.timeProfileAsync('compile javascript', () => compileJavascript(projectDir, appConfig, codeLocation, sourceLocation, styleImportBase, buildLocation, buildCodeLocation, mode, watch, mode === 'dev' ? {
     quiet,
     tests,
+    fresh,
     hmr: appConfig.hmr === true,
+    // a raw-only file (server code) has nothing for the browser to reload
     onCycleComplete: cycle => {
-      if (cycle.success) emitReloadEvent('js', cycle.file);
+      if (cycle.success && cycle.client !== false) emitReloadEvent('js', cycle.file);
     }
   } : {
     quiet,
-    tests
+    tests,
+    fresh
   }));
   //const compileEnvPromise = compileEnv(projectDir, appConfig, codeLocation, buildLocation, mode)
   const compileStylesPromise = profiler.timeProfileAsync('compile styles', () => compileStyles(projectDir, appConfig, styleImportBase, buildLocation, watch, mode === 'dev' ? () => emitReloadEvent('css') : undefined, quiet));

package/dist/build/componentStylesCache.d.ts

@@ -0,0 +1,10 @@
+export type CompiledStyles = {
+    css: string;
+    dependencies: string[];
+};
+export declare function makeComponentStylesCache(cacheDir: string | undefined, fresh?: boolean): {
+    lookup(moduleName: string, language: string, rawStyles: string): CompiledStyles | undefined;
+    store(moduleName: string, language: string, rawStyles: string, compiled: CompiledStyles): void;
+};
+export type ComponentStylesCache = ReturnType<typeof makeComponentStylesCache>;
+//# sourceMappingURL=componentStylesCache.d.ts.map

package/dist/build/componentStylesCache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"componentStylesCache.d.ts","sourceRoot":"","sources":["../../src/build/componentStylesCache.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,cAAc,GAAG;IACzB,GAAG,EAAE,MAAM,CAAA;IAEX,YAAY,EAAE,MAAM,EAAE,CAAA;CACzB,CAAA;AAoBD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,UAAQ;uBAKzD,MAAM,YAAY,MAAM,aAAa,MAAM,GAAG,cAAc,GAAG,SAAS;sBAezE,MAAM,YAAY,MAAM,aAAa,MAAM,YAAY,cAAc;EAY9F;AAED,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAA"}

package/dist/build/componentStylesCache.js

@@ -0,0 +1,54 @@
+import { createHash } from 'crypto';
+import fs from 'fs';
+import { join } from 'path';
+import { frameworkVersion } from './frameworkDestLocation.js';
+const sha1 = data => createHash('sha1').update(data).digest('hex');
+const blockHash = (language, rawStyles) => sha1(`${language}\0${rawStyles}`);
+const fileHash = file => {
+  try {
+    return sha1(fs.readFileSync(file, 'utf8'));
+  } catch {
+    return undefined;
+  }
+};
+// fresh: every lookup misses, so everything compiles from source and the records are all rewritten
+export function makeComponentStylesCache(cacheDir, fresh = false) {
+  // `#` (the framework module prefix) is kept out of filenames, as the css manifest does
+  const recordFile = (dir, moduleName) => join(dir, `${moduleName.replaceAll('#', '')}.json`);
+  return {
+    lookup(moduleName, language, rawStyles) {
+      if (cacheDir === undefined || fresh) return undefined;
+      let record;
+      try {
+        record = JSON.parse(fs.readFileSync(recordFile(cacheDir, moduleName), 'utf8'));
+      } catch {
+        return undefined;
+      }
+      if (record.version !== frameworkVersion || record.hash !== blockHash(language, rawStyles)) return undefined;
+      if (!Array.isArray(record.dependencies) || typeof record.css !== 'string') return undefined;
+      for (const dependency of record.dependencies) {
+        if (fileHash(dependency.file) !== dependency.hash) return undefined;
+      }
+      return {
+        css: record.css,
+        dependencies: record.dependencies.map(dependency => dependency.file)
+      };
+    },
+    store(moduleName, language, rawStyles, compiled) {
+      if (cacheDir === undefined) return;
+      const record = {
+        version: frameworkVersion,
+        hash: blockHash(language, rawStyles),
+        css: compiled.css,
+        dependencies: compiled.dependencies.map(file => ({
+          file,
+          hash: fileHash(file) ?? ''
+        }))
+      };
+      fs.mkdirSync(cacheDir, {
+        recursive: true
+      });
+      fs.writeFileSync(recordFile(cacheDir, moduleName), JSON.stringify(record));
+    }
+  };
+}

package/dist/build/copyAssets.js

@@ -3,7 +3,7 @@ import chokidar from 'chokidar';
 import { join, dirname } from 'path';
 import { promises as fsPromises } from 'fs';
 import { globby } from 'globby';
-import { cliOut } from "../cliOutput.js";
+import { cliOut } from '../cliOutput.js';
 async function copyFile(assetsLocation, targetLocation, filePathFull, event) {
   const relFile = filePathFull.slice(assetsLocation.length + 1);
   const target = join(targetLocation, relFile);

package/dist/build/copyPackageModulesToPackagesFolder.js

@@ -1,10 +1,10 @@
 import { existsSync, promises as fsPromises } from 'fs';
 import { dirname, join } from 'path';
 import { transformSync as babelTransformSync } from '@babel/core';
-import { findProjectDir } from "../findProjectDir.js";
-import { devBuildOuterFolder, prodBuildFolder, packagesFolder } from "../settings.js";
-import { MakeBabelTransformDependencyImports } from "../babelPlugins/BabelTransformDependencyImportsOld.js";
-import { TungstenError } from "../TungstenError.js";
+import { findProjectDir } from '../findProjectDir.js';
+import { devBuildOuterFolder, prodBuildFolder, packagesFolder } from '../settings.js';
+import { MakeBabelTransformDependencyImports } from '../babelPlugins/BabelTransformDependencyImportsOld.js';
+import { TungstenError } from '../TungstenError.js';
 import { cliWarn } from 'tungsten/cliOutput.js';
 const frameworkDir = findProjectDir(import.meta.url);
 // unused!

package/dist/build/copyPublicFiles.js

@@ -3,7 +3,7 @@ import chokidar from 'chokidar';
 import { join, dirname } from 'path';
 import { promises as fsPromises } from 'fs';
 import { globby } from 'globby';
-import { cliOut } from "../cliOutput.js";
+import { cliOut } from '../cliOutput.js';
 async function copyFile(assetsLocation, targetLocation, filePathFull, event) {
   const relFile = filePathFull.slice(assetsLocation.length + 1);
   const target = join(targetLocation, relFile);

package/dist/build/createClientFiles.js

@@ -1,8 +1,8 @@
 import { promises as fsPromises } from 'fs';
 import { join } from 'path';
-import { buildCodeSubPath, devBuildOuterFolder, prodBuildFolder, clientFolder, frameworkDistFolder, frameworkClientFolder } from "../settings.js";
-import { fixExtension } from "../fixExtension.js";
-import { findProjectDir } from "../findProjectDir.js";
+import { buildCodeSubPath, devBuildOuterFolder, prodBuildFolder, clientFolder, frameworkDistFolder, frameworkClientFolder } from '../settings.js';
+import { fixExtension } from '../fixExtension.js';
+import { findProjectDir } from '../findProjectDir.js';
 export async function createClientFiles(config, mode, buildLocation) {
   //console.log('creating entry file')
   const specificBuildFolder = buildLocation ?? join(process.cwd(), mode === 'dev' ? devBuildOuterFolder : prodBuildFolder);

package/dist/build/createInstanceConfigFile.js

@@ -1,7 +1,7 @@
 import { promises as fsPromises } from 'fs';
 import { join, dirname } from 'path';
-import { devBuildOuterFolder, prodBuildFolder } from "../settings.js";
-import { TungstenError } from "../TungstenError.js";
+import { devBuildOuterFolder, prodBuildFolder } from '../settings.js';
+import { TungstenError } from '../TungstenError.js';
 export async function createInstanceConfigFile(config, mode, buildLocation) {
   //console.log('creating app config')
   const specificBuildFolder = buildLocation ?? join(process.cwd(), mode === 'dev' ? devBuildOuterFolder : prodBuildFolder);

package/dist/build/createPackageVirtualFileSystems.js

@@ -1,4 +1,4 @@
-import { createPackageVirtualFileSystem } from "./createPackageVirtualFileSystem.js";
+import { createPackageVirtualFileSystem } from './createPackageVirtualFileSystem.js';
 // pretty sure we aren't using this now
 export function createPackageVirtualFileSystems(packages) {
   for (const p of Object.values(packages)) {

package/dist/build/devBundle.js

@@ -1,9 +1,9 @@
 import { join } from 'path';
-import { getFrameworkDir } from "../getFrameworkDir.js";
-import { devBuildOuterFolder, frameworkDistFolder } from "../settings.js";
-import { spawnShellCommand } from "../spawnShellCommand.js";
-import { cliError, cliOut } from "../cliOutput.js";
-import { frameworkDestLocation } from "./frameworkDestLocation.js";
+import { getFrameworkDir } from '../getFrameworkDir.js';
+import { devBuildOuterFolder, frameworkDistFolder } from '../settings.js';
+import { spawnShellCommand } from '../spawnShellCommand.js';
+import { cliError, cliOut } from '../cliOutput.js';
+import { frameworkDestLocation } from './frameworkDestLocation.js';
 export async function devBundle() {
   return new Promise((resolve, reject) => {
     cliOut('Creating dev bundle');

package/dist/build/devBundle.rollup.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devBundle.rollup.config.d.ts","sourceRoot":"","sources":["../../src/build/devBundle.rollup.config.ts"],"names":[],"mappings":"AAUA,KAAK,YAAY,GAAG;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACrB,CAAA;AAED,QAAA,MAAM,YAAY,EAAE,YAkBnB,CAAA;AAED,eAAe,YAAY,CAAA"}
+{"version":3,"file":"devBundle.rollup.config.d.ts","sourceRoot":"","sources":["../../src/build/devBundle.rollup.config.ts"],"names":[],"mappings":"AAUA,KAAK,YAAY,GAAG;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACrB,CAAA;AAED,QAAA,MAAM,YAAY,EAAE,YAiBnB,CAAA;AAED,eAAe,YAAY,CAAA"}

package/dist/build/devBundle.rollup.config.js

@@ -20,6 +20,5 @@ const rollupConfig = {
     //filename: "stats.html",
     //template: "network"
   })]
-  //strictDeprecations: true // help prep for upgrade to rollup 3 -- this complains about the inlineDynamicImports CLI arg
 };
 export default rollupConfig;

package/dist/build/frameworkDestLocation.d.ts

@@ -1,2 +1,3 @@
+export declare const frameworkVersion: string;
 export declare const frameworkDestLocation: string;
 //# sourceMappingURL=frameworkDestLocation.d.ts.map

package/dist/build/frameworkDestLocation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"frameworkDestLocation.d.ts","sourceRoot":"","sources":["../../src/build/frameworkDestLocation.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,qBAAqB,QAA4E,CAAA"}
+{"version":3,"file":"frameworkDestLocation.d.ts","sourceRoot":"","sources":["../../src/build/frameworkDestLocation.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,gBAAgB,EAAE,MAA4B,CAAA;AAC3D,eAAO,MAAM,qBAAqB,QAAyE,CAAA"}