@create-node-app/core 0.3.5 → 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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@create-node-app/core",
-  "version": "0.3.5",
+  "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"
   },