chore: make the project structure more consistent

Author: manekinekko

src/auth/routes/app_auth_login_provider.ts

@@ -1,4 +1,4 @@
-import { response } from "../../utils";
+import { response } from "../../core/utils";
 
 const fs = require("fs").promises;
 const path = require("path");

src/auth/routes/app_auth_logout.ts

@@ -1,4 +1,4 @@
-import { response } from "../../utils";
+import { response } from "../../core/utils";
 const SWA_CLI_HOST = "http://localhost:" + process.env.SWA_CLI_PORT;
 
 const httpTrigger = async function (context: Context, req: ServerRequest) {

src/auth/routes/app_auth_me.ts

@@ -1,4 +1,4 @@
-import { decodeCookie, response, validateCookie } from "../../utils";
+import { decodeCookie, response, validateCookie } from "../../core/utils";
 
 const httpTrigger = async function (context: Context, req: ServerRequest) {
   const { cookie } = req.headers;

src/auth/server.ts

@@ -1,5 +1,5 @@
 import { createServer, ServerResponse } from "http";
-import { argv, serializeCookie } from "../utils";
+import { argv, serializeCookie } from "../core/utils";
 import url from "url";
 
 const port = argv<number>("--port") || 4242;

src/cli/commands/start.ts

@@ -1,10 +1,10 @@
 import fs from "fs";
 import path from "path";
 import shell from "shelljs";
-import builder from "../../builder";
-import { createRuntimeHost } from "../../runtimeHost";
-import { getBin, isHttpUrl, isPortAvailable, parseUrl, readConfigFile, validateDevServerConfig } from "../../utils";
-import { DEFAULT_CONFIG } from "../config";
+import builder from "../../core/builder";
+import { createRuntimeHost } from "../../core/runtimeHost";
+import { getBin, isHttpUrl, isPortAvailable, parseUrl, readConfigFile, validateDevServerConfig } from "../../core/utils";
+import { DEFAULT_CONFIG } from "../../config";
 
 export async function start(startContext: string, program: CLIConfig) {
   let useAppDevServer = undefined;
@@ -134,7 +134,7 @@ export async function start(startContext: string, program: CLIConfig) {
     `-c 'bgYellow.bold,bgMagenta.bold,bgCyan.bold,bgGreen.bold'`,
 
     // start the reverse proxy
-    `"node ../proxy.js"`,
+    `"node ../proxy/server.js"`,
 
     // emulate auth
     `"node ../auth/server.js --host=${program.host} --port=${authPort}"`,

src/cli/index.ts

@@ -4,9 +4,9 @@ const [, , ...args] = process.argv;
 process.title = ["swa", ...args].join(" ");
 
 import program from "commander";
-import { parsePort } from "../utils";
+import { parsePort } from "../core/utils";
 import { start } from "./commands/start";
-import { DEFAULT_CONFIG } from "./config";
+import { DEFAULT_CONFIG } from "../config";
 
 (async function () {
   const cli: CLIConfig & program.Command = program

src/cli/config.ts src/config.tssrc/cli/config.ts renamed to src/config.ts

@@ -1,4 +1,4 @@
-import { DEFAULT_CONFIG } from "./cli/config";
+import { DEFAULT_CONFIG } from "../config";
 import { detectRuntime, RuntimeType } from "./runtimes";
 import { getBin } from "./utils";