wirejs-scripts 3.0.4 → 3.0.5

package/bin.js

@@ -8,6 +8,7 @@ import path from 'path';
 import webpack from 'webpack';
 import webpackConfigure from './configs/webpack.config.js';
 import { rimraf } from 'rimraf';
+import esbuild from 'esbuild';
 
 import { JSDOM } from 'jsdom';
 import { useJSDOM } from 'wirejs-dom/v2';
@@ -72,7 +73,7 @@ async function callApiMethod(api, call, context) {
 		const [scope, ...rest] = call.method;
 		logger.info('api method parsed', { scope, rest });
 		if (rest.length === 0) {
-			logger.info('api method resolved. invoking...');
+			logger.info('api method resolved. invoking...', requiresContext(api[scope]));
 			if (requiresContext(api[scope])) {
 				return {
 					data: await api[scope](context, ...call.args.slice(1))
@@ -208,7 +209,7 @@ function byLength(a, b) {
  * @returns 
  */
 function globMatch(pattern, text) {
-    const parts = pattern.split('*');
+    const parts = pattern.split('%');
     const regex = new RegExp(parts.join('.+'));
     return regex.test(text);
 }
@@ -366,6 +367,14 @@ async function compile(watch = false) {
 	const stats = await new Promise(async (resolve, reject) => {
 		let compiler;
 		if (watch) {
+			const prebuild = await esbuild.context({
+				entryPoints: [`${CWD}/src/**/*.ts`],
+				outdir: `${CWD}/pre-dist`,
+				bundle: true,
+				format: 'esm',
+				conditions: ['wirejs:client'],
+			});
+			prebuild.watch();
 			webpack({
 				...webpackConfig,
 				mode: 'development',
@@ -382,6 +391,13 @@ async function compile(watch = false) {
 			});
 		} else {
 			logger.log('instantiating webpack compiler');
+			await esbuild.build({
+				entryPoints: [`${CWD}/src/**/*.ts`],
+				outdir: `${CWD}/pre-dist`,
+				bundle: true,
+				format: 'esm',
+				conditions: ['wirejs:client'],
+			});
 			compiler = webpack(webpackConfig);
 			compiler.run((err, res) => {
 				logger.log('invoking webpack compiler');
@@ -415,6 +431,12 @@ const engine = {
 		fs.mkdirSync('dist');
 		logger.log('recreated dist folder');
 
+		rimraf.sync('pre-dist');
+		logger.log('cleared old pre-dist folder');
+
+		fs.mkdirSync('pre-dist');
+		logger.log('recreated pre-dist folder');
+
 		try {
 			await compile(watch);
 			logger.log('finished compile');
@@ -444,7 +466,14 @@ const engine = {
 	},
 
 	async ['prebuild-api']() {
-		logger.log("prebuilding api...");
+		logger.log("prebuilding api ...");
+		await esbuild.build({
+			entryPoints: [path.join(CWD, 'index.ts')],
+			platform: 'node',
+			bundle: true,
+			format: 'esm',
+			outfile: path.join(CWD, 'index.js')
+		});
 		await prebuildApi();
 		logger.log("api prebuild finished");
 	},

package/configs/webpack.config.js

@@ -9,6 +9,7 @@ import { JSDOM } from 'jsdom';
 
 
 const CWD = process.cwd();
+const SRC = 'pre-dist';
 
 // https://marked.js.org/using_advanced
 marked.setOptions({
@@ -68,7 +69,7 @@ const SSG = {
 		}
 
 		const layoutPath = path.join(
-			'src',
+			SRC,
 			'layouts',
 			(_meta.layout || 'default')
 		) + '.html';
@@ -103,7 +104,7 @@ const Generated = {
 
 					if (hydrationsFound) {
 						const script = doc.parentNode.createElement('script');
-						script.src = contentPath.substring((CWD + '/src/ssg').length);
+						script.src = contentPath.substring((`${CWD}/${SRC}/ssg`).length);
 						doc.parentNode.body.appendChild(script);
 					}
 
@@ -130,23 +131,21 @@ export default (env, argv) => {
 		devtool = 'eval-cheap-source-map';
 	}
 
-	const sources = ['./src/index.js']
-		.concat(glob.sync('./src/layouts/**/*.js'))
-		.concat(glob.sync('./src/routes/**/*.js'))
-		.concat(glob.sync('./src/ssg/**/*.js'))
-		.concat(glob.sync('./src/ssr/**/*.js'))
+	const sources = [`./${SRC}/index.{js,ts}`]
+		.concat(glob.sync(`./${SRC}/ssg/**/*.{js,ts}`))
+		.concat(glob.sync(`./${SRC}/ssr/**/*.{js,ts}`))
 	;
 
 	const entry = sources.reduce((files, path) => {
-		if (path.match(/src\/ssg/)) {
-			files[path.toString().slice('./src/ssg'.length)] = path;
-		} else if (path.match(/src\/ssr/)) {
+		if (path.match(new RegExp(`${SRC}/ssg`))) {
+			files[path.toString().slice(`./${SRC}/ssg`.length)] = path;
+		} else if (path.match(new RegExp(`${SRC}/ssr`))) {
 			// keep SSR bundles in the ssr subfolder
-			files[path.toString().slice('./src'.length)] = path;
-		} else if (path.match(/src\/routes/)) {
-			files[path.toString().slice('./src/routes'.length)] = path;
-		} else if (path.match(/src\/layouts/)) {
-			files[path.toString().slice('./src/'.length)] = path;
+			files[path.toString().slice(`./${SRC}`.length)] = path;
+		} else if (path.match(new RegExp(`${SRC}/routes`))) {
+			files[path.toString().slice(`./${SRC}/routes`.length)] = path;
+		} else if (path.match(new RegExp(`${SRC}/layouts`))) {
+			files[path.toString().slice(`./${SRC}/`.length)] = path;
 		}
 		return files;
 	}, {});
@@ -186,9 +185,9 @@ export default (env, argv) => {
 			new CopyWebpackPlugin({
 				patterns: [
 					{
-						from: './src/layouts/**/*.html',
+						from: `./${SRC}/layouts/**/*.html`,
 						to: distPath({
-							subpathIn: 'src/layouts',
+							subpathIn: `${SRC}/layouts`,
 							subpathOut: 'layouts'
 						}),
 						transform: CollectLayouts,
@@ -206,8 +205,8 @@ export default (env, argv) => {
 						priority: 10,
 					},
 					{
-						from: './src/ssg/**/*.js',
-						to: distPath({ subpathIn: 'src/ssg', extensionOut: 'html' }),
+						from: `./${SRC}/ssg/**/*.{js,ts}`,
+						to: distPath({ subpathIn: `${SRC}/ssg`, extensionOut: 'html' }),
 						transform: Generated,
 						noErrorOnMissing: true,
 						priority: 5

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-scripts",
-	"version": "3.0.4",
+	"version": "3.0.5",
 	"description": "Basic build and start commands for wirejs apps",
 	"type": "module",
 	"bin": {
@@ -23,6 +23,7 @@
 	"dependencies": {
 		"copy-webpack-plugin": "^10.2.4",
 		"css-loader": "^5.2.0",
+		"esbuild": "^0.24.2",
 		"file-loader": "^6.2.0",
 		"glob": "^7.2.0",
 		"jsdom": "^25.0.1",
@@ -31,6 +32,7 @@
 		"rimraf": "^6.0.1",
 		"style-loader": "^2.0.0",
 		"webpack": "^5.97.1",
-		"wirejs-dom": "^1.0.35"
+		"wirejs-dom": "^1.0.38",
+		"wirejs-resources": "^0.1.9"
 	}
 }