@fishawack/lab-env 4.39.0-beta.5 → 4.39.0-beta.7

package/globals.js

@@ -39,6 +39,7 @@ var repo;
 var platform;
 var pkg;
 var composer;
+var wordpress;
 var docker;
 var exec;
 var running;
@@ -55,7 +56,7 @@ try {
     config = JSON.parse(
         readFileSync(`${os.homedir()}/.lab-env`, { encoding: "utf8" }),
     );
-} catch (e) {
+} catch {
     config = {};
 }
 
@@ -64,7 +65,7 @@ try {
         process.env.BRANCH ||
         process.env.CI_COMMIT_REF_NAME ||
         require("git-branch").sync();
-} catch (e) {
+} catch {
     branch = "unknown";
 }
 
@@ -74,25 +75,31 @@ try {
             encoding: "utf8",
             stdio: "pipe",
         }).trim() || path.basename(cwd);
-} catch (e) {
+} catch {
     repo = path.basename(cwd);
 }
 
 process.env.REPO = process.env.REPO || repo;
 
-const repo_safe = repo.replace(/\./g, "");
+const repoSafe = repo.replace(/\./g, "");
 
 try {
     pkg = require(path.join(cwd, "package.json"));
-} catch (e) {}
+} catch {
+    /* empty */
+}
 
 try {
     composer = require(path.join(cwd, "composer.json"));
-} catch (e) {}
+} catch {
+    /* empty */
+}
 
 try {
     wordpress = existsSync(path.join(cwd, "wp-content/"));
-} catch (e) {}
+} catch {
+    /* empty */
+}
 
 if (composer && composer.require && composer.require["laravel/framework"]) {
     platform = "laravel";
@@ -118,7 +125,9 @@ if (composer && composer.require && composer.require["laravel/framework"]) {
             args[0] !== "--help" &&
             args[0] !== "new" &&
             args[0] !== "key" &&
-            args[0] !== "dekey"
+            args[0] !== "dekey" &&
+            args[0] !== "lint" &&
+            args[0] !== "pretty"
         ) {
             if (!args.find((d) => d === "--force")) {
                 console.log(
@@ -166,7 +175,9 @@ if (composer && composer.require && composer.require["laravel/framework"]) {
             args[0] !== "--help" &&
             args[0] !== "new" &&
             args[0] !== "key" &&
-            args[0] !== "dekey"
+            args[0] !== "dekey" &&
+            args[0] !== "lint" &&
+            args[0] !== "pretty"
         ) {
             if (!args.find((d) => d === "--force")) {
                 console.log(
@@ -190,7 +201,9 @@ if (composer && composer.require && composer.require["laravel/framework"]) {
             );
             process.exit(1);
         }
-    } catch (e) {}
+    } catch {
+        /* empty */
+    }
 
     platform = "core";
 }
@@ -224,7 +237,9 @@ if (process.env.FW_NEXT) {
         args[0] !== "--help" &&
         args[0] !== "new" &&
         args[0] !== "key" &&
-        args[0] !== "dekey"
+        args[0] !== "dekey" &&
+        args[0] !== "lint" &&
+        args[0] !== "pretty"
     ) {
         if (!args.find((d) => d === "--force")) {
             console.log(
@@ -304,7 +319,7 @@ process.env.FW_CORE_1_CONTEXT =
 let contextOverride = path.join(cwd, "_Docker/core/1/");
 if (existsSync(path.join(contextOverride, "Dockerfile"))) {
     process.env.FW_CORE_1_CONTEXT = contextOverride;
-    process.env.FW_CORE_1_IMAGE += `-${repo_safe}`;
+    process.env.FW_CORE_1_IMAGE += `-${repoSafe}`;
 }
 
 process.env.FW_LARAVEL_8_NGINX_CONTEXT =
@@ -313,7 +328,7 @@ process.env.FW_LARAVEL_8_NGINX_CONTEXT =
 contextOverride = path.join(cwd, "_Docker/laravel/8/nginx");
 if (existsSync(path.join(contextOverride, "Dockerfile"))) {
     process.env.FW_LARAVEL_8_NGINX_CONTEXT = contextOverride;
-    process.env.FW_LARAVEL_8_NGINX_IMAGE += `-${repo_safe}`;
+    process.env.FW_LARAVEL_8_NGINX_IMAGE += `-${repoSafe}`;
     process.env.FW_LARAVEL_8_NGINX_VERSION = require(
         `${contextOverride}/package.json`,
     ).version;
@@ -326,7 +341,7 @@ process.env.FW_ADONIS_0_NGINX_CONTEXT =
 contextOverride = path.join(cwd, "_Docker/adonis/0/nginx");
 if (existsSync(path.join(contextOverride, "Dockerfile"))) {
     process.env.FW_ADONIS_0_NGINX_CONTEXT = contextOverride;
-    process.env.FW_ADONIS_0_NGINX_IMAGE += `-${repo_safe}`;
+    process.env.FW_ADONIS_0_NGINX_IMAGE += `-${repoSafe}`;
     process.env.FW_ADONIS_0_NGINX_VERSION = require(
         `${contextOverride}/package.json`,
     ).version;
@@ -338,7 +353,7 @@ process.env.FW_ADONIS_0_NODE_CONTEXT =
 contextOverride = path.join(cwd, "_Docker/adonis/0/node");
 if (existsSync(path.join(contextOverride, "Dockerfile"))) {
     process.env.FW_ADONIS_0_NODE_CONTEXT = contextOverride;
-    process.env.FW_ADONIS_0_NODE_IMAGE = `fishawack/lab-env-adonis-0-node-${repo_safe}`;
+    process.env.FW_ADONIS_0_NODE_IMAGE = `fishawack/lab-env-adonis-0-node-${repoSafe}`;
     process.env.FW_ADONIS_0_NODE_VERSION = require(
         `${contextOverride}/package.json`,
     ).version;
@@ -366,6 +381,34 @@ if (!existsSync(path.join(cwd, ".commitlintrc.json"))) {
     );
 }
 
+if (!existsSync(path.join(cwd, ".prettierignore"))) {
+    copyFileSync(
+        path.join(__dirname, ".prettierignore"),
+        path.join(cwd, ".prettierignore"),
+    );
+}
+
+if (!existsSync(path.join(cwd, ".prettierrc.js"))) {
+    copyFileSync(
+        path.join(__dirname, ".prettierrc.js"),
+        path.join(cwd, ".prettierrc.js"),
+    );
+}
+
+if (!existsSync(path.join(cwd, ".editorconfig"))) {
+    copyFileSync(
+        path.join(__dirname, ".editorconfig"),
+        path.join(cwd, ".editorconfig"),
+    );
+}
+
+if (!existsSync(path.join(cwd, "eslint.config.js"))) {
+    copyFileSync(
+        path.join(__dirname, "eslint.config.js"),
+        path.join(cwd, "eslint.config.js"),
+    );
+}
+
 // If docker-compose.yml exists in project _Docker folder append to end
 let localOverride = "";
 if (existsSync(path.join(cwd, "_Docker/docker-compose.yml"))) {
@@ -375,19 +418,19 @@ if (existsSync(path.join(cwd, "_Docker/docker-compose.yml"))) {
 if (platform === "laravel") {
     let container = `-f ${__dirname}/laravel/${process.env.VERSION_LARAVEL}/docker-compose.yml`;
 
-    docker = `docker compose --env-file ${path.join(cwd, ".env")} ${container} ${core} ${localOverride} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(cwd, ".env")} ${container} ${core} ${localOverride} -p ${repoSafe}`;
 } else if (platform === "wordpress") {
-    docker = `docker compose --env-file ${path.join(cwd, ".env")} -f ${__dirname}/wordpress/${process.env.VERSION_WORDPRESS}/docker-compose.yml ${core} ${localOverride} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(cwd, ".env")} -f ${__dirname}/wordpress/${process.env.VERSION_WORDPRESS}/docker-compose.yml ${core} ${localOverride} -p ${repoSafe}`;
 } else if (platform === "drupal") {
     let container = `-f ${__dirname}/drupal/9/docker-compose.yml`;
 
-    docker = `docker compose --env-file ${path.join(cwd, ".env")} ${container} ${core} ${localOverride} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(cwd, ".env")} ${container} ${core} ${localOverride} -p ${repoSafe}`;
 } else if (platform === "craftcms") {
-    docker = `docker compose --env-file ${path.join(cwd, ".env")} -f ${__dirname}/craftcms/3/docker-compose.yml ${core} ${localOverride} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(cwd, ".env")} -f ${__dirname}/craftcms/3/docker-compose.yml ${core} ${localOverride} -p ${repoSafe}`;
 } else if (platform === "adonis") {
-    docker = `docker compose --env-file ${path.join(cwd, ".env")} -f ${__dirname}/adonis/0/docker-compose.yml ${core} ${localOverride} -p ${repo_safe}`;
+    docker = `docker compose --env-file ${path.join(cwd, ".env")} -f ${__dirname}/adonis/0/docker-compose.yml ${core} ${localOverride} -p ${repoSafe}`;
 } else {
-    docker = `docker compose ${core} ${localOverride} -p ${repo_safe}`;
+    docker = `docker compose ${core} ${localOverride} -p ${repoSafe}`;
 }
 
 try {
@@ -412,7 +455,9 @@ if (
     args[0] !== "--help" &&
     args[0] !== "new" &&
     args[0] !== "key" &&
-    args[0] !== "dekey"
+    args[0] !== "dekey" &&
+    args[0] !== "lint" &&
+    args[0] !== "pretty"
 ) {
     // Stop here if diagnosis either unset or outdated
     if (
@@ -475,10 +520,10 @@ module.exports = {
     diagnosis,
     services,
     platform,
-    volumes: volumes.map((d) => `${repo_safe}_${d}`),
+    volumes: volumes.map((d) => `${repoSafe}_${d}`),
     repo,
     branch,
-    repo_safe,
+    repoSafe,
     pkg,
     docker,
     exec,
@@ -527,7 +572,7 @@ module.exports = {
             }
         },
     },
-    up(cb, err) {
+    up(cb) {
         let alreadyRunning = running;
 
         if (!running) {
@@ -537,6 +582,7 @@ module.exports = {
 
         try {
             cb();
+            // eslint-disable-next-line no-useless-catch
         } catch (e) {
             throw e;
         } finally {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fishawack/lab-env",
-    "version": "4.39.0-beta.5",
+    "version": "4.39.0-beta.7",
     "description": "Docker manager for FW",
     "main": "cli.js",
     "scripts": {