@create-node-app/core 0.3.4 → 0.3.6

package/dist/index.js

@@ -571,6 +571,8 @@ var fileLoader = ({
   appName,
   originalDirectory,
   verbose,
+  useYarn,
+  usePnpm,
   srcDir = DEFAULT_SRC_PATH,
   runCommand,
   installCommand,
@@ -589,6 +591,8 @@ var fileLoader = ({
     appName,
     originalDirectory,
     verbose,
+    useYarn,
+    usePnpm,
     mode,
     srcDir,
     runCommand,
@@ -604,6 +608,8 @@ var loadFiles = async ({
   appName,
   originalDirectory,
   verbose,
+  useYarn = false,
+  usePnpm = false,
   srcDir = DEFAULT_SRC_PATH,
   runCommand,
   installCommand,
@@ -621,22 +627,33 @@ var loadFiles = async ({
         "!package-lock.json",
         "!template.json",
         "!yarn.lock",
-        "!pnpm-lock.yaml"
+        "!pnpm-lock.yaml",
+        // based on the package manager we want to ignore files containing
+        // the other package as condition.
+        // For example, if `usePnpm` is true, the we need to ignore
+        // all files with `.if-npm` or `.if-yarn` somewhere in the name.
+        ...usePnpm ? ["!*.if-npm.*", "!*.if-yarn.*"] : useYarn ? ["!*.if-npm.*", "!*.if-pnpm.*"] : ["!*.if-yarn.*", "!*.if-pnpm.*"]
       ],
       directoryFilter: ["!package"]
     })) {
       try {
+        const entryWithoutNodePackageManager = {
+          ...entry,
+          path: entry.path.replace(/\.if-(npm|yarn|pnpm)/, "")
+        };
         await fileLoader({
           root,
           templateDir,
           appName,
           originalDirectory,
           verbose,
+          useYarn,
+          usePnpm,
           srcDir,
           runCommand,
           installCommand,
           ...customOptions
-        })(entry);
+        })(entryWithoutNodePackageManager);
       } catch (err) {
         if (verbose) {
           console.log(err);
@@ -671,13 +688,13 @@ var install = (root, useYarn = false, usePnpm = false, dependencies = [], verbos
       }
     } else if (usePnpm) {
       command = "pnpm";
-      args = ["add", "--save"];
+      args = ["install", "--loglevel", "error"];
       if (isDevDependencies) {
         args.push("--save-dev");
+      } else {
+        args.push("--save");
       }
       args.push(...dependencies);
-      args.push("--cwd");
-      args.push(root);
     } else {
       command = "npm";
       args = ["install", "--loglevel", "error"];
@@ -752,6 +769,8 @@ var run = async ({
     appName,
     originalDirectory,
     verbose,
+    useYarn,
+    usePnpm,
     runCommand,
     installCommand,
     ...customOptions
@@ -790,10 +809,10 @@ var run = async ({
     }
   } else {
     console.log(import_chalk3.default.yellow("Skip package installation."));
-    const packageJson = JSON.parse(
+    const packageJson2 = JSON.parse(
       import_fs5.default.readFileSync(`${root}/package.json`, "utf8")
     );
-    packageJson.dependencies = dependencies.reduce((dep, elem) => {
+    packageJson2.dependencies = dependencies.reduce((dep, elem) => {
       const nextDep = dep;
       if (/.+@(\^|~)?[0-9a-zA-Z-.]+$/.test(elem)) {
         const [name, version] = elem.split("@");
@@ -803,7 +822,7 @@ var run = async ({
       }
       return nextDep;
     }, {});
-    packageJson.devDependencies = devDependencies.reduce((dep, elem) => {
+    packageJson2.devDependencies = devDependencies.reduce((dep, elem) => {
       const nextDep = dep;
       if (/.+@(\^|~)?[0-9a-zA-Z-.]+$/.test(elem)) {
         const [name, version] = elem.split("@");
@@ -815,7 +834,7 @@ var run = async ({
     }, {});
     import_fs5.default.writeFileSync(
       import_path4.default.join(root, "package.json"),
-      JSON.stringify(packageJson, null, 2) + import_os3.default.EOL
+      JSON.stringify(packageJson2, null, 2) + import_os3.default.EOL
     );
     console.log();
     console.log(import_chalk3.default.green("Successfully updated package.json."));
@@ -831,10 +850,10 @@ var run = async ({
     "Failed to initialize git repository. Run `git init` to initialize git repository after the process is completed."
   );
   if (installDependencies && isOnline) {
-    const packageJson = JSON.parse(
+    const packageJson2 = JSON.parse(
       import_fs5.default.readFileSync(`${root}/package.json`, "utf8")
     );
-    if (packageJson.scripts && packageJson.scripts["format"]) {
+    if (packageJson2.scripts && packageJson2.scripts["format"]) {
       try {
         await runCommandInProjectDir(
           root,
@@ -846,7 +865,7 @@ var run = async ({
       } catch {
       }
     }
-    if (packageJson.scripts && packageJson.scripts["lint:fix"]) {
+    if (packageJson2.scripts && packageJson2.scripts["lint:fix"]) {
       try {
         await runCommandInProjectDir(
           root,
@@ -861,7 +880,23 @@ var run = async ({
   }
   console.log();
   console.log(import_chalk3.default.green("Successfully created project " + appName + "."));
-  process.chdir(root);
+  console.log();
+  console.log("Done! Now run:");
+  console.log();
+  console.log(import_chalk3.default.cyan(`  cd ${appName}`));
+  console.log(import_chalk3.default.cyan(`  ${installCommand}`));
+  const packageJson = JSON.parse(
+    import_fs5.default.readFileSync(`${root}/package.json`, "utf8")
+  );
+  const lookForScripts = ["sls:offline", "dev", "start"];
+  for (const script of lookForScripts) {
+    if (packageJson.scripts && packageJson.scripts[script]) {
+      console.log(import_chalk3.default.cyan(`  ${runCommand} ${script}`));
+      break;
+    }
+  }
+  console.log();
+  console.log(import_chalk3.default.green("Happy hacking!"));
 };
 var createApp = async ({
   name,

package/dist/index.mjs

@@ -542,6 +542,8 @@ var fileLoader = ({
   appName,
   originalDirectory,
   verbose,
+  useYarn,
+  usePnpm,
   srcDir = DEFAULT_SRC_PATH,
   runCommand,
   installCommand,
@@ -560,6 +562,8 @@ var fileLoader = ({
     appName,
     originalDirectory,
     verbose,
+    useYarn,
+    usePnpm,
     mode,
     srcDir,
     runCommand,
@@ -575,6 +579,8 @@ var loadFiles = async ({
   appName,
   originalDirectory,
   verbose,
+  useYarn = false,
+  usePnpm = false,
   srcDir = DEFAULT_SRC_PATH,
   runCommand,
   installCommand,
@@ -592,22 +598,33 @@ var loadFiles = async ({
         "!package-lock.json",
         "!template.json",
         "!yarn.lock",
-        "!pnpm-lock.yaml"
+        "!pnpm-lock.yaml",
+        // based on the package manager we want to ignore files containing
+        // the other package as condition.
+        // For example, if `usePnpm` is true, the we need to ignore
+        // all files with `.if-npm` or `.if-yarn` somewhere in the name.
+        ...usePnpm ? ["!*.if-npm.*", "!*.if-yarn.*"] : useYarn ? ["!*.if-npm.*", "!*.if-pnpm.*"] : ["!*.if-yarn.*", "!*.if-pnpm.*"]
       ],
       directoryFilter: ["!package"]
     })) {
       try {
+        const entryWithoutNodePackageManager = {
+          ...entry,
+          path: entry.path.replace(/\.if-(npm|yarn|pnpm)/, "")
+        };
         await fileLoader({
           root,
           templateDir,
           appName,
           originalDirectory,
           verbose,
+          useYarn,
+          usePnpm,
           srcDir,
           runCommand,
           installCommand,
           ...customOptions
-        })(entry);
+        })(entryWithoutNodePackageManager);
       } catch (err) {
         if (verbose) {
           console.log(err);
@@ -642,13 +659,13 @@ var install = (root, useYarn = false, usePnpm = false, dependencies = [], verbos
       }
     } else if (usePnpm) {
       command = "pnpm";
-      args = ["add", "--save"];
+      args = ["install", "--loglevel", "error"];
       if (isDevDependencies) {
         args.push("--save-dev");
+      } else {
+        args.push("--save");
       }
       args.push(...dependencies);
-      args.push("--cwd");
-      args.push(root);
     } else {
       command = "npm";
       args = ["install", "--loglevel", "error"];
@@ -723,6 +740,8 @@ var run = async ({
     appName,
     originalDirectory,
     verbose,
+    useYarn,
+    usePnpm,
     runCommand,
     installCommand,
     ...customOptions
@@ -761,10 +780,10 @@ var run = async ({
     }
   } else {
     console.log(chalk3.yellow("Skip package installation."));
-    const packageJson = JSON.parse(
+    const packageJson2 = JSON.parse(
       fs4.readFileSync(`${root}/package.json`, "utf8")
     );
-    packageJson.dependencies = dependencies.reduce((dep, elem) => {
+    packageJson2.dependencies = dependencies.reduce((dep, elem) => {
       const nextDep = dep;
       if (/.+@(\^|~)?[0-9a-zA-Z-.]+$/.test(elem)) {
         const [name, version] = elem.split("@");
@@ -774,7 +793,7 @@ var run = async ({
       }
       return nextDep;
     }, {});
-    packageJson.devDependencies = devDependencies.reduce((dep, elem) => {
+    packageJson2.devDependencies = devDependencies.reduce((dep, elem) => {
       const nextDep = dep;
       if (/.+@(\^|~)?[0-9a-zA-Z-.]+$/.test(elem)) {
         const [name, version] = elem.split("@");
@@ -786,7 +805,7 @@ var run = async ({
     }, {});
     fs4.writeFileSync(
       path3.join(root, "package.json"),
-      JSON.stringify(packageJson, null, 2) + os3.EOL
+      JSON.stringify(packageJson2, null, 2) + os3.EOL
     );
     console.log();
     console.log(chalk3.green("Successfully updated package.json."));
@@ -802,10 +821,10 @@ var run = async ({
     "Failed to initialize git repository. Run `git init` to initialize git repository after the process is completed."
   );
   if (installDependencies && isOnline) {
-    const packageJson = JSON.parse(
+    const packageJson2 = JSON.parse(
       fs4.readFileSync(`${root}/package.json`, "utf8")
     );
-    if (packageJson.scripts && packageJson.scripts["format"]) {
+    if (packageJson2.scripts && packageJson2.scripts["format"]) {
       try {
         await runCommandInProjectDir(
           root,
@@ -817,7 +836,7 @@ var run = async ({
       } catch {
       }
     }
-    if (packageJson.scripts && packageJson.scripts["lint:fix"]) {
+    if (packageJson2.scripts && packageJson2.scripts["lint:fix"]) {
       try {
         await runCommandInProjectDir(
           root,
@@ -832,7 +851,23 @@ var run = async ({
   }
   console.log();
   console.log(chalk3.green("Successfully created project " + appName + "."));
-  process.chdir(root);
+  console.log();
+  console.log("Done! Now run:");
+  console.log();
+  console.log(chalk3.cyan(`  cd ${appName}`));
+  console.log(chalk3.cyan(`  ${installCommand}`));
+  const packageJson = JSON.parse(
+    fs4.readFileSync(`${root}/package.json`, "utf8")
+  );
+  const lookForScripts = ["sls:offline", "dev", "start"];
+  for (const script of lookForScripts) {
+    if (packageJson.scripts && packageJson.scripts[script]) {
+      console.log(chalk3.cyan(`  ${runCommand} ${script}`));
+      break;
+    }
+  }
+  console.log();
+  console.log(chalk3.green("Happy hacking!"));
 };
 var createApp = async ({
   name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@create-node-app/core",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -16,7 +16,7 @@
   "scripts": {
     "lint": "eslint **/*.ts*",
     "lint:fix": "eslint **/*.ts* --fix",
-    "typecheck": "tsc --noEmit",
+    "type-check": "tsc --noEmit",
     "build": "tsup ./index.ts --format esm,cjs --dts",
     "dev": "tsup ./index.ts --format esm,cjs --watch --dts"
   },