tungsten 0.2.22 → 0.2.23

package/dist/build/bundle.js

@@ -13,7 +13,9 @@ export async function bundle(projectDir /*, appConfig: FrameworkConfigComplete*/
     //     let rootComponent = appConfig.rootComponent as string
     //    if (rootComponent.endsWith('.jsx')) rootComponent = rootComponent.slice(0, -1)
     // }
-    const externalModules = ['node-fetch'];
+    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`;
     cliLog('bundle command:', command);
     const subProcess = spawnShellCommand(command, {

package/dist/build/clientModuleAliases.d.ts

@@ -1,4 +1,2 @@
-export declare const clientModulesAliases: {
-    redaxios: string;
-};
+export {};
 //# sourceMappingURL=clientModuleAliases.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"clientModuleAliases.d.ts","sourceRoot":"","sources":["../../src/build/clientModuleAliases.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB;;CAEhC,CAAA"}
+{"version":3,"file":"clientModuleAliases.d.ts","sourceRoot":"","sources":["../../src/build/clientModuleAliases.ts"],"names":[],"mappings":""}

package/dist/build/clientModuleAliases.js

@@ -1,3 +1,4 @@
-export const clientModulesAliases = {
-  'redaxios': 'tungsten/node_modules/redaxios/dist/redaxios.js'
-};
+// export const clientModulesAliases = {
+//     'redaxios': 'tungsten/node_modules/redaxios/dist/redaxios.js'
+// }
+export {};

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

@@ -1 +1 @@
-{"version":3,"file":"compileStyles.d.ts","sourceRoot":"","sources":["../../src/build/compileStyles.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAiOpE,wBAAsB,aAAa,CAC/B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,KAAK,UAAO,oBA8Ff"}
+{"version":3,"file":"compileStyles.d.ts","sourceRoot":"","sources":["../../src/build/compileStyles.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAgOpE,wBAAsB,aAAa,CAC/B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,KAAK,UAAO,oBA8Ff"}

package/dist/build/compileStyles.js

@@ -1,6 +1,7 @@
 import slash from 'slash';
 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';
@@ -19,16 +20,13 @@ function arrayToObjectTrue(array) {
 }
 function sassToCss(data, file, importBase) {
   try {
-    return sass.renderSync({
-      data,
-      file,
-      indentedSyntax: true,
-      importer: url => {
-        return {
-          file: resolveSassImport(url, file, importBase)
-        };
-      }
-    }).css.toString();
+    return sass.compileString(data, {
+      syntax: 'indented',
+      url: pathToFileURL(file),
+      importers: [{
+        findFileUrl: url => pathToFileURL(resolveSassImport(url, file, importBase))
+      }]
+    }).css;
   } catch (error) {
     if (error instanceof Error) {
       return error;
@@ -40,15 +38,13 @@ function sassToCss(data, file, importBase) {
 }
 function scssToCss(data, file, importBase) {
   try {
-    return sass.renderSync({
-      data,
-      file,
-      importer: url => {
-        return {
-          file: resolveScssImport(url, file, importBase)
-        };
-      }
-    }).css.toString();
+    return sass.compileString(data, {
+      syntax: 'scss',
+      url: pathToFileURL(file),
+      importers: [{
+        findFileUrl: url => pathToFileURL(resolveScssImport(url, file, importBase))
+      }]
+    }).css;
   } catch (error) {
     if (error instanceof Error) {
       return error;

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":"AAWA,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,YAkBnB,CAAA;AAED,eAAe,YAAY,CAAA"}

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

@@ -1,8 +1,7 @@
 import { nodeResolve } from "@rollup/plugin-node-resolve";
 import commonjs from "@rollup/plugin-commonjs";
 //import { babel } from "@rollup/plugin-babel"
-import { terser } from "rollup-plugin-terser";
-//import terser from "@rollup/plugin-terser" // to do
+import terser from "@rollup/plugin-terser";
 //import gzip from "rollup-plugin-gzip"
 import jsonModule from "@rollup/plugin-json";
 const json = typeof jsonModule === "function" ? jsonModule : jsonModule.default;

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,YAkBnB,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;AAeD,QAAA,MAAM,YAAY,EAAE,YAkBnB,CAAA;AAED,eAAe,YAAY,CAAA"}

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

@@ -1,8 +1,7 @@
 import { nodeResolve } from "@rollup/plugin-node-resolve";
 import commonjs from "@rollup/plugin-commonjs";
 import { babel } from "@rollup/plugin-babel";
-import { terser } from "rollup-plugin-terser";
-//import terser from "@rollup/plugin-terser" // to do
+import terser from "@rollup/plugin-terser";
 //import gzip from "rollup-plugin-gzip"
 import jsonModule from "@rollup/plugin-json";
 import { MakeBabelTransformRemoveServerBlocks } from "../babelPlugins/BabelTransformRemoveServerBlocks.js";

package/dist/staticGen/staticGen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"staticGen.d.ts","sourceRoot":"","sources":["../../src/staticGen/staticGen.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAiBhD,wBAAsB,SAAS,CAAC,SAAS,EAAE,SAAS,iBAsLnD"}
+{"version":3,"file":"staticGen.d.ts","sourceRoot":"","sources":["../../src/staticGen/staticGen.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAiBhD,wBAAsB,SAAS,CAAC,SAAS,EAAE,SAAS,iBA2LnD"}

package/dist/staticGen/staticGen.js

@@ -1,7 +1,6 @@
 import { existsSync, promises as fsPromises } from 'fs';
 import { join, dirname } from 'path';
 import fsExtra from 'fs-extra';
-import axios from 'axios';
 //import type { SxyFrameworkConfigComplete } from '../FrameworkConfig.js'
 import { staticSiteFolder, staticFolder, assetsFolder, publicFolder, bundleFolder, componentCssFolder } from "../settings.js";
 import { getAppRoutes } from "./getAppRoutes.js";
@@ -86,8 +85,11 @@ export async function staticGen(framework) {
     let links;
     try {
       console.log('get URL', url);
-      const response = await axios.get(url);
-      let result = response.data;
+      const response = await fetch(url);
+      // fetch, unlike axios, resolves on non-2xx - so check explicitly, or we'd
+      // write error pages out as static HTML
+      if (!response.ok) throwError('renderPath', `Get request to ${url} returned an invalid status: ${response.status}`);
+      let result = await response.text();
       links = findLinks(result);
       const newPaths = [];
       for (const link of links) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tungsten",
-  "version": "0.2.22",
+  "version": "0.2.23",
   "description": "",
   "type": "module",
   "bin": {
@@ -36,9 +36,8 @@
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^14.1.0",
+    "@rollup/plugin-terser": "^1.0.0",
     "arktype": "^2.2.0",
-    "axios": "^0.27.2",
-    "babel-loader": "^8.4.1",
     "babel-plugin-css-to-js": "^0.0.4",
     "babel-plugin-sxy-module-resolver": "^4.1.9",
     "babel-plugin-sxy-transform-cjs-to-esm": "^0.2.6",
@@ -48,7 +47,6 @@
     "chokidar": "^3.6.0",
     "cjs-module-lexer": "^1.4.3",
     "cjstoesm": "^2.1.2",
-    "compression-webpack-plugin": "^10.0.0",
     "cookie-parser": "^1.4.7",
     "cross-env": "^7.0.3",
     "decamelize": "^6.0.1",
@@ -59,26 +57,18 @@
     "fs-extra": "^10.1.0",
     "globby": "^13.2.2",
     "hono": "^4.12.8",
-    "html-webpack-plugin": "^5.6.6",
     "import-meta-resolve": "^2.2.2",
     "ini": "^4.1.3",
-    "install": "^0.13.0",
     "lodash.clonedeep": "^4.5.0",
-    "mini-css-extract-plugin": "^2.10.1",
-    "node-fetch": "^3.3.2",
-    "npm": "^11.12.0",
     "npm-run-all": "^4.1.5",
     "open": "^8.4.2",
     "path-to-regexp": "^6.3.0",
     "postcss": "^8.5.8",
     "precinct": "^12.2.0",
     "react-router": "^6.30.3",
-    "redaxios": "^0.5.1",
     "require-resolve-hook": "^1.1.0",
-    "rmfr": "^2.0.0",
     "rollup": "^2.80.0",
     "rollup-plugin-gzip": "^3.1.2",
-    "rollup-plugin-terser": "^7.0.2",
     "sass": "^1.98.0",
     "serialize-javascript": "^6.0.2",
     "slash": "^4.0.0",
@@ -88,8 +78,6 @@
     "sxy-lib-object-copy": "^2.0.5",
     "sxy-loader": "^3.1.0",
     "sxy-package-investigator": "^1.0.0",
-    "terser-webpack-plugin": "^5.4.0",
-    "util": "^0.12.5",
     "zod": "^4.3.6"
   },
   "devDependencies": {
@@ -98,7 +86,6 @@
     "@types/babel-types": "^7.0.16",
     "@types/babel__core": "^7.20.5",
     "@types/babel__generator": "^7.27.0",
-    "@types/bcrypt": "^5.0.2",
     "@types/bcryptjs": "^2.4.6",
     "@types/chai": "^4.3.20",
     "@types/cookie-parser": "^1.4.10",
@@ -119,25 +106,18 @@
     "babel-plugin-sxy-transform-import-extensions": "^1.0.5",
     "babel-plugin-transform-import-extension": "^1.0.3",
     "chai": "^4.5.0",
-    "chai-subset": "^1.6.0",
     "csstype": "^3.2.3",
     "eslint": "^8.57.1",
     "eslint-import-resolver-typescript": "^2.7.1",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-no-type-assertion": "^1.3.0",
     "happy-dom": "^20.10.6",
-    "progress-webpack-plugin": "^1.0.16",
     "prop-types": "^15.8.1",
     "rimraf": "^5.0.10",
-    "rmrf": "^2.0.4",
     "rollup-plugin-visualizer": "^5.14.0",
-    "supertest": "^6.3.4",
     "sxy-test-runner": "^2.2.2",
     "sxy-types": "^1.0.23",
-    "typescript": "^6.0.3",
-    "webpack-bundle-analyzer": "^4.10.2",
-    "webpack-cli": "^4.10.0",
-    "webpack-stats-plugin": "^1.1.3"
+    "typescript": "^6.0.3"
   },
   "peerDependencies": {
     "react": "^18.2.0 || ^19.0.0",

package/types/modules.d.ts

@@ -4,4 +4,35 @@ declare module 'babel-plugin-css-to-js'
 declare module '@babel/plugin-transform-class-properties'
 declare module '@rollup/plugin-node-resolve'
 declare module '@rollup/plugin-commonjs'
-declare module 'rollup-plugin-terser'
+// Its shipped types resolve as CJS under NodeNext (no "type":"module", no import/require
+// conditions in its exports map), so tsc sees a namespace and the default export isn't
+// callable. Redeclared here instead. terser's own types aren't reachable -- it's a
+// transitive dep, so pnpm keeps it out of the top-level node_modules -- hence the
+// hand-written option list; nested option objects are left loose on purpose.
+declare module '@rollup/plugin-terser' {
+    import type { Plugin } from 'rollup'
+
+    type TerserNested = Record<string, unknown>
+
+    export interface Options {
+        compress?: boolean | TerserNested
+        ecma?: 5 | 2015 | 2016 | 2017 | 2018 | 2019 | 2020
+        enclose?: boolean | string
+        format?: TerserNested
+        ie8?: boolean
+        keep_classnames?: boolean | RegExp
+        keep_fnames?: boolean | RegExp
+        mangle?: boolean | TerserNested
+        module?: boolean
+        parse?: TerserNested
+        safari10?: boolean
+        sourceMap?: boolean | TerserNested
+        toplevel?: boolean
+        /** Added by the plugin, not terser itself. */
+        nameCache?: Record<string, unknown>
+        /** Added by the plugin, not terser itself. */
+        maxWorkers?: number
+    }
+
+    export default function terser(options?: Options): Plugin
+}