tungsten 0.4.11 → 0.4.13

package/dist/build/compileStyles.js

@@ -1,14 +1,14 @@
-import slash from 'slash';
+import slash from '../slash.js';
 import chokidar from 'chokidar';
 import { join, dirname, resolve } from 'path';
 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 { glob } from '../glob.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)
 }
@@ -59,7 +59,7 @@ function findSxssDependencies(data, file, regex, extension) {
   // [...xxx] converts it to a plain array
   let results = [...data.matchAll(regex)]
   // the matches group is on position 1, so we map to get just the match group
-  .map(x => x[1]); // eslint-disable-line no-type-assertion/no-type-assertion
+  .map(x => x[1]); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
   if (extension === '.sass') results = results.map(dep => {
     if ((dep.startsWith(`'`) || dep.startsWith(`"`)) && dep.endsWith(dep[0])) {
       return dep.slice(1, -1);
@@ -216,7 +216,7 @@ export async function compileStyles(projectDir, config, styleImportBase, buildLo
   const ignoreGlob = buildLocation + '/**/*';
   debug('Styles watchGlob', watchGlob);
   if (!watch) {
-    const files = await globby(slash(watchGlob));
+    const files = await glob(slash(watchGlob));
     await Promise.all(files.map(file => processAndCopyFile(sourceLocation, staticLocation, slash(file), styleImportBase, cssFiles, cssDependencies, cssdependers)));
     return null;
   }

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

@@ -1,9 +1,9 @@
-import slash from 'slash';
+import slash from '../slash.js';
 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 { glob } from '../glob.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);
@@ -23,7 +23,7 @@ export async function copyAssets(projectDir, config, buildLocation, watch = true
     const watchGlob = assetsLocation + '/**/*';
     //const ignoreGlob = buildLocation + '/**/*'
     if (!watch) {
-      const files = await globby(slash(watchGlob));
+      const files = await glob(slash(watchGlob));
       await Promise.all(files.map(file => copyFile(assetsLocation, targetLocation, slash(file), 'add')));
       return null;
     }

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

@@ -1,9 +1,9 @@
-import slash from 'slash';
+import slash from '../slash.js';
 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 { glob } from '../glob.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);
@@ -24,7 +24,7 @@ export async function copyPublicFiles(projectDir, config, buildLocation, watch =
   const watchGlob = publicLocation + '/**/*';
   //const ignoreGlob = buildLocation + '/**/*'
   if (!watch) {
-    const files = await globby(slash(watchGlob));
+    const files = await glob(slash(watchGlob));
     await Promise.all(files.map(file => copyFile(publicLocation, targetLocation, slash(file), 'add')));
     return null;
   }

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"}

package/dist/build/frameworkDestLocation.js

@@ -1,10 +1,14 @@
 import { getPackageJson } from 'sxy-package-investigator';
-import { TungstenError } from "../TungstenError.js";
-import { getFrameworkDir } from "../getFrameworkDir.js";
-import { frameworkDistFolder, packageName } from "../settings.js";
+import { TungstenError } from '../TungstenError.js';
+import { getFrameworkDir } from '../getFrameworkDir.js';
+import { frameworkDistFolder, packageName } from '../settings.js';
 const packageJsonResult = getPackageJson(getFrameworkDir());
 const packageJson = packageJsonResult.value;
 if (packageJson === undefined) {
   throw new TungstenError(`getSxyClientPackageAliases() error: framework package.json not found`);
 }
-export const frameworkDestLocation = `/.packages/${packageName}@${packageJson.version}/${frameworkDistFolder}`;
+if (packageJson.version === undefined) {
+  throw new TungstenError(`frameworkDestLocation error: framework package.json has no version`);
+}
+export const frameworkVersion = packageJson.version;
+export const frameworkDestLocation = `/.packages/${packageName}@${frameworkVersion}/${frameworkDistFolder}`;

package/dist/build/frameworkStylesheets.js

@@ -1,7 +1,7 @@
 import { existsSync, promises as fsPromises } from 'fs';
 import { dirname, join } from 'path';
-import slash from 'slash';
-import { frameworkCssFile, frameworkCssFolder, frameworkDistFolder } from "../settings.js";
+import slash from '../slash.js';
+import { frameworkCssFile, frameworkCssFolder, frameworkDistFolder } from '../settings.js';
 // Component stylesheets named by a `$stylesheet` static on a package component, collected while
 // the package import tree is walked so only components the app actually imports contribute.
 // Held on globalThis because moduleReloader busts the ES module cache in dev, so the collector

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

@@ -1 +1 @@
-{"version":3,"file":"getAllSxyClientModules.d.ts","sourceRoot":"","sources":["../../src/build/getAllSxyClientModules.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAGrC,MAAM,MAAM,qBAAqB,GAAG,MAAM,EAAE,CAAA;AAE5C,wBAAgB,2BAA2B,IAAI,qBAAqB,CA+BnE"}
+{"version":3,"file":"getAllSxyClientModules.d.ts","sourceRoot":"","sources":["../../src/build/getAllSxyClientModules.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,MAAM,MAAM,qBAAqB,GAAG,MAAM,EAAE,CAAA;AAK5C,wBAAgB,2BAA2B,IAAI,qBAAqB,CAEnE"}

package/dist/build/getAllSxyClientModules.js

@@ -1,30 +1,6 @@
-import dependencyTree from 'sxy-dependency-tree';
-import { join } from 'path';
-import { findProjectDir } from "../findProjectDir.js";
-import { frameworkDistFolder } from "../settings.js";
+// the module list this used to walk with sxy-dependency-tree has been empty for a long time; the
+// walk went with it (typescript + typescript-estree, ~250 modules at dev start). The servers
+// still guard on the field being defined.
 export function getAllTungstenClientModules() {
-  const frameworkLocation = findProjectDir(import.meta.url);
-  const tungstenModules = [];
-  for (const module of []) {
-    const fullPath = join(frameworkLocation, frameworkDistFolder, module);
-    const nonExistent = [];
-    const dependencies = dependencyTree.toList({
-      filename: fullPath,
-      directory: frameworkLocation,
-      nonExistent
-    });
-    for (const dependency of dependencies) {
-      if (!tungstenModules.includes(dependency)) {
-        tungstenModules.push(dependency);
-      }
-    }
-  }
-  //const distCodeLocation = frameworkLocation+'/'+frameworkDistFolder+'/'
-  const tungstenModulesDetailed = tungstenModules.map(module => {
-    return {
-      abs: module,
-      rel: module.slice((frameworkLocation + '/').length) // relative to base
-    };
-  });
-  return tungstenModulesDetailed;
+  return [];
 }

package/dist/build/getPackageDirForFile.js

@@ -1,5 +1,5 @@
 import { dirname } from 'path';
-import { findProjectDir } from "../findProjectDir.js";
+import { findProjectDir } from '../findProjectDir.js';
 const cache = {};
 // Package boundary for a file. Nameless package.json files are not boundaries — see findProjectDir.
 export function getPackageDirForFile(file) {

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

@@ -1 +1 @@
-{"version":3,"file":"getSxyClientPackageAliases.d.ts","sourceRoot":"","sources":["../../src/build/getSxyClientPackageAliases.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAQvD,wBAAgB,+BAA+B,IAAI,aAAa,CAgC/D"}
+{"version":3,"file":"getSxyClientPackageAliases.d.ts","sourceRoot":"","sources":["../../src/build/getSxyClientPackageAliases.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAKvD,wBAAgB,+BAA+B,IAAI,aAAa,CAkC/D"}

package/dist/build/getSxyClientPackageAliases.js

@@ -1,4 +1,4 @@
-import { frameworkDestLocation } from "./frameworkDestLocation.js";
+import { frameworkDestLocation } from './frameworkDestLocation.js';
 // I think these are only used in dev
 export function getTungstenClientPackageAliases() {
   // const packageJsonResult = getPackageJson(getFrameworkDir())
@@ -10,7 +10,9 @@ export function getTungstenClientPackageAliases() {
   // I think these are only used in dev
   const importAliases = {
     'tungsten': `${frameworkDestLocation}/index.js`,
-    'tungsten/jsxRuntime.js': `${frameworkDestLocation}/jsxRuntime.js`
+    // what preset-react emits, in app code and the framework's own dist alike; the exports
+    // map answers it for node and rollup
+    'tungsten/jsx-runtime': `${frameworkDestLocation}/jsx-runtime.js`
     // The component library, mirroring the `./library` subpath in exports.
     //'tungsten/library': `${frameworkDestLocation}/components/library/index.js`,
     //'tungsten': `${frameworkDestLocation}/indexBundle.js`,

package/dist/build/getTempDirForAppCompilation.js

@@ -1,5 +1,5 @@
 import { join } from 'path';
-import { devBuildFolder, prodBuildCodeFolder } from "../settings.js";
+import { devBuildFolder, prodBuildCodeFolder } from '../settings.js';
 //import { tmpdir } from 'os'
 export function getTempDirForAppCompilation(projectDir, mode) {
   // const location = join(

package/dist/build/makeBabelRawConfig.d.ts

@@ -0,0 +1,3 @@
+import type { TransformOptions } from '@babel/core';
+export declare function makeBabelRawConfig(typescript: boolean): TransformOptions;
+//# sourceMappingURL=makeBabelRawConfig.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"makeBabelRawConfig.d.ts","sourceRoot":"","sources":["../../src/build/makeBabelRawConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AASnD,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,OAAO,GAAG,gBAAgB,CAKxE"}

package/dist/build/makeBabelRawConfig.js

@@ -0,0 +1,12 @@
+import { objectCopy } from 'sxy-lib-object-copy';
+import userCommonConfig, { typescriptPreset } from './babel.user.common.config.js';
+import { MakeBabelTransformJsxExtensionsToJs } from '../babelPlugins/BabelTransformJsxExtensionsToJs.js';
+// The raw pipeline: sources compiled for node rather than the browser (config rawDirs/rawPatterns).
+// The common presets - jsx, and types stripped when the app is typescript - with only the
+// extension rewrite; none of the client plugins, so imports are left for node to resolve.
+export function makeBabelRawConfig(typescript) {
+  const rawConfig = objectCopy(userCommonConfig);
+  if (typescript) rawConfig.presets.push(typescriptPreset()); // eslint-disable-line @typescript-eslint/no-non-null-assertion
+  rawConfig.plugins = [MakeBabelTransformJsxExtensionsToJs()];
+  return rawConfig;
+}

package/dist/build/makeBabelUserDevConfig.d.ts

@@ -1,5 +1,5 @@
 import type { TransformOptions } from '@babel/core';
 import type { ImportAliases } from './ImportAliases.js';
 import { DependencyGraph } from '../babelPlugins/BabelTransformPackageImports.js';
-export declare function makeBabelUserDevConfig(projectDir: string, absCodeDir: string, absSourceDir: string, absStyleImportBase: string, buildLocation: string, buildCodeLocation: string, packagesCacheLocation: string, skipPackageCompilationFiles: ReadonlySet<string>, oldDependencyGraph: DependencyGraph, dependencyGraph: DependencyGraph, importAliases: ImportAliases, promises: Promise<any>[], watchStyles?: boolean, hmr?: boolean, packages?: boolean): TransformOptions;
+export declare function makeBabelUserDevConfig(projectDir: string, absCodeDir: string, absSourceDir: string, typescript: boolean, absStyleImportBase: string, buildLocation: string, buildCodeLocation: string, packagesCacheLocation: string, stylesCacheLocation: string | undefined, fresh: boolean, skipPackageCompilationFiles: ReadonlySet<string>, oldDependencyGraph: DependencyGraph, dependencyGraph: DependencyGraph, importAliases: ImportAliases, promises: Promise<any>[], watchStyles?: boolean, hmr?: boolean, packages?: boolean): TransformOptions;
 //# sourceMappingURL=makeBabelUserDevConfig.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"makeBabelUserDevConfig.d.ts","sourceRoot":"","sources":["../../src/build/makeBabelUserDevConfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAKnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAEvD,OAAO,EAAoC,eAAe,EAAE,MAAM,iDAAiD,CAAA;AAOnH,wBAAgB,sBAAsB,CAClC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,EAC1B,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM,EACzB,qBAAqB,EAAE,MAAM,EAC7B,2BAA2B,EAAE,WAAW,CAAC,MAAM,CAAC,EAChD,kBAAkB,EAAE,eAAe,EACnC,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,EACxB,WAAW,UAAO,EAClB,GAAG,UAAQ,EACX,QAAQ,UAAO,GAChB,gBAAgB,CAyClB"}
+{"version":3,"file":"makeBabelUserDevConfig.d.ts","sourceRoot":"","sources":["../../src/build/makeBabelUserDevConfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAInD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAEvD,OAAO,EAAoC,eAAe,EAAE,MAAM,iDAAiD,CAAA;AAOnH,wBAAgB,sBAAsB,CAClC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,OAAO,EACnB,kBAAkB,EAAE,MAAM,EAC1B,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM,EACzB,qBAAqB,EAAE,MAAM,EAC7B,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,KAAK,EAAE,OAAO,EACd,2BAA2B,EAAE,WAAW,CAAC,MAAM,CAAC,EAChD,kBAAkB,EAAE,eAAe,EACnC,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,EACxB,WAAW,UAAO,EAClB,GAAG,UAAQ,EACX,QAAQ,UAAO,GAChB,gBAAgB,CA4ClB"}

package/dist/build/makeBabelUserDevConfig.js

@@ -1,14 +1,15 @@
 // may retire this
 import { objectCopy } from 'sxy-lib-object-copy';
 import { join } from 'path';
-import { MakeBabelTransformComponentStyles } from "../babelPlugins/BabelTransformComponentStyles.js";
-import { MakeBabelTransformPackageImports } from "../babelPlugins/BabelTransformPackageImports.js";
-import { componentCssFolder, componentCssFile } from "../settings.js";
-import userCommonConfig from "./babel.user.common.config.js";
-import { MakeBabelTransformCssImports } from "../babelPlugins/BabelTransformCssImports.js";
-import { MakeBabelAddDevCacheBust } from "../babelPlugins/BabelAddDevCacheBust.js";
-export function makeBabelUserDevConfig(projectDir, absCodeDir, absSourceDir, absStyleImportBase, buildLocation, buildCodeLocation, packagesCacheLocation, skipPackageCompilationFiles, oldDependencyGraph, dependencyGraph, importAliases, promises, watchStyles = true, hmr = false, packages = true) {
+import { MakeBabelTransformComponentStyles } from '../babelPlugins/BabelTransformComponentStyles.js';
+import { MakeBabelTransformPackageImports } from '../babelPlugins/BabelTransformPackageImports.js';
+import { componentCssFolder, componentCssFile } from '../settings.js';
+import userCommonConfig, { typescriptPreset } from './babel.user.common.config.js';
+import { MakeBabelTransformCssImports } from '../babelPlugins/BabelTransformCssImports.js';
+import { MakeBabelAddDevCacheBust } from '../babelPlugins/BabelAddDevCacheBust.js';
+export function makeBabelUserDevConfig(projectDir, absCodeDir, absSourceDir, typescript, absStyleImportBase, buildLocation, buildCodeLocation, packagesCacheLocation, stylesCacheLocation, fresh, skipPackageCompilationFiles, oldDependencyGraph, dependencyGraph, importAliases, promises, watchStyles = true, hmr = false, packages = true) {
   const userDevConfig = objectCopy(userCommonConfig);
+  if (typescript) userDevConfig.presets.push(typescriptPreset());
   // pushed first so the plugin order is the same either way
   // its only products - the /.packages tree and the importmap aliases - are consumed by the
   // dev server, so a build that will not be served can skip the walk entirely
@@ -34,7 +35,9 @@ export function makeBabelUserDevConfig(projectDir, absCodeDir, absSourceDir, abs
     projectAbsStyleImportDir: absStyleImportBase,
     classNameFormat: '[folder]-[name]_[local]',
     cssOutputFile: join(buildLocation, componentCssFolder, componentCssFile),
-    watch: watchStyles
+    watch: watchStyles,
+    cacheDir: stylesCacheLocation,
+    freshCache: fresh
   }));
   if (hmr) userDevConfig.plugins.push(
   // Dev-only: keeps every relative import's browser-cached URL in sync with the

package/dist/build/makeBabelUserProdConfig.d.ts

@@ -1,3 +1,3 @@
 import type { TransformOptions } from '@babel/core';
-export declare function makeBabelUserProdConfig(projectDir: string, absCodeDir: string, absSourceDir: string, absStyleImportBase: string, watchStyles?: boolean): TransformOptions;
+export declare function makeBabelUserProdConfig(projectDir: string, absCodeDir: string, absSourceDir: string, typescript: boolean, absStyleImportBase: string, watchStyles?: boolean): TransformOptions;
 //# sourceMappingURL=makeBabelUserProdConfig.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"makeBabelUserProdConfig.d.ts","sourceRoot":"","sources":["../../src/build/makeBabelUserProdConfig.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAMnD,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM,EAC1B,WAAW,UAAO,GACnB,gBAAgB,CAgBlB"}
+{"version":3,"file":"makeBabelUserProdConfig.d.ts","sourceRoot":"","sources":["../../src/build/makeBabelUserProdConfig.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAMnD,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,OAAO,EACnB,kBAAkB,EAAE,MAAM,EAC1B,WAAW,UAAO,GACnB,gBAAgB,CAqBlB"}

package/dist/build/makeBabelUserProdConfig.js

@@ -1,12 +1,17 @@
 // may retire this
 import { objectCopy } from 'sxy-lib-object-copy';
 import { join } from 'path';
-import { MakeBabelTransformComponentStyles } from "../babelPlugins/BabelTransformComponentStyles.js";
-import { prodBuildFolder, componentCssFolder, componentCssFile } from "../settings.js";
-import userCommonConfig from "./babel.user.common.config.js";
-import { MakeBabelTransformCssImports } from "../babelPlugins/BabelTransformCssImports.js";
-export function makeBabelUserProdConfig(projectDir, absCodeDir, absSourceDir, absStyleImportBase, watchStyles = true) {
+import { MakeBabelTransformComponentStyles } from '../babelPlugins/BabelTransformComponentStyles.js';
+import { prodBuildFolder, componentCssFolder, componentCssFile } from '../settings.js';
+import userCommonConfig, { typescriptPreset } from './babel.user.common.config.js';
+import { MakeBabelTransformCssImports } from '../babelPlugins/BabelTransformCssImports.js';
+export function makeBabelUserProdConfig(projectDir, absCodeDir, absSourceDir, typescript, absStyleImportBase, watchStyles = true) {
   const userProdConfig = objectCopy(userCommonConfig);
+  if (typescript) userProdConfig.presets.push(typescriptPreset()); // eslint-disable-line @typescript-eslint/no-non-null-assertion
+  // no syntax lowering here either: the bundle step (rollup.user.prod.config.ts) owns the browser floor.
+  // If stripping React `propTypes` from pre-19 React components in react-zones ever matters for
+  // bundle size, babel-plugin-transform-react-remove-prop-types goes here (it used to sit in an
+  // env.production block nothing switched on, uninstalled) - tungsten itself never reads propTypes
   userProdConfig.plugins.push(
   // eslint-disable-line @typescript-eslint/no-non-null-assertion
   MakeBabelTransformCssImports({

package/dist/build/rollup.user.prod.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollup.user.prod.config.d.ts","sourceRoot":"","sources":["../../src/build/rollup.user.prod.config.ts"],"names":[],"mappings":"AAcA,KAAK,YAAY,GAAG;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACrB,CAAA;AAeD,QAAA,MAAM,YAAY,EAAE,YAoBnB,CAAA;AAED,eAAe,YAAY,CAAA"}
+{"version":3,"file":"rollup.user.prod.config.d.ts","sourceRoot":"","sources":["../../src/build/rollup.user.prod.config.ts"],"names":[],"mappings":"AAaA,KAAK,YAAY,GAAG;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACrB,CAAA;AAmBD,QAAA,MAAM,YAAY,EAAE,YAmBnB,CAAA;AAED,eAAe,YAAY,CAAA"}

package/dist/build/rollup.user.prod.config.js

@@ -4,31 +4,34 @@ import { babel } from "@rollup/plugin-babel";
 import terser from "@rollup/plugin-terser";
 //import gzip from "rollup-plugin-gzip"
 import jsonModule from "@rollup/plugin-json";
-import { MakeBabelTransformRemoveServerBlocks } from "../babelPlugins/BabelTransformRemoveServerBlocks.js";
-import { MakeBabelTransformRemoveDevBlocks } from "../babelPlugins/BabelTransformRemoveDevBlocks.js";
+import { bundleBabelOptions } from "./bundleBabelOptions.js";
 import { rollupExtractComponentStylesheets } from "./rollupExtractComponentStylesheets.js";
 const json = typeof jsonModule === "function" ? jsonModule : jsonModule.default;
 function replaceProductionNodeEnv() {
   return {
-    name: 'tungsten-production-node-env',
+    name: "tungsten-production-node-env",
     transform(code) {
-      if (!code.includes('process.env.NODE_ENV')) return null;
+      if (!code.includes("process.env.NODE_ENV")) return null;
       return {
-        code: code.replaceAll('process.env.NODE_ENV', JSON.stringify('production')),
+        code: code.replaceAll("process.env.NODE_ENV", JSON.stringify("production")),
         map: null
       };
     }
   };
 }
+// the app config's `targets`, handed over by bundle.ts; unset means the framework default
+const targetsEnv = process.env.TUNGSTEN_TARGETS;
+const targets = targetsEnv === undefined ? undefined : JSON.parse(targetsEnv);
 const rollupConfig = {
   plugins: [json(), nodeResolve(), commonjs(),
   // must be before babel
   replaceProductionNodeEnv(),
-  // before babel, which excludes node_modules and so never sees framework components
-  rollupExtractComponentStylesheets(), babel({
-    babelHelpers: 'bundled',
-    exclude: '**/node_modules/**',
-    plugins: [MakeBabelTransformRemoveServerBlocks(), MakeBabelTransformRemoveDevBlocks()]
+  // before babel, so it sees component stylesheets as written
+  rollupExtractComponentStylesheets(),
+  // no node_modules exclude: the floor applies to the framework and packages in the bundle too
+  babel({
+    babelHelpers: "bundled",
+    ...bundleBabelOptions(targets)
   }),
   // must be after commonjs
   terser({
@@ -37,6 +40,5 @@ const rollupConfig = {
   })
   ////gzip(),
   ]
-  //strictDeprecations: true // help prep for upgrade to rollup 3 -- this complains about the inlineDynamicImports CLI arg
 };
 export default rollupConfig;

package/dist/build/rollupExtractComponentStylesheets.js

@@ -1,6 +1,6 @@
 import { dirname } from 'path';
-import { recordFrameworkStylesheet, writeFrameworkCss } from "./frameworkStylesheets.js";
-import { getPackageDirForFile } from "./getPackageDirForFile.js";
+import { recordFrameworkStylesheet, writeFrameworkCss } from './frameworkStylesheets.js';
+import { getPackageDirForFile } from './getPackageDirForFile.js';
 // `static $stylesheet = "i/….css"` as emitted by BabelTransformComponentStyles.
 const markerPattern = /static\s+\$stylesheet\s*=\s*(["'])([^"']+)\1\s*;?/g;
 // Prod bundles rather than walking packages, so the package-walk extraction never runs. This is
@@ -22,7 +22,7 @@ export function rollupExtractComponentStylesheets() {
       return found ? {
         code: stripped,
         map: null
-      } : null;
+      } : null; // eslint-disable-line @typescript-eslint/no-unnecessary-condition -- set inside the replace callback, which narrowing cannot see
     },
     // The bundle is written to <build>/.bundle/<file>, so the build root is two up.
     async writeBundle(outputOptions) {