wirejs-scripts 3.0.6 → 3.0.8

package/bin.js

@@ -16,7 +16,7 @@ import { requiresContext, Context, CookieJar } from 'wirejs-resources';
 import { prebuildApi } from 'wirejs-resources/internal';
 
 const CWD = process.cwd();
-const webpackConfig = webpackConfigure(process.env, process.argv);
+const getWebpackConfig = () => webpackConfigure(process.env, process.argv);
 const [_nodeBinPath, _scriptPath, action] = process.argv;
 const processes = [];
 
@@ -370,13 +370,14 @@ async function compile(watch = false) {
 			const prebuild = await esbuild.context({
 				entryPoints: [`${CWD}/src/**/*.ts`],
 				outdir: `${CWD}/pre-dist`,
-				bundle: true,
+				bundle: false,
 				format: 'esm',
 				conditions: ['wirejs:client'],
 			});
+			await prebuild.rebuild();
 			prebuild.watch();
 			webpack({
-				...webpackConfig,
+				...getWebpackConfig(),
 				mode: 'development',
 				watch: true
 			}, () => {
@@ -390,15 +391,16 @@ async function compile(watch = false) {
 				console.log('Started listening on http://localhost:3000/')
 			});
 		} else {
-			logger.log('instantiating webpack compiler');
+			logger.log('prebundling JS');
 			await esbuild.build({
 				entryPoints: [`${CWD}/src/**/*.ts`],
 				outdir: `${CWD}/pre-dist`,
-				bundle: true,
+				bundle: false,
 				format: 'esm',
 				conditions: ['wirejs:client'],
 			});
-			compiler = webpack(webpackConfig);
+			logger.log('starting webpack compiler');
+			compiler = webpack(getWebpackConfig());
 			compiler.run((err, res) => {
 				logger.log('invoking webpack compiler');
 				if (err) {
@@ -425,16 +427,16 @@ const engine = {
 	async build({ watch = false } = {}) {
 		logger.log('build starting');
 
-		rimraf.sync('dist');
+		await rimraf('dist');
 		logger.log('cleared old dist folder');
 
-		fs.mkdirSync('dist');
-		logger.log('recreated dist folder');
-
-		rimraf.sync('pre-dist');
+		await rimraf('pre-dist');
 		logger.log('cleared old pre-dist folder');
 
-		fs.mkdirSync('pre-dist');
+		await fs.promises.mkdir('dist');
+		logger.log('recreated dist folder');
+
+		await fs.promises.mkdir('pre-dist');
 		logger.log('recreated pre-dist folder');
 
 		try {

package/configs/webpack.config.js

@@ -131,9 +131,9 @@ export default (env, argv) => {
 		devtool = 'eval-cheap-source-map';
 	}
 
-	const sources = [`./${SRC}/index.{js,ts}`]
-		.concat(glob.sync(`./${SRC}/ssg/**/*.{js,ts}`))
-		.concat(glob.sync(`./${SRC}/ssr/**/*.{js,ts}`))
+	const sources = [`./${SRC}/index.js`]
+		.concat(glob.sync(`./${SRC}/ssg/**/*.js`))
+		.concat(glob.sync(`./${SRC}/ssr/**/*.js`))
 	;
 
 	const entry = sources.reduce((files, path) => {
@@ -205,7 +205,7 @@ export default (env, argv) => {
 						priority: 10,
 					},
 					{
-						from: `./${SRC}/ssg/**/*.{js,ts}`,
+						from: `./${SRC}/ssg/**/*.js`,
 						to: distPath({ subpathIn: `${SRC}/ssg`, extensionOut: 'html' }),
 						transform: Generated,
 						noErrorOnMissing: true,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-scripts",
-	"version": "3.0.6",
+	"version": "3.0.8",
 	"description": "Basic build and start commands for wirejs apps",
 	"type": "module",
 	"bin": {