wirejs-scripts 3.0.1 → 3.0.3

package/bin.js

@@ -12,6 +12,7 @@ import { rimraf } from 'rimraf';
 import { JSDOM } from 'jsdom';
 import { useJSDOM } from 'wirejs-dom/v2';
 import { requiresContext, Context, CookieJar } from 'wirejs-resources';
+import { prebuildApi } from 'wirejs-resources/internal';
 
 const CWD = process.cwd();
 const webpackConfig = webpackConfigure(process.env, process.argv);
@@ -89,6 +90,7 @@ async function callApiMethod(api, call, context) {
 			}, context);
 		}
 	} catch (error) {
+		console.log(error);
 		return { error: error.message };
 	}
 }
@@ -275,10 +277,10 @@ async function trySSRPath(req, res) {
 
 	try {
 		useJSDOM(JSDOM);
-		global.self = global.window;
-		await import(`${srcPath}?cache-id=${new Date().getTime()}`);
+		const self = {};
+		const moduleData = await fs.promises.readFile(srcPath);
+		eval(`${moduleData}`);
 		const module = self.exports;
-		console.log({module});
 		if (typeof module.generate === 'function') {
 			const doc = await module.generate(context);
 			const doctype = doc.parentNode.doctype?.name || '';
@@ -295,7 +297,7 @@ async function trySSRPath(req, res) {
 				doc.parentNode.body.appendChild(script);
 			}
 
-			res.setHeader('Content-type', 'text/html; charset=utf-8')
+			res.setHeader('Content-type', 'text/html; charset=utf-8');
 			res.end([
 				doctype ? `<!doctype ${doctype}>\n` : '',
 				doc.outerHTML
@@ -368,11 +370,16 @@ async function compile(watch = false) {
 				...webpackConfig,
 				mode: 'development',
 				watch: true
-			}, () => {}).run(() => {});
+			}, () => {
+				console.log();
+				console.log('Compiled: http://localhost:3000/');
+			}).run(() => {});
 
 			logger.log('Starting server...');
 			const server = http.createServer(handleRequest);
-			server.listen(3000);
+			server.listen(3000).on('listening', () => {
+				console.log('Started listening on http://localhost:3000/')
+			});
 		} else {
 			logger.log('instantiating webpack compiler');
 			compiler = webpack(webpackConfig);
@@ -434,8 +441,13 @@ const engine = {
 		// explicit exit forces lingering child processes to die.
 		logger.log('stopping')
 		process.exit();
-	}
+	},
 
+	async ['prebuild-api']() {
+		logger.log("prebuilding api...");
+		await prebuildApi();
+		logger.log("api prebuild finished");
+	},
 };
 
 if (typeof engine[action] === 'function') {

package/configs/webpack.config.js

@@ -23,10 +23,6 @@ marked.setOptions({
 	}
 });
 
-const BUILD_ID = (new Date()).getTime();
-
-fs.writeFileSync('./src/build_id.json', JSON.stringify(BUILD_ID.toString()));
-
 function distPath({ subpathOut = '', subpathIn = '', extensionOut } = {}) {
 	return function ({ context, absoluteFilename }) {
 		const prefixIn = path.resolve(context, subpathIn);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-scripts",
-	"version": "3.0.1",
+	"version": "3.0.3",
 	"description": "Basic build and start commands for wirejs apps",
 	"type": "module",
 	"bin": {
@@ -25,15 +25,12 @@
 		"css-loader": "^5.2.0",
 		"file-loader": "^6.2.0",
 		"glob": "^7.2.0",
-		"highlight.js": "^11.1.0",
 		"jsdom": "^25.0.1",
 		"marked": "^2.0.1",
 		"raw-loader": "^4.0.2",
 		"rimraf": "^6.0.1",
 		"style-loader": "^2.0.0",
 		"webpack": "^5.97.1",
-		"webpack-cli": "^6.0.1",
-		"webpack-dev-server": "^5.2.0",
 		"wirejs-dom": "^1.0.34"
 	}
 }