tungsten 0.1.59 → 0.1.61

package/dist/bin/commands/static.js

@@ -1,6 +1,6 @@
 import open from 'open';
-import { getAppConfig } from 'tungsten/getAppConfig.js';
+import { getUserConfig } from "../../getUserConfig.js";
 import { StaticSiteServer } from "../../Servers/StaticSiteServer.js";
-const staticServer = new StaticSiteServer(await getAppConfig());
+const staticServer = new StaticSiteServer(await getUserConfig());
 const staticServerLocation = await staticServer.start();
 open(staticServerLocation);

package/dist/bin/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bin/index.ts"],"names":[],"mappings":"AA0CA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bin/index.ts"],"names":[],"mappings":"AA8CA,OAAO,EAAE,CAAA"}

package/dist/bin/index.js

@@ -34,6 +34,11 @@ switch (command) {
       await import("./commands/clean.js");
       break;
     }
+  case 'compile-simple-package':
+    {
+      await import("./commands/compileSimplePackage.js");
+      break;
+    }
   default:
     {
       if (!command) {

package/dist/browserStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browserStorage.d.ts","sourceRoot":"","sources":["../src/browserStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAgBhD,qBAAa,oBAAoB,CAAC,YAAY,SAAS,MAAM;;IAEzD,GAAG,GAAI,CAAC,SAAS,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,KAAG,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAIjF;IACD,GAAG,GAAI,CAAC,SAAS,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,UAG3E;IACD,KAAK,aAKJ;IACD,GAAG,UAAW,MAAM,mBAA4B;IAChD,IAAI,MAAM,WAAiC;IAC3C,MAAM,GAAI,CAAC,SAAS,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,UAGtD;IACD,SAAS,GAAI,CAAC,SAAS,MAAM,YAAY,GAAG,MAAM,WAAW,YAAY,OAAO,CAAC,UAGhF;IACD,IAAI,GAAI,CAAC,SAAS,MAAM,YAAY,GAAG,MAAM,WAAW,YAAY,OAAO,CAAC,iCAI3E;CAeJ;AACD,wBAAgB,gBAAgB,CAAC,YAAY,SAAS,MAAM,KAAK,oBAAoB,CAAC,YAAY,CAAC,CAGlG;AAGD,qBAAa,sBAAsB,CAAC,cAAc,SAAS,MAAM;;IAE7D,GAAG,GAAI,CAAC,SAAS,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,KAAG,cAAc,CAAC,CAAC,CAAC,GAAG,SAAS,CAIrF;IACD,GAAG,GAAI,CAAC,SAAS,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,SAAS,cAAc,CAAC,CAAC,CAAC,UAG/E;IACD,KAAK,aAKJ;IACD,GAAG,UAAW,MAAM,mBAA8B;IAClD,IAAI,MAAM,WAAmC;IAC7C,MAAM,GAAI,CAAC,SAAS,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,UAGxD;IACD,SAAS,GAAI,CAAC,SAAS,MAAM,cAAc,GAAG,MAAM,WAAW,YAAY,OAAO,CAAC,UAGlF;IACD,IAAI,GAAI,CAAC,SAAS,MAAM,cAAc,GAAG,MAAM,WAAW,YAAY,OAAO,CAAC,mCAI7E;CAeJ;AACD,wBAAgB,kBAAkB,CAAC,cAAc,SAAS,MAAM,KAAK,sBAAsB,CAAC,cAAc,CAAC,CAG1G"}
+{"version":3,"file":"browserStorage.d.ts","sourceRoot":"","sources":["../src/browserStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAgBhD,qBAAa,oBAAoB,CAAC,YAAY,SAAS,MAAM;;IAEzD,GAAG,GAAI,CAAC,SAAS,MAAM,YAAY,GAAG,MAAM,EAAE,KAAK,CAAC,KAAG,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAIjF;IACD,GAAG,GAAI,CAAC,SAAS,MAAM,YAAY,GAAG,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,YAAY,CAAC,CAAC,CAAC,UAG3E;IACD,KAAK,aAKJ;IACD,GAAG,GAAI,OAAO,MAAM,mBAA4B;IAChD,IAAI,MAAM,WAAiC;IAC3C,MAAM,GAAI,CAAC,SAAS,MAAM,YAAY,GAAG,MAAM,EAAE,KAAK,CAAC,UAGtD;IACD,SAAS,GAAI,CAAC,SAAS,MAAM,YAAY,GAAG,MAAM,EAAE,SAAS,YAAY,EAAE,KAAK,CAAC,UAGhF;IACD,IAAI,GAAI,CAAC,SAAS,MAAM,YAAY,GAAG,MAAM,EAAE,SAAS,YAAY,EAAE,KAAK,CAAC,iCAI3E;CAeJ;AACD,wBAAgB,gBAAgB,CAAC,YAAY,SAAS,MAAM,KAAK,oBAAoB,CAAC,YAAY,CAAC,CAGlG;AAGD,qBAAa,sBAAsB,CAAC,cAAc,SAAS,MAAM;;IAE7D,GAAG,GAAI,CAAC,SAAS,MAAM,cAAc,GAAG,MAAM,EAAE,KAAK,CAAC,KAAG,cAAc,CAAC,CAAC,CAAC,GAAG,SAAS,CAIrF;IACD,GAAG,GAAI,CAAC,SAAS,MAAM,cAAc,GAAG,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,cAAc,CAAC,CAAC,CAAC,UAG/E;IACD,KAAK,aAKJ;IACD,GAAG,GAAI,OAAO,MAAM,mBAA8B;IAClD,IAAI,MAAM,WAAmC;IAC7C,MAAM,GAAI,CAAC,SAAS,MAAM,cAAc,GAAG,MAAM,EAAE,KAAK,CAAC,UAGxD;IACD,SAAS,GAAI,CAAC,SAAS,MAAM,cAAc,GAAG,MAAM,EAAE,SAAS,YAAY,EAAE,KAAK,CAAC,UAGlF;IACD,IAAI,GAAI,CAAC,SAAS,MAAM,cAAc,GAAG,MAAM,EAAE,SAAS,YAAY,EAAE,KAAK,CAAC,mCAI7E;CAeJ;AACD,wBAAgB,kBAAkB,CAAC,cAAc,SAAS,MAAM,KAAK,sBAAsB,CAAC,cAAc,CAAC,CAG1G"}

package/dist/build/babel.user.common.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"babel.user.common.config.d.ts","sourceRoot":"","sources":["../../src/build/babel.user.common.config.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AA+BnD,QAAA,MAAM,gBAAgB,EAAE,gBAgEvB,CAAA;AAED,eAAe,gBAAgB,CAAA"}
+{"version":3,"file":"babel.user.common.config.d.ts","sourceRoot":"","sources":["../../src/build/babel.user.common.config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAcnD,QAAA,MAAM,gBAAgB,EAAE,gBA2BvB,CAAA;AAED,eAAe,gBAAgB,CAAA"}

package/dist/build/babel.user.common.config.js

@@ -1,29 +1,11 @@
-// may retire this
 import { MakeBabelTransformJsxExtensionsToJs } from "../babelPlugins/BabelTransformJsxExtensionsToJs.js";
-//import { MakeBabelTransformDependencyImports } from "../babelPlugins/BabelTransformDependencyImportsOld.js"
-//const aliases = require('../tools/processAliases.cjs')
-//import { MakeBabelTransformRemoveBlocks } from "../babelPlugins/BabelTransformRemoveBlocks.js"
 import { buildFolder } from "../settings.js";
 import babelPresetReactModule from "@babel/preset-react";
 const babelPresetReact = babelPresetReactModule.default;
 import babelPluginSxyModuleResolve from "babel-plugin-sxy-module-resolver";
-import babelPluginCassToJs from "babel-plugin-css-to-js";
+import babelPluginCssToJs from "babel-plugin-css-to-js";
 import babelPluginProposalClassPropertiesModule from "@babel/plugin-transform-class-properties";
 const babelPluginProposalClassProperties = babelPluginProposalClassPropertiesModule.default;
-// function requireEnv(envName: string): string {
-//     if (process.env[envName] === undefined) throw new Error(` ${packageNameCapitalized} error: ${envName} environment variable is not set.`)
-//     return process.env[envName] || ""
-// }
-// if (process.env.PROJECT_DIR === undefined) throw new Error(` ${packageNameCapitalized} error: PROJECT_DIR environment variable is not set.`)
-// export const PROJECT_DIR = process.env.PROJECT_DIR || ""
-// if (process.env.CODE_DIR === undefined) throw new Error(` ${packageNameCapitalized} error: CODE_DIR environment variable is not set.`)
-// export const CODE_DIR = process.env.CODE_DIR || ""
-// if (process.env.MODE === undefined) throw new Error(` ${packageNameCapitalized} error: MODE environment variable is not set.`)
-// export const MODE = process.env.MODE || ""
-// export const PROJECT_DIR = requireEnv("PROJECT_DIR")
-// export const CODE_DIR = requireEnv("CODE_DIR")
-// export const ABS_CODE_BASE: string = join(PROJECT_DIR, CODE_DIR)
-// export const MODE = requireEnv("MODE")
 const regexEscape = r => r.replaceAll(".", "\\.");
 const ignoreRegex = new RegExp(`(node_modules|${regexEscape(buildFolder)})`);
 const userCommonConfig = {
@@ -41,43 +23,7 @@ const userCommonConfig = {
     "alias": {
       "tungsten/jsx-runtime": "tungsten/jsxRuntime.js" // fix the import location created by @babel/preset-react
     }
-  }],
-  //     ["babel-plugin-sxy-module-resolver", {
-  //         "alias": {
-  //             "tungsten/jsx-runtime": "tungsten/jsxRuntime.js" // fix the import location created by @babel/preset-react
-  //         }
-  //     }],
-  // transforms: import stlyes from './style.css'
-  // to: const styles = 'path/to.style.css'
-  // so that path can then be passed to a <Stylesheet> component.
-  // compileStyles function in the build process copies the css file
-  // to the build dir
-  //MakeBabelTransformCssImport(),
-  MakeBabelTransformJsxExtensionsToJs(),
-  // MakeBabelTransformComponentStyles({
-  //     projectCodeBase: ABS_CODE_BASE,
-  //     classNameFormat: "[folder]-[name]_[local]",
-  //     cssOutputFile: join(PROJECT_DIR, devBuildFolder, componentCssFolder, componentCssFile), // should only need to pass one
-  //     //cssModulesOutputDir: join(PROJECT_DIR, devBuildFolder, componentCssFolder, 'individual'), // of these. fix up code later
-  //     // seems 'individual' is ignored,
-  //     // and only the folder is used
-  // }),
-  //MakeBabelTransformBindDirect(),
-  //MakeBabelTransformBindVar(),
-  // EXPR!!//MakeBabelTransformDeproxyState(),
-  //MakeBabelTransformSxyFrameworkImports(),
-  //TransformBind(),
-  //TransformCssProp(),
-  [babelPluginCassToJs],
-  //["babel-plugin-css-to-js"],
-  //["@babel/plugin-proposal-decorators", {
-  //    legacy: true
-  //}],
-  [babelPluginProposalClassProperties]
-  //["@babel/plugin-proposal-class-properties"],
-  // removeBlocks isServer ?
-  // MakeBabelTransformRemoveBlocks({ names: ['isServer'] })
-  ],
+  }], MakeBabelTransformJsxExtensionsToJs(), [babelPluginCssToJs], [babelPluginProposalClassProperties]],
   "env": {
     "production": {
       "plugins": ["transform-react-remove-prop-types"]

package/dist/build/bundle.d.ts

@@ -1,3 +1,2 @@
-import type { FrameworkConfigComplete } from '../FrameworkConfig.js';
-export declare function bundle(projectDir: string, appConfig: FrameworkConfigComplete): Promise<unknown>;
+export declare function bundle(projectDir: string): Promise<unknown>;
 //# sourceMappingURL=bundle.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/build/bundle.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAQpE,wBAAsB,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB,oBAsClF"}
+{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/build/bundle.ts"],"names":[],"mappings":"AAUA,wBAAsB,MAAM,CAAC,UAAU,EAAE,MAAM,oBAyC9C"}

package/dist/build/bundle.js

@@ -1,17 +1,20 @@
 import { join } from 'path';
+//import type { FrameworkConfigComplete } from '../FrameworkConfig.js'
 import { findProjectDir } from "../findProjectDir.js";
 import { spawnShellCommand } from "../spawnShellCommand.js";
 import { prodBuildFolder, bundleFolder, frameworkDistFolder, clientFolder } from "../settings.js";
 import { errorOut } from "../output.js";
 import { cliLog, cliOut } from "../cliOutput.js";
-export async function bundle(projectDir, appConfig) {
+export async function bundle(projectDir /*, appConfig: FrameworkConfigComplete*/) {
   return new Promise((resolve, reject) => {
     cliOut('Bundling application');
     const frameworkDir = findProjectDir(import.meta.url);
-    let rootComponent = appConfig.rootComponent;
-    if (rootComponent.endsWith('.jsx')) rootComponent = rootComponent.slice(0, -1);
+    // if (appConfig.useRootComponent) {
+    //     let rootComponent = appConfig.rootComponent as string
+    //    if (rootComponent.endsWith('.jsx')) rootComponent = rootComponent.slice(0, -1)
+    // }
     const externalModules = ['node-fetch'];
-    const command = `cd ${frameworkDir} && npx rollup --input "${join(projectDir, prodBuildFolder, clientFolder, 'client.js')}"` + ` --file "${join(projectDir, bundleFolder, 'client.js')}"` + ` --config "${join(frameworkDir, frameworkDistFolder, 'build/rollup.user.prod.config.js')}"` + (externalModules.length > 0 ? ` --external ${externalModules.join(',')}` : ``) + ` --inlineDynamicImports --format iife`;
+    const command = `cd ${frameworkDir} && npx rollup` + ` --input "${join(projectDir, prodBuildFolder, clientFolder, 'client.js')}"` + ` --file "${join(projectDir, bundleFolder, 'client.js')}"` + ` --config "${join(frameworkDir, frameworkDistFolder, 'build/rollup.user.prod.config.js')}"` + (externalModules.length > 0 ? ` --external ${externalModules.join(',')}` : ``) + ` --inlineDynamicImports --format iife`;
     cliLog('bundle command:', command);
     const subProcess = spawnShellCommand(command, {
       cwd: frameworkDir /*cwd: projectDir*/ /*, stdio: 'inherit'*/

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

@@ -1 +1 @@
-{"version":3,"file":"compileJavascript.d.ts","sourceRoot":"","sources":["../../src/build/compileJavascript.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAM/B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAiBtC,KAAK,uBAAuB,GAAG;IAC3B,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAA;IAC3B,WAAW,EAAE,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAA;IACtC,aAAa,EAAE,aAAa,CAAA;CAC/B,CAAA;AAKD,wBAAsB,iBAAiB,CACnC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB,EACtD,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EACrE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAClC,OAAO,CAAC,uBAAuB,CAAC,CAkMlC"}
+{"version":3,"file":"compileJavascript.d.ts","sourceRoot":"","sources":["../../src/build/compileJavascript.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAO/B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAetC,KAAK,uBAAuB,GAAG;IAC3B,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAA;IAC3B,WAAW,EAAE,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAA;IACtC,aAAa,EAAE,aAAa,CAAA;CAC/B,CAAA;AAKD,wBAAsB,iBAAiB,CACnC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB,EACtD,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EACrE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAClC,OAAO,CAAC,uBAAuB,CAAC,CAyNlC"}

package/dist/build/compileJavascript.js

@@ -4,12 +4,11 @@ import { transformFileAsync as babeltransformFileAsync } from '@babel/core';
 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 babelUserDevConfig from './babel.user.dev.config.js'
-//import babelUserProdConfig from './babel.user.dev.config.js'
 import { makeBabelUserDevConfig } from "./makeBabelUserDevConfig.js";
 import { makeBabelUserProdConfig } from "./makeBabelUserProdConfig.js";
-import { cliOut, cliError } from "../cliOutput.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { cliOut, cliLog, cliError } from "../cliOutput.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
 import { TungstenError } from "../TungstenError.js";
 import { getFrameworkDir } from "../getFrameworkDir.js";
 ///// needs work to work in prod mode
@@ -39,6 +38,7 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
   const codeLocationLength = codeLocation.length + 1;
   const transformPromises = [];
   async function transformFile(file) {
+    console.log('transforming file', file);
     try {
       let rel = file.slice(codeLocationLength);
       if (rel.endsWith('.jsx')) rel = rel.slice(0, -1);
@@ -48,7 +48,9 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
       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}`);
+      if (code === null || code === undefined) {
+        throw new TungstenError(`Err: code from babel transform on file ${file} was null or undefined: ${typeof code}`);
+      }
       await fsPromises.mkdir(dirname(dest), {
         recursive: true
       });
@@ -56,8 +58,8 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
       //await fsPromises.writeFile(dest, code)
       fs.writeFileSync(dest, code);
     } catch (e) {
-      cliError(`Error transforming file ${file}`);
-      cliError(e);
+      cliError(`Tungsten: Error transforming project file ${file}`);
+      cliLog(e);
       //throw new TungstenError(`compileJavascript() error: error when compiling application file ${e}`)
     }
   }
@@ -72,7 +74,7 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
       //// Using the sync version here, because the promise version keeps bugging out - node bug?
       await fsPromises.copyFile(file, dest);
     } catch (e) {
-      cliError(`Error transforming file ${file}`);
+      cliError(`Tungsten: Error copying file ${file}`);
       cliError(e);
       //throw new TungstenError(`compileJavascript() error: error when compiling application file ${e}`)
     }
@@ -84,7 +86,7 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
       const dest = join(buildLocation, rel);
       await fsPromises.unlink(dest);
     } catch (e) {
-      cliError(`Error transforming file ${file}`);
+      cliError(`Tungsten: Error deleting file ${file}`);
       cliError(e);
       //throw new TungstenError(`compileJavascript() error: error when compiling application file ${e}`)
     }
@@ -92,7 +94,9 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
   // get a list of files
   const watchGlob = slash(`${codeLocation}/**/*.js{,x}`);
   const ignored = [];
-  if (appConfig.ignoreDirs) ignored.push(...appConfig.ignoreDirs.map(folder => slash(`${codeLocation}/${folder}/**`)));
+  if (appConfig.ignoreDirs) {
+    ignored.push(...appConfig.ignoreDirs.map(folder => slash(`${codeLocation}/${folder}/**`)));
+  }
   if (appConfig.ignorePatterns) {
     if (Array.isArray(appConfig.ignorePatterns)) {
       for (const pattern of appConfig.ignorePatterns) {
@@ -105,6 +109,14 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
   if (appConfig.exclude !== undefined) ignored.push(slash(`${codeLocation}/${appConfig.exclude}`));
   //console.log('appConfig', appConfig)
   //console.log('ignored', ignored)
+  /// need to do an initial build before watching
+  //console.log('glob for', watchGlob)
+  const paths = await globby(watchGlob);
+  //console.log(paths)
+  paths.forEach(file => {
+    transformPromises.push(transformFile(file));
+  });
+  await Promise.all(transformPromises);
   const watcher = chokidar.watch(watchGlob, {
     ignored
     //useFsEvents: false
@@ -112,10 +124,10 @@ export async function compileJavascript(projectDir, appConfig, codeLocation, sou
   watcher.on('all', async (event, file) => {
     file = slash(file);
     if (event === 'add') {
-      transformPromises.push(transformFile(file));
+      transformFile(file);
     }
     if (event === 'change') {
-      transformPromises.push(transformFile(file));
+      transformFile(file);
     }
   });
   let copyWatcher = null;

package/dist/build/compilePackages.d.ts

@@ -1,7 +1,2 @@
-import type { ProcessPackageResults } from './ProcessPackageResults.js';
-type CompilePackagesResult = {
-    packages: ProcessPackageResults;
-};
-export declare function compilePackages(/*projectDir, config, codeLocation, */ projectDir: string, buildLocation: string): Promise<CompilePackagesResult>;
 export {};
 //# sourceMappingURL=compilePackages.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"compilePackages.d.ts","sourceRoot":"","sources":["../../src/build/compilePackages.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAQvE,KAAK,qBAAqB,GAAG;IACzB,QAAQ,EAAE,qBAAqB,CAAA;CAClC,CAAA;AAID,wBAAgB,eAAe,CAAC,sCAAsC,CAAA,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAwF/I"}
+{"version":3,"file":"compilePackages.d.ts","sourceRoot":"","sources":["../../src/build/compilePackages.ts"],"names":[],"mappings":""}

package/dist/build/compilePackages.js

@@ -1,82 +1,89 @@
-import dependencyTree from 'sxy-dependency-tree';
-import { globby } from 'globby';
-import slash from 'slash';
-import { existsSync, promises as fsPromises } from 'fs';
-import { join } from 'path';
-import { createRequire } from 'module';
-import { processPackage } from "./processPackage.js";
-import { packagesCacheFolder, packagesCacheInfoName, assetsFolder, componentCssFolder, packagesFolder, staticFolder } from "../settings.js";
-import { cliError } from "../cliOutput.js";
-const require = createRequire(import.meta.url);
-//// UNUSED
-export function compilePackages(/*projectDir, config, codeLocation, */projectDir, buildLocation) {
-  return new Promise((resolve, reject) => {
-    // should we clear out the packages folders, to remove any packages that are no longer used?
-    //or should we check at the end, removing any excess?
-    projectDir = slash(projectDir); // convert backslashes on windows to forward slashes
-    // create a .packages folder if it doesn't already exist??
-    const packagesLocation = `${buildLocation}/${packagesFolder}`;
-    if (!existsSync(packagesLocation)) fsPromises.mkdir(packagesLocation);
-    // get info about the packages cache
-    const packagesCacheInfoLocation = join(projectDir, packagesCacheFolder, packagesCacheInfoName);
-    let packagesCacheInfo;
-    try {
-      packagesCacheInfo = require(packagesCacheInfoLocation);
-    } catch (e) {
-      cliError('error loading package cache info', e);
-      packagesCacheInfo = {};
-    }
-    buildLocation = slash(buildLocation); // convert backslashes on windows to forward slashes
-    const glob = [`${buildLocation}/**/*.js`, `!${buildLocation}/${assetsFolder}/**/*`,
-    // these folders are already ignored unless dot is set to true
-    `!${buildLocation}/${componentCssFolder}/**/*`,
-    //
-    `!${buildLocation}/${packagesFolder}/**/*`,
-    //
-    `!${buildLocation}/${staticFolder}/**/*` //
-    ];
-    //console.log('searching in ', glob)
-    globby(glob, {
-      dot: true
-    }).then(async matches => {
-      const projectNodeModulesLocation = `${projectDir}/node_modules/`;
-      const projectNodeModulesLocationLength = projectNodeModulesLocation.length;
-      const packageDependencies = [];
-      for (const file of matches) {
-        const nonExistent = [];
-        const dependencies = dependencyTree.toList({
-          filename: file,
-          directory: projectDir,
-          nonExistent
-        });
-        for (let dependency of dependencies) {
-          dependency = slash(dependency); // convert backslashes on windows to forward slashes
-          if (dependency.startsWith(projectNodeModulesLocation)) {
-            if (!packageDependencies.includes(dependency)) {
-              packageDependencies.push(dependency);
-            }
-          }
-        }
-      }
-      const packages = [];
-      for (const pDependency of packageDependencies) {
-        const endPart = pDependency.slice(projectNodeModulesLocationLength);
-        const packageName = endPart.split('/')[0];
-        if (packageName === 'tungsten') continue;
-        if (!packages.includes(packageName)) {
-          packages.push(packageName);
-        }
-      }
-      const results = [];
-      for (const p of packages) {
-        results.push(await processPackage(projectDir, packagesCacheInfo, p, buildLocation));
-      }
-      const packagesLocation = `${buildLocation}/${packagesFolder}`;
-      fsPromises.writeFile(join(packagesLocation, '.sxy-packages-stats'), JSON.stringify(results));
-      fsPromises.writeFile(packagesCacheInfoLocation, JSON.stringify(packagesCacheInfo));
-      resolve({
-        packages: results
-      });
-    });
-  });
-}
+// import dependencyTree from 'sxy-dependency-tree'
+// import { globby } from 'globby'
+// import slash from 'slash'
+// import { existsSync, promises as fsPromises } from 'fs'
+// import { join } from 'path'
+// import { createRequire } from 'module'
+export {};
+// import type { ProcessPackageResults } from './ProcessPackageResults.js'
+// import type { PackagesCacheInfo } from './PackagesCacheInfo.js'
+// import { processPackage } from './processPackage.js'
+// import { 
+//     packagesCacheFolder, packagesCacheInfoName, assetsFolder, componentCssFolder, packagesFolder, staticFolder
+// } from '../settings.js'
+// import { cliError } from '../cliOutput.js'
+// const require = createRequire(import.meta.url)
+// type CompilePackagesResult = {
+//     packages: ProcessPackageResults
+// }
+// //// UNUSED
+// export function compilePackages(projectDir: string, buildLocation: string): Promise<CompilePackagesResult> {
+//     return new Promise( (resolve, reject) => {
+//         console.log('start compiling packages')
+//         // should we clear out the packages folders, to remove any packages that are no longer used?
+//         //or should we check at the end, removing any excess?
+//         projectDir = slash(projectDir) // convert backslashes on windows to forward slashes
+//         // create a .packages folder if it doesn't already exist??
+//         const packagesLocation = `${buildLocation}/${packagesFolder}`
+//         if ( ! existsSync(packagesLocation) ) fsPromises.mkdir(packagesLocation)
+//         // get info about the packages cache
+//         const packagesCacheInfoLocation = join(projectDir, packagesCacheFolder, packagesCacheInfoName)
+//         let packagesCacheInfo: PackagesCacheInfo
+//         try {
+//             packagesCacheInfo = require(packagesCacheInfoLocation)
+//         } catch (e) {
+//             cliError('error loading package cache info', e)
+//             packagesCacheInfo = {}
+//         }
+//         buildLocation = slash(buildLocation) // convert backslashes on windows to forward slashes
+//         const glob = [
+//             `${buildLocation}/**/*.js`,
+//             `!${buildLocation}/${assetsFolder}/**/*`, // these folders are already ignored unless dot is set to true
+//             `!${buildLocation}/${componentCssFolder}/**/*`, //
+//             `!${buildLocation}/${packagesFolder}/**/*`, //
+//             `!${buildLocation}/${staticFolder}/**/*` //
+//         ]
+//         //console.log('searching in ', glob)
+//         globby(glob, { dot: true }).then( async (matches) => {
+//             const projectNodeModulesLocation = `${projectDir}/node_modules/`
+//             const projectNodeModulesLocationLength = projectNodeModulesLocation.length
+//             const packageDependencies: string[] = []
+//             for ( const file of matches ) {
+//                 const nonExistent: string[] = []
+//                 const dependencies = dependencyTree.toList({
+//                     filename: file,
+//                     directory: projectDir,
+//                     nonExistent,
+//                 })
+//                 for ( let dependency of dependencies ) {
+//                     dependency = slash(dependency) // convert backslashes on windows to forward slashes
+//                     if (dependency.startsWith(projectNodeModulesLocation)) {
+//                         if ( ! packageDependencies.includes(dependency) ) {
+//                             packageDependencies.push(dependency)
+//                         }
+//                     }
+//                 }
+//             }
+//             const packages: string[] = []
+//             for ( const pDependency of packageDependencies) {
+//                 const endPart = pDependency.slice(projectNodeModulesLocationLength)
+//                 const packageName = endPart.split('/')[0]!
+//                 if (packageName === 'tungsten') continue
+//                 if ( ! packages.includes(packageName) ) {
+//                     packages.push(packageName)
+//                 }
+//             }
+//             const results: ProcessPackageResults = []
+//             for (const p of packages) {
+//                 results.push( await processPackage(projectDir, packagesCacheInfo, p, buildLocation) )
+//             }
+//             const packagesLocation = `${buildLocation}/${packagesFolder}`
+//             fsPromises.writeFile(join(packagesLocation, '.sxy-packages-stats'), JSON.stringify(results))
+//             fsPromises.writeFile(packagesCacheInfoLocation, JSON.stringify(packagesCacheInfo))
+//             console.log('finishing compiling packages')
+//             resolve( {
+//                 packages: results
+//             } )
+//         } )
+//     })
+// }

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;AAUtC,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,CAgCjI"}
+{"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;AAUtC,wBAAsB,cAAc,CAChC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,GACnE,OAAO,CAAC,eAAe,CAAC,CAiC1B"}

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

@@ -1 +1 @@
-{"version":3,"file":"copyPackageModulesToPackagesFolder.d.ts","sourceRoot":"","sources":["../../src/build/copyPackageModulesToPackagesFolder.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAItC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAKrC,wBAAsB,kCAAkC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,kBAkBrF"}
+{"version":3,"file":"copyPackageModulesToPackagesFolder.d.ts","sourceRoot":"","sources":["../../src/build/copyPackageModulesToPackagesFolder.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAItC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAQrC,wBAAsB,kCAAkC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,kBAkBrF"}

package/dist/build/copyPackageModulesToPackagesFolder.js

@@ -5,9 +5,11 @@ import { findProjectDir } from "../findProjectDir.js";
 import { devBuildFolder, 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!
 export async function copyPackageModulesToPackagesFolder(modules, mode) {
-  //console.log(chalk.red`modules to copy to packages`, modules)
+  cliWarn(`modules to copy to packages`, modules);
   const promises = [];
   for (const module of modules) {
     const target = join(process.cwd(), mode === 'dev' ? devBuildFolder : prodBuildFolder, packagesFolder, 'tungsten',

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

@@ -1 +1 @@
-{"version":3,"file":"createClientFiles.d.ts","sourceRoot":"","sources":["../../src/build/createClientFiles.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAItC,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAG/D,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,iBAqFlF"}
+{"version":3,"file":"createClientFiles.d.ts","sourceRoot":"","sources":["../../src/build/createClientFiles.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAItC,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAG/D,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,iBA6ElF"}

package/dist/build/createClientFiles.js

@@ -4,66 +4,57 @@ import { devBuildFolder, prodBuildFolder, clientFolder, frameworkDistFolder, fra
 import { fixExtension } from "../fixExtension.js";
 import { findProjectDir } from "../findProjectDir.js";
 export async function createClientFiles(config, mode) {
-  // change .jsx to .js if needed
-  //if (rootComponentRelFilePath.endsWith('.jsx')) rootComponentRelFilePath = rootComponentRelFilePath.slice(0, -1)
   //console.log('creating entry file')
   const specificBuildFolder = mode === 'dev' ? devBuildFolder : prodBuildFolder;
-  // I don't think this file is being used
-  // await fsPromises.writeFile(
-  //     join(process.cwd(), specificBuildFolder, packagesFolder, packageName, frameworkDistFolder, 'client/entry.js'),
-  //     `export * from '../../../../${rootComponentRelFilePath}'`
-  // )
-  // await fsPromises.writeFile(
-  //     join(process.cwd(), specificBuildFolder, packagesFolder, packageName, frameworkDistFolder, 'client/rootComponent.js'),
-  //     `export const rootComponent = '${fixExtension(rootComponentRelFilePath)}'`
-  // )
-  // // await fsPromises.writeFile(
-  // //     join(process.cwd(), specificBuildFolder, packagesFolder, packageName, frameworkDistFolder, frameworkClientFolder, 'rootComponent.js'),
-  // //     `export * from '../../../../${fixExtension(rootComponentRelFilePath)}'`
-  // // )    
-  // // await fsPromises.writeFile(
-  // //     join(process.cwd(), specificBuildFolder, packagesFolder, packageName, frameworkDistFolder, frameworkClientFolder, 'rootComponentRelFilePath.js'),
-  // //     `export const rootComponentRelFilePath = '${fixExtension(rootComponentRelFilePath)}'`
-  // // )
   const frameworkDir = findProjectDir(import.meta.url);
+  const routesLocation = config.routesLocation;
+  //if (routesLocation !== null) {
+  const [routeFilePath, routesExportName] = routesLocation;
+  const promises = [
   // ensure the folder exists
-  await fsPromises.mkdir(join(process.cwd(), specificBuildFolder, `${clientFolder}`), {
+  fsPromises.mkdir(join(process.cwd(), specificBuildFolder, `${clientFolder}`), {
     recursive: true
-  });
-  // // app config
-  // await fsPromises.writeFile(
-  //     join(process.cwd(), specificBuildFolder, '.tungsten.config.js'), // to
-  //     `export default { clientSideNav: ${config.clientSideNav.toString()},  };` // content
-  // )   
+  }),
   // client.js file
-  await fsPromises.copyFile(join(frameworkDir, frameworkDistFolder, frameworkClientFolder, 'client.js'),
+  fsPromises.copyFile(join(frameworkDir, frameworkDistFolder, frameworkClientFolder, 'client.js'),
   // from
-  join(process.cwd(), specificBuildFolder, `${clientFolder}/client.js`));
+  join(process.cwd(), specificBuildFolder, `${clientFolder}/client.js`)),
   // cjsHelpers.js file
-  await fsPromises.copyFile(join(frameworkDir, frameworkDistFolder, frameworkClientFolder, 'cjsHelpers.js'),
+  fsPromises.copyFile(join(frameworkDir, frameworkDistFolder, frameworkClientFolder, 'cjsHelpers.js'),
   // from
-  join(process.cwd(), specificBuildFolder, `${clientFolder}/cjsHelpers.js`));
-  const [routeFilePath, routesExportName] = config.routesLocation;
-  const rootComponentRelFilePath = config.rootComponent;
-  const rcFile = rootComponentRelFilePath.split('/').pop();
-  const possibleRootComponentExportName = rcFile.slice(0, rcFile.lastIndexOf('.'));
+  join(process.cwd(), specificBuildFolder, `${clientFolder}/cjsHelpers.js`)),
   // app routes stuff
-  const routesPromise = fsPromises.writeFile(join(process.cwd(), specificBuildFolder, clientFolder, 'routes.js'), `export { ${routesExportName} as routes } from '../${fixExtension(routeFilePath)}'`);
-  // rootComponent.js file - interface to the root component
-  const rootComponentPromise = fsPromises.writeFile(join(process.cwd(), specificBuildFolder, clientFolder, 'RootComponent.js'),
-  // to
-  //`import * as mod from '../${fixExtension(rootComponentRelFilePath)}'; export const RootComponent = ('default' in mod) ? mod['default'] : mod['${possibleRootComponentExportName}']` // content
-  `export * as module from '../${fixExtension(rootComponentRelFilePath)}'; export const filename = '${possibleRootComponentExportName}'`);
-  // // rootComponent.js file - interface to the root component
-  // const rootComponentPromise = fsPromises.writeFile(
-  //     join(process.cwd(), specificBuildFolder, clientFolder, 'RootComponent.js'), // to
-  //     `export * from '../${fixExtension(rootComponentRelFilePath)}'` // content
-  // )    
-  // // rootComponentRelFilePath.js file - provides the location of the root component,
-  // // not sure where this is used
-  // const rootComponentRelFilePathPromise = await fsPromises.writeFile(
-  //     join(process.cwd(), specificBuildFolder, clientFolder, 'rootComponentRelFilePath.js'), // to
-  //     `export const rootComponentRelFilePath = '${fixExtension(rootComponentRelFilePath)}'` // content
-  // )
-  await Promise.all([routesPromise, rootComponentPromise]);
+  fsPromises.writeFile(join(process.cwd(), specificBuildFolder, clientFolder, 'routes.js'), `export { ${routesExportName} as routes } from '../${fixExtension(routeFilePath)}'`)];
+  const clientRootComponentFileLocation = join(process.cwd(), specificBuildFolder, clientFolder, 'RootComponent.js');
+  if (config.useRootComponent) {
+    const rootComponentRelFilePath = config.rootComponent;
+    const rcFile = rootComponentRelFilePath.split('/').pop();
+    const possibleRootComponentExportName = rcFile.slice(0, rcFile.lastIndexOf('.'));
+    const rootComponentPromise = fsPromises.writeFile(clientRootComponentFileLocation,
+    // to
+    `export * as module from '../${fixExtension(rootComponentRelFilePath)}'; export const filename = '${possibleRootComponentExportName}'` // eslint-disable-line max-len
+    );
+    promises.push(rootComponentPromise);
+  } else {
+    const rootComponentPromise = fsPromises.writeFile(clientRootComponentFileLocation,
+    // to
+    `export default null` // eslint-disable-line max-len
+    );
+    promises.push(rootComponentPromise);
+  }
+  // if (config.useRootComponent) {
+  //     const rootComponentRelFilePath = config.rootComponent
+  //     const rcFile = rootComponentRelFilePath.split('/').pop() as string
+  //     const possibleRootComponentExportName = rcFile.slice(0, rcFile.lastIndexOf('.'))
+  //     // rootComponent.js file - interface to the root component
+  //     const rootComponentPromise = fsPromises.writeFile(
+  //         join(process.cwd(), specificBuildFolder, clientFolder, 'RootComponent.js'), // to
+  //         `export * as module from '../${fixExtension(rootComponentRelFilePath)}'; export const filename = '${possibleRootComponentExportName}'` // eslint-disable-line max-len
+  //     )    
+  //     await Promise.all([routesPromise, rootComponentPromise])
+  // } else {
+  //     // do we need to do anything here???
+  //     await routesPromise
+  // } 
+  await Promise.all(promises);
 }

package/dist/build/createInstanceConfigFile.d.ts

@@ -0,0 +1,4 @@
+import type { Mode } from '../Mode.js';
+import { FrameworkConfigComplete } from '../FrameworkConfig.js';
+export declare function createInstanceConfigFile(config: FrameworkConfigComplete, mode: Mode): Promise<void>;
+//# sourceMappingURL=createInstanceConfigFile.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"createInstanceConfigFile.d.ts","sourceRoot":"","sources":["../../src/build/createInstanceConfigFile.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAI/D,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,iBA2BzF"}