feat(config): use conf.d for unified config

Author: ginkoid

.dockerignore

@@ -6,17 +6,25 @@ yarn-error.log*
 
 /dist
 /.env
-/.config.json
 /data
+/conf.d/*
+!/conf.d/.keep
+
+# Upload provider dir
+/uploads
 
 .DS_Store
 Thumbs.db
 ehthumbs.db
 Desktop.ini
 $RECYCLE.BIN
+/package-lock.json
 
 *.swp
 
 # nyc test runner
 /.nyc_output
 /coverage
+
+# preact-cli build size plugin
+size-plugin.json

.env.example

@@ -75,13 +75,11 @@ jobs:
 
     - name: Load configuration
       run: |
-        cp .env.example .env
-        cp -r .rdeploy.example .rdeploy
-        cp -r config/yml.example config/yml
+        cp test/conf-test.yaml conf.d
 
     - name: Run migrations
       run: |
-        yarn migrate up
+        yarn migrate
 
     - name: Build
       run: |

.github/workflows/ci.yml

@@ -1,21 +1,18 @@
-# rDeploy files
-/.rdeploy
-
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
 /node_modules
 
 /dist
-/build
 /.env
 /data
+/conf.d/*
+!/conf.d/.keep
+
 # Upload provider dir
 /uploads
 
-/config/yml/*.yml
-
 .DS_Store
 Thumbs.db
 ehthumbs.db

.gitignore

@@ -1,5 +1,5 @@
 const mustache = require('mustache')
-const config = require('../../../config/client')
+const { default: config } = require('../../../dist/server/config/client')
 
 module.exports = function (source) {
   // FIXME: refactor this (copy-pasted from server)

.rdeploy.example/config.json

@@ -1,4 +1,3 @@
-import config from '../config'
 import { request, handleResponse } from './util'
 
 export const privateProfile = async () => {
@@ -8,7 +7,7 @@ export const privateProfile = async () => {
 }
 
 export const pendingPrivateProfile = async ({ authToken }) => {
-  const { data } = await (await fetch(`${config.apiEndpoint}/users/me`, {
+  const { data } = await (await fetch('/api/v1/users/me', {
     headers: {
       authorization: `Bearer ${authToken}`
     }