create-rspack 1.0.0-alpha.2 → 1.0.0-alpha.4

package/index.js

@@ -20,6 +20,7 @@ yargs(hideBin(process.argv))
 		const defaultProjectName = "rspack-project";
 		let template = "react";
 		let targetDir = defaultProjectName;
+
 		const promptProjectDir = async () =>
 			await prompts(
 				[
@@ -37,13 +38,15 @@ yargs(hideBin(process.argv))
 			);
 
 		await promptProjectDir();
-		let root = path.resolve(process.cwd(), targetDir);
+		let projectDir = getProjectDir(targetDir);
+		let root = path.resolve(process.cwd(), projectDir);
 		while (fs.existsSync(root)) {
 			console.log(
 				`${targetDir} is not empty, please choose another project name`
 			);
 			await promptProjectDir();
-			root = path.resolve(process.cwd(), targetDir);
+			projectDir = getProjectDir(targetDir);
+			root = path.resolve(process.cwd(), projectDir);
 		}
 
 		// choose template
@@ -69,17 +72,17 @@ yargs(hideBin(process.argv))
 
 		fs.mkdirSync(root, { recursive: true });
 		const srcFolder = path.resolve(__dirname, `template-${template}`);
-		copyFolder(srcFolder, targetDir);
+		copyFolder(srcFolder, root, targetDir);
 		const pkgManager = getPkgManager();
 		console.log("\nDone. Now run:\n");
-		console.log(`cd ${targetDir}\n`);
+		console.log(`cd ${projectDir}\n`);
 		console.log(`${pkgManager} install\n`);
 		console.log(`${pkgManager} run dev\n`);
 	})
 	.help()
 	.parse();
 
-function copyFolder(src, dst) {
+function copyFolder(src, dst, targetDir) {
 	const renameFiles = {
 		_gitignore: ".gitignore"
 	};
@@ -95,7 +98,7 @@ function copyFolder(src, dst) {
 			: path.resolve(dst, file);
 		const stat = fs.statSync(srcFile);
 		if (stat.isDirectory()) {
-			copyFolder(srcFile, dstFile);
+			copyFolder(srcFile, dstFile, targetDir);
 		} else {
 			// use create-rspack version as @rspack/xxx version in template
 			if (file === "package.json") {
@@ -114,6 +117,9 @@ function copyFolder(src, dst) {
 						}
 					}
 				}
+				if (pkg.name) {
+					pkg.name = getPkgName(targetDir);
+				}
 				fs.writeFileSync(dstFile, JSON.stringify(pkg, null, 2), "utf-8");
 			} else {
 				fs.copyFileSync(srcFile, dstFile);
@@ -122,6 +128,26 @@ function copyFolder(src, dst) {
 	}
 }
 
+function getPkgName(targetDir) {
+	const scopeMatch = matchScopedPackageName(targetDir);
+	if (scopeMatch) {
+		return targetDir; // Scoped package name
+	}
+	return path.basename(targetDir); // Use the base name of the target directory
+}
+
+function getProjectDir(targetDir) {
+	const scopeMatch = matchScopedPackageName(targetDir);
+	if (scopeMatch) {
+		return scopeMatch[1]; // Subdirectory project name for scoped packages
+	}
+	return targetDir;
+}
+
+function matchScopedPackageName(targetDir) {
+	return targetDir.match(/^@[^/]+\/(.+)/);
+}
+
 function getPkgManager() {
 	const ua = process.env.npm_config_user_agent;
 	if (!ua) return "npm";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-rspack",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.4",
   "license": "MIT",
   "main": "index.js",
   "bin": {

package/template-vue-ts/src/shims-vue.d.ts

@@ -1,5 +1,5 @@
 declare module "*.vue" {
-	import { DefineComponent } from "vue";
+	import type { DefineComponent } from "vue";
 	const component: DefineComponent<{}, {}, any>;
 	export default component;
 }

package/utils/index.js

@@ -1,6 +1,4 @@
 /**
  * format the targetDir
  */
-exports.formatTargetDir = function (targetDir) {
-	return targetDir.trim().replace(/\/+$/g, "");
-};
+exports.formatTargetDir = targetDir => targetDir.trim().replace(/\/+$/g, "");