@atomicsmash/init-testing 2.1.2 → 2.1.3

package/dist/cli.js

@@ -49,7 +49,7 @@ const copyFiles = await readdir(copyFolder, {
     recursive: true,
 });
 for (const dirent of copyFiles) {
-    let relativePath = pathRelative(copyFolder, `${dirent.path}`);
+    let relativePath = pathRelative(copyFolder, dirent.parentPath);
     if (relativePath !== "" && !relativePath.endsWith("/")) {
         relativePath = `${relativePath}/`;
     }
@@ -101,7 +101,7 @@ for (const dirent of copyFiles) {
         await writeFile(`${process.cwd()}/${relativePath}${dirent.name}`, data, { encoding: "utf8", flag: argv.overwriteFiles ? "w" : "wx" });
         return `${relativePath}${dirent.name} copied successfully.`;
     })
-        .catch((error) => `${relativePath}${dirent.name} failed to copy. Error: ${error}`));
+        .catch((error) => `${relativePath}${dirent.name} failed to copy. Error: ${error instanceof Error ? error : typeof error === "string" ? error : "Unknown error."}`));
 }
 const [nodeMajor, nodeMinor] = process.versions.node.split(".");
 await Promise.all([
@@ -132,7 +132,7 @@ await Promise.all([
             type: "dev",
         }),
         packageManager.ensurePackageIsInstalled("@types/node", {
-            packageConstraint: `${nodeMajor}.${nodeMinor}.x`,
+            packageConstraint: nodeMajor && nodeMinor ? `${nodeMajor}.${nodeMinor}.x` : "latest",
             type: "dev",
         }),
         !hasRootTSConfig
@@ -144,7 +144,7 @@ await Promise.all([
     ])
         .then((results) => {
         if (results.some((result) => {
-            return result.status === "fulfilled" && result.value === true;
+            return result.status === "fulfilled" && result.value;
         })) {
             const installedPackages = [
                 ...packageManager.commands.install,
@@ -153,7 +153,7 @@ await Promise.all([
             packageManager.runCommands();
             console.log(`Packages installed: ${installedPackages.join(",")}.`);
         }
-        return results[1].status === "fulfilled" && results[1].value === true;
+        return results[1].status === "fulfilled" && results[1].value;
     })
         .then((shouldInstallPlaywright) => {
         if (shouldInstallPlaywright) {

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAqBA,qBAAa,cAAc;IAC1B,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,eAAe,CAAkB;IACzC,QAAQ;QACP;;WAEG;eACU,MAAM,EAAE;QACrB;;WAEG;iBACY,MAAM,EAAE;QACvB;;WAEG;oBACe,MAAM,EAAE;MACzB;gBAEU,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO;IAK1D;;OAEG;IACH,WAAW;IA2BX;;;;OAIG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM;;;;;;;;;IA2BrC;;;;;;;;OAQG;IACG,wBAAwB,CAC7B,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE;QACT,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,IAAI,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC;KACxB;CAkGF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAqBA,qBAAa,cAAc;IAC1B,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,eAAe,CAAkB;IACzC,QAAQ;QACP;;WAEG;eACU,MAAM,EAAE;QACrB;;WAEG;iBACY,MAAM,EAAE;QACvB;;WAEG;oBACe,MAAM,EAAE;MACzB;gBAEU,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO;IAK1D;;OAEG;IACH,WAAW;IA2BX;;;;OAIG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM;;;;;;;;;IA2BrC;;;;;;;;OAQG;IACG,wBAAwB,CAC7B,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE;QACT,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,IAAI,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC;KACxB;CA2GF"}

package/dist/utils.js

@@ -95,44 +95,53 @@ export class PackageManager {
                 if (dependencyInfo === null) {
                     console.log(`${packageName} is missing, we will automatically install it for you.`);
                     this.commands.devInstall.push(`${packageName}@"${packageConstraintRange}"`);
-                    return resolve(true);
+                    resolve(true);
+                    return;
                 }
                 if (greaterThanRange(dependencyInfo.currentVersion, packageConstraintRange)) {
                     console.log(`The package ${packageName} is already installed and is newer than the requested version. You may encounter issues with your testing setup.`);
-                    return reject(new Error("NEWER_PACKAGE_FOUND"));
+                    reject(new Error("NEWER_PACKAGE_FOUND"));
+                    return;
                 }
                 if (lessThanRange(dependencyInfo.currentVersion, packageConstraintRange)) {
                     console.log(`The package ${packageName} is already installed and is older than the requested version. You should manually update the package to match the range: ${packageConstraintRange}.`);
-                    return reject(new Error("OLDER_PACKAGE_FOUND"));
+                    reject(new Error("OLDER_PACKAGE_FOUND"));
+                    return;
                 }
                 console.log(`An acceptable version of ${packageName} is already installed, skipping...`);
-                return resolve(false);
+                resolve(false);
+                return;
             }
             if (dependencyInfo === null) {
                 console.log(`${packageName} is missing, we will automatically install it for you.`);
                 this.commands.install.push(`${packageName}@"${packageConstraintRange}"`);
-                return resolve(true);
+                resolve(true);
+                return;
             }
             const isFoundAsDevDependency = dependencyInfo.type === "dev";
             if (greaterThanRange(dependencyInfo.currentVersion, packageConstraintRange)) {
                 console.log(`The package ${packageName} is already installed and is newer than the requested version. You may encounter issues with your testing setup.${isFoundAsDevDependency
                     ? ` You should also move this dependency to be a normal dependency.`
                     : ""}`);
-                return reject(new Error("NEWER_PACKAGE_FOUND"));
+                reject(new Error("NEWER_PACKAGE_FOUND"));
+                return;
             }
             if (lessThanRange(dependencyInfo.currentVersion, packageConstraintRange)) {
                 console.log(`The package ${packageName} is already installed and is older than the requested version. You should manually update the package to match the range: ${packageConstraintRange}.${isFoundAsDevDependency
                     ? ` You should also move this dependency to be a normal dependency.`
                     : ""}`);
-                return reject(new Error("OLDER_PACKAGE_FOUND"));
+                reject(new Error("OLDER_PACKAGE_FOUND"));
+                return;
             }
             if (isFoundAsDevDependency) {
                 console.log(`An acceptable version of ${packageName} is already installed, updating it to a normal dependency...`);
                 this.commands.install.push(`${packageName}@"${packageConstraintRange}"`);
-                return resolve(true);
+                resolve(true);
+                return;
             }
             console.log(`An acceptable version of ${packageName} is already installed, skipping...`);
-            return resolve(false);
+            resolve(false);
+            return;
         });
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@atomicsmash/init-testing",
 	"type": "module",
-	"version": "2.1.2",
+	"version": "2.1.3",
 	"description": "Allow us to easily add automated testing setup to any npm setup.",
 	"keywords": [
 		"atomic",
@@ -43,8 +43,8 @@
 		"lint:types": "tsc"
 	},
 	"dependencies": {
-		"semver": "^7.7.3",
-		"yargs": "^17.7.2"
+		"semver": "^7.7.4",
+		"yargs": "^18.0.0"
 	},
 	"devDependencies": {
 		"@types/semver": "^7.7.1",

package/toCopy/tests/e2e/example/example.test.mts

@@ -1,18 +1,20 @@
-import { test, expect } from '@playwright/test';
+import { test, expect } from "@playwright/test";
 
-test('has title', async ({ page }) => {
-  await page.goto('https://playwright.dev/');
+test("has title", async ({ page }) => {
+	await page.goto("https://playwright.dev/");
 
-  // Expect a title "to contain" a substring.
-  await expect(page).toHaveTitle(/Playwright/);
+	// Expect a title "to contain" a substring.
+	await expect(page).toHaveTitle(/Playwright/);
 });
 
-test('get started link', async ({ page }) => {
-  await page.goto('https://playwright.dev/');
+test("get started link", async ({ page }) => {
+	await page.goto("https://playwright.dev/");
 
-  // Click the get started link.
-  await page.getByRole('link', { name: 'Get started' }).click();
+	// Click the get started link.
+	await page.getByRole("link", { name: "Get started" }).click();
 
-  // Expects page to have a heading with the name of Installation.
-  await expect(page.getByRole('heading', { name: 'Installation' })).toBeVisible();
+	// Expects page to have a heading with the name of Installation.
+	await expect(
+		page.getByRole("heading", { name: "Installation" }),
+	).toBeVisible();
 });