Merge pull request #9 from metacall/fix-create

fix(creator): exclude `node_modules` and `dist` during loading templates
metacall · Aug 24, 2024 · d691fa7 · d691fa7
2 parents 2f4c85c + d4f2656
commit d691fa7
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-/target
-/node_modules
-/dist
+target
+node_modules
+dist
 .vscode
diff --git a/crates/metassr-create/build.rs b/crates/metassr-create/build.rs
@@ -19,6 +19,11 @@ fn main() {
         .into_iter()
         .filter_map(Result::ok)
         .filter(|e| e.file_type().is_file())
+        .filter(|e| {
+            !e.path().components().any(|component| {
+                component.as_os_str() == "node_modules" || component.as_os_str() == "dist"
+            })
+        })
     {
         let path = entry.path();
         let relative_path = path.strip_prefix(templates_dir).unwrap().to_str().unwrap();

diff --git a/crates/metassr-create/templates/javascript/package.json b/crates/metassr-create/templates/javascript/package.json
@@ -5,21 +5,14 @@
   "scripts": {
     "run": "metassr-cli --debug-mode=http run",
     "build:ssr": "metassr-cli --debug-mode=metacall build -t ssr",
-    "serve:ssg": "metassr-cli --debug-mode=http run --serve",
-    "build:ssg": "metassr-cli --debug-mode=metacall build -t ssg",
-    "dev": "rspack --watch"
+    "serve": "metassr-cli --debug-mode=http run --serve",
+    "build:ssg": "metassr-cli --debug-mode=metacall build -t ssg"
   },
   "devDependencies": {
-    "@rspack/cli": "^0.7.5",
-    "@rspack/core": "^0.7.5",
-    "@swc/cli": "^0.3.12",
-    "@swc/core": "^1.4.16",
-    "@swc/helpers": "^0.5.11",
-    "@types/react": "^18.0.24",
-    "@types/react-dom": "^18.0.8"
+    "@rspack/core": "^0.7.5"
   },
   "dependencies": {
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }
-}
+}
diff --git a/crates/metassr-create/templates/typescript/package.json b/crates/metassr-create/templates/typescript/package.json
@@ -10,13 +10,7 @@
     "dev": "rspack --watch"
   },
   "devDependencies": {
-    "@rspack/cli": "^0.7.5",
     "@rspack/core": "^0.7.5",
-    "@swc/cli": "^0.3.12",
-    "@swc/core": "^1.4.16",
-    "@swc/helpers": "^0.5.11",
-    "@types/react": "^18.0.24",
-    "@types/react-dom": "^18.0.8"
   },
   "dependencies": {
     "react": "^18.3.1",

diff --git a/crates/metassr-utils/src/cache_dir.rs b/crates/metassr-utils/src/cache_dir.rs
@@ -1,6 +1,10 @@
 use anyhow::Result;
 use std::{
-    collections::HashMap, ffi::OsStr, fs::{self, File}, io::{Read, Write}, path::{Path, PathBuf}
+    collections::HashMap,
+    ffi::OsStr,
+    fs::{self, File},
+    io::{Read, Write},
+    path::{Path, PathBuf},
 };
 use walkdir::WalkDir;
 

diff --git a/metassr-cli/src/cli/mod.rs b/metassr-cli/src/cli/mod.rs
@@ -31,7 +31,7 @@ pub struct Args {
     pub log_file: Option<String>,
 
     #[command(subcommand)]
-    pub commands: Option<Commands>,
+    pub commands: Commands,
 }
 
 #[derive(Debug, ValueEnum, PartialEq, Eq, Clone)]

diff --git a/metassr-cli/src/main.rs b/metassr-cli/src/main.rs
@@ -23,7 +23,7 @@ async fn main() -> Result<()> {
         [Some(DebugMode::All), Some(DebugMode::Metacall)].contains(&args.debug_mode);
     let allow_http_debug = [Some(DebugMode::All), Some(DebugMode::Http)].contains(&args.debug_mode);
 
-    if let Some(Commands::Create { .. }) = args.commands {
+    if let Commands::Create { .. } = args.commands {
         tracing_subscriber::fmt()
             .with_target(false)
             .without_time()
@@ -45,28 +45,26 @@ async fn main() -> Result<()> {
             set_var("METACALL_DEBUG", "1");
         }
     }
-
     match args.commands {
-        Some(Commands::Build {
+        Commands::Build {
             out_dir,
             build_type,
-        }) => {
+        } => {
             cli::Builder::new(build_type, out_dir).exec()?;
         }
-        Some(Commands::Run { port, serve }) => {
+        Commands::Run { port, serve } => {
             cli::Runner::new(port, serve, allow_http_debug)
                 .exec()
                 .await?;
         }
-        Some(Commands::Create {
+        Commands::Create {
             project_name,
             version,
             description,
             template,
-        }) => {
+        } => {
             cli::Creator::new(project_name, version, description, template).exec()?;
         }
-        _ => {}
     };
 
     Ok(())

diff --git a/tests/web-app/package.json b/tests/web-app/package.json
@@ -4,19 +4,17 @@
   "description": "",
   "main": "App.tsx",
   "scripts": {
-    "build": "node scripts/build.js"
+    "build": "../../target/debug/metassr-cli --debug-mode=metacall build",
+    "build:ssg": "../../target/debug/metassr-cli --debug-mode=metacall build -t ssg",
+    "run": "../../target/debug/metassr-cli --debug-mode=metacall run ",
+    "run:ssg": "../../target/debug/metassr-cli --debug-mode=metacall run --serve"
   },
   "devDependencies": {
-    "@swc/cli": "^0.3.12",
-    "@swc/core": "^1.4.16",
-    "@swc/helpers": "^0.5.11",
     "@types/react": "^18.0.24",
     "@types/react-dom": "^18.0.8"
   },
   "dependencies": {
-    "typescript": "^4.6.4",
     "react": "^18.3.1",
-    "@rspack/core": "^0.7.5",
     "react-dom": "^18.3.1"
   }
 }