@elementor/wp-lite-env 0.0.15 → 0.0.17

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # wp-lite-env
 
+## 0.0.17
+
+### Patch Changes
+
+- 34f7b7c: code review fixes
+- a021f2d: code review fixes
+
+## 0.0.16
+
+### Patch Changes
+
+- 8d278b0: clean up only after stopping the server
+
 ## 0.0.15
 
 ### Patch Changes

package/__tests__/e2e.ts

@@ -1,15 +1,14 @@
 import {afterEach, beforeAll, describe, expect, test} from "@jest/globals";
-import {cleanup, generateFiles, getConfigFilePath, start, stop} from "../src/run";
+import {generateFiles, getConfigFilePath, start, stop} from "../src/run";
 
 const port = '1234';
 
 describe('end to end tests', () => {
     beforeAll(async () => {
-        generateFiles(port, getConfigFilePath(['', '', '', 'config=./tests/.wp-lite-env.json']));
+        generateFiles(port, getConfigFilePath(['', '', '', 'config=./__tests__/.wp-lite-env.json']));
     })
     afterEach(async () => {
         await stop(port);
-        cleanup(port);
     }, 30000);
     test('WordPress is up and running', async () => {
         await start( port );

package/dist/bin.cjs

@@ -185,10 +185,13 @@ var waitForServer = async (url, timeoutMs) => {
         return true;
       }
     } catch (e) {
+      console.warn(`Encountered an error while waiting for server to start: ${e.message}
+Trying to reach server again.`);
     } finally {
       await sleep(100);
     }
   }
+  console.error(`Server did not start within ${timeoutMs}ms`);
   return false;
 };
 var getRunPath = (port2) => import_path2.default.resolve(import_node_os.default.tmpdir(), port2);
@@ -200,7 +203,7 @@ var start = async (port2) => {
     cwd: runPath,
     log: true
   });
-  await waitForServer(`http://localhost:${port2}`, 1e4);
+  await waitForServer(`http://0.0.0.0:${port2}`, 1e4);
   await cli(port2, "bash wp-config/configure-wp.sh");
 };
 var stop = async (port2) => {
@@ -211,6 +214,7 @@ var stop = async (port2) => {
     composeOptions: ["-p", `port${port2}`],
     log: true
   });
+  cleanup(port2);
 };
 var cli = async (port2, command2) => {
   const runPath = getRunPath(port2);
@@ -283,7 +287,5 @@ var port = getPort(process.argv);
 var configFilePath = getConfigFilePath(process.argv);
 var cliCommand = getCliCommand(process.argv);
 generateFiles(port, configFilePath);
-commandMap[command](port, cliCommand).finally(() => {
-  cleanup(port);
-});
+commandMap[command](port, cliCommand);
 //# sourceMappingURL=bin.cjs.map

package/dist/bin.js

@@ -1,12 +1,11 @@
 #!/usr/bin/env node
 import {
-  cleanup,
   commandMap,
   generateFiles,
   getCliCommand,
   getConfigFilePath,
   getPort
-} from "./chunk-BYFZ2VGL.js";
+} from "./chunk-MP53H5K3.js";
 
 // src/bin.ts
 var command = process.argv[2];
@@ -17,7 +16,5 @@ var port = getPort(process.argv);
 var configFilePath = getConfigFilePath(process.argv);
 var cliCommand = getCliCommand(process.argv);
 generateFiles(port, configFilePath);
-commandMap[command](port, cliCommand).finally(() => {
-  cleanup(port);
-});
+commandMap[command](port, cliCommand);
 //# sourceMappingURL=bin.js.map

package/dist/{chunk-BYFZ2VGL.js → chunk-MP53H5K3.js}

@@ -161,10 +161,13 @@ var waitForServer = async (url, timeoutMs) => {
         return true;
       }
     } catch (e) {
+      console.warn(`Encountered an error while waiting for server to start: ${e.message}
+Trying to reach server again.`);
     } finally {
       await sleep(100);
     }
   }
+  console.error(`Server did not start within ${timeoutMs}ms`);
   return false;
 };
 var getRunPath = (port) => path2.resolve(os.tmpdir(), port);
@@ -176,7 +179,7 @@ var start = async (port) => {
     cwd: runPath,
     log: true
   });
-  await waitForServer(`http://localhost:${port}`, 1e4);
+  await waitForServer(`http://0.0.0.0:${port}`, 1e4);
   await cli(port, "bash wp-config/configure-wp.sh");
 };
 var stop = async (port) => {
@@ -187,6 +190,7 @@ var stop = async (port) => {
     composeOptions: ["-p", `port${port}`],
     log: true
   });
+  cleanup(port);
 };
 var cli = async (port, command) => {
   const runPath = getRunPath(port);
@@ -258,7 +262,6 @@ export {
   generateFiles,
   getConfigFilePath,
   getCliCommand,
-  getPort,
-  cleanup
+  getPort
 };
-//# sourceMappingURL=chunk-BYFZ2VGL.js.map
+//# sourceMappingURL=chunk-MP53H5K3.js.map

package/dist/index.cjs

@@ -38,6 +38,7 @@ module.exports = __toCommonJS(src_exports);
 // src/run.ts
 var import_docker_compose = require("docker-compose");
 var import_path = __toESM(require("path"), 1);
+var import_fs = __toESM(require("fs"), 1);
 var import_node_os = __toESM(require("os"), 1);
 var waitForServer = async (url, timeoutMs) => {
   const startTime = Date.now();
@@ -49,10 +50,13 @@ var waitForServer = async (url, timeoutMs) => {
         return true;
       }
     } catch (e) {
+      console.warn(`Encountered an error while waiting for server to start: ${e.message}
+Trying to reach server again.`);
     } finally {
       await sleep(100);
     }
   }
+  console.error(`Server did not start within ${timeoutMs}ms`);
   return false;
 };
 var getRunPath = (port) => import_path.default.resolve(import_node_os.default.tmpdir(), port);
@@ -64,7 +68,7 @@ var start = async (port) => {
     cwd: runPath,
     log: true
   });
-  await waitForServer(`http://localhost:${port}`, 1e4);
+  await waitForServer(`http://0.0.0.0:${port}`, 1e4);
   await cli(port, "bash wp-config/configure-wp.sh");
 };
 var stop = async (port) => {
@@ -75,6 +79,7 @@ var stop = async (port) => {
     composeOptions: ["-p", `port${port}`],
     log: true
   });
+  cleanup(port);
 };
 var cli = async (port, command) => {
   const runPath = getRunPath(port);
@@ -85,6 +90,12 @@ var cli = async (port, command) => {
     log: true
   });
 };
+var getWpConfigPath = (port) => import_path.default.resolve(process.cwd(), port);
+var cleanup = (port) => {
+  const runPath = getRunPath(port);
+  import_fs.default.rmSync(getWpConfigPath(port), { recursive: true, force: true });
+  import_fs.default.rmSync(runPath, { recursive: true, force: true });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cli,

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   cli,
   start,
   stop
-} from "./chunk-BYFZ2VGL.js";
+} from "./chunk-MP53H5K3.js";
 export {
   cli,
   start,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementor/wp-lite-env",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "private": false,
   "description": "A simple, lightweight, docker-based WordPress environment",
   "main": "dist/index.cjs",

package/src/bin.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import {cleanup, commandMap, generateFiles, getCliCommand, getConfigFilePath, getPort} from './run';
+import {commandMap, generateFiles, getCliCommand, getConfigFilePath, getPort} from './run';
 
 const command = process.argv[ 2 ];
 if ( ! commandMap[ command ] ) {
@@ -12,6 +12,4 @@ const configFilePath = getConfigFilePath( process.argv )
 const cliCommand = getCliCommand( process.argv );
 generateFiles( port, configFilePath );
 
-commandMap[command](port, cliCommand).finally( () => {
-	cleanup( port );
-} );
+commandMap[command](port, cliCommand);

package/src/run.ts

@@ -21,12 +21,13 @@ const waitForServer = async ( url: string, timeoutMs: number ) => {
             if ( response.ok && ( 200 === response.status || 302 === response.status ) ) {
                 return true;
             }
-        } catch ( e ) { // eslint-disable-line @typescript-eslint/no-unused-vars
-            // Ignore
+        } catch ( e ) {
+            console.warn( `Encountered an error while waiting for server to start: ${ e.message }\nTrying to reach server again.` );
         } finally {
             await sleep( 100 );
         }
     }
+    console.error( `Server did not start within ${ timeoutMs }ms` );
     return false;
 };
 
@@ -40,7 +41,7 @@ export const start = async ( port: string ) => {
         cwd: runPath,
         log: true,
     } );
-    await waitForServer( `http://localhost:${ port }`, 10000 );
+    await waitForServer( `http://0.0.0.0:${ port }`, 10000 );
     await cli( port, 'bash wp-config/configure-wp.sh' );
 };
 
@@ -52,6 +53,7 @@ export const stop = async ( port: string ) => {
         composeOptions: [ '-p', `port${ port }` ],
         log: true,
     } );
+    cleanup( port );
 };
 
 export const cli = async ( port: string, command: string ) => {
@@ -124,7 +126,7 @@ export const getPort = ( processArgs: string[] ) => {
     return getArgument( 'port', processArgs ) || '8888';
 };
 
-export const cleanup = ( port: string ) => {
+const cleanup = ( port: string ) => {
     const runPath = getRunPath( port );
     fs.rmSync( getWpConfigPath( port ), { recursive: true, force: true } );
     fs.rmSync( runPath, { recursive: true, force: true } );