feat(cli): support dotenv at development mode.

searchfe · May 24, 2021 · 5a77568 · 5a77568
1 parent dd63b3b
commit 5a77568
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 5 deletions.
diff --git a/example/hoth-quickstart/src/config/developmemt.ts b/example/hoth-quickstart/src/config/developmemt.ts
@@ -0,0 +1,3 @@
+export = {
+    development: 1,
+};
diff --git a/example/hoth-quickstart/src/config/development-foo.ts b/example/hoth-quickstart/src/config/development-foo.ts
@@ -0,0 +1,3 @@
+export = {
+    foo: 1,
+};
diff --git a/nodemon.json b/nodemon.json
@@ -1,6 +1,6 @@
 {
     "watch": ["*.ts"],
-    "ignore": ["*.test.ts", "node_modules/*", "*.d.ts", "templates/*"],
+    "ignore": ["*.test.ts", "node_modules/*", "*.d.ts", "templates/*", "__tests__/*"],
     "ext": "ts,js",
     "exec": "yarn run build && NODE_ENV=development yarn run hoth start --app-dir='example/hoth-quickstart/dist' --app-name='quickstart'",
     "legacyWatch": true,

diff --git a/packages/app-autoload/src/index.ts b/packages/app-autoload/src/index.ts
@@ -75,6 +75,8 @@ async function load(appConfig: AppConfig, childInstance: FastifyInstance) {
         ...appConfig,
     });
 
+    console.log(config);
+
     const configProxy = {
         get(property: string | string[]) {
             const props = Array.isArray(property)

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -31,6 +31,7 @@
     "@hoth/utils": "^1.1.2",
     "chalk": "^4.1.0",
     "commist": "^1.1.0",
+    "dotenv": "^10.0.0",
     "fastify-warmup": "0.1.1",
     "generify": "^4.2.0",
     "help-me": "^2.0.0",

diff --git a/packages/cli/src/start.ts b/packages/cli/src/start.ts
@@ -118,7 +118,6 @@ async function runFastify(opts: Args) {
 
     let address;
     if (opts.address) {
-        // eslint-disable-next-line
         address = await fastifyInstance.listen(opts.port, opts.address);
     }
     else if (opts.socket) {
@@ -145,6 +144,10 @@ async function runFastify(opts: Args) {
 
 
 async function start(args: string[]) {
+    if (process.env.NODE_ENV === 'development') {
+        require('dotenv').config();
+    }
+
     const opts = parseArgs(args);
 
     if (opts.help) {

diff --git a/packages/view/src/__tests__/swig.ts b/packages/view/src/__tests__/swig.ts
@@ -11,7 +11,7 @@ describe('reply.render with swig engine', () => {
             engine: {
                 swig: Swig,
             },
-            rootPath: __dirname,
+            templatesDir: __dirname,
         });
 
         fastify.get('/', (req: FastifyRequest, reply: FastifyReply) => {
@@ -24,7 +24,7 @@ describe('reply.render with swig engine', () => {
         });
 
         expect(response.statusCode).toBe(200);
-        expect(response.headers['content-type']).toBe('text/html; charset=utf-8');
         expect(response.body).toBe('<h1>fastify</h1>\n<p>text</p>');
+        expect(response.headers['content-type']).toBe('text/html; charset=utf-8');
     });
 });
diff --git a/packages/view/tsconfig.json b/packages/view/tsconfig.json
@@ -3,5 +3,8 @@
     "compilerOptions": {
         "rootDir": "src",
         "outDir": "dist"
-    }
+    },
+    "references": [
+        { "path": "../decorators" }
+    ]
 }
diff --git a/yarn.lock b/yarn.lock
@@ -3672,6 +3672,11 @@ dot-prop@^6.0.1:
   dependencies:
     is-obj "^2.0.0"
 
+dotenv@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
+  integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"