@dword-design/base-config-app 3.0.0 → 4.0.1

package/dist/get-ecosystem-config.js

@@ -1,16 +1,14 @@
 import fs from 'fs-extra';
 import hostedGitInfo from 'hosted-git-info';
-import loadPkg from 'load-pkg';
 import parseGitConfig from 'parse-git-config';
 import parsePackagejsonName from 'parse-packagejson-name';
-export default (() => {
+export default (packageConfig => {
   var _parseGitConfig$sync$;
   const repositoryUrl = fs.existsSync('.git') ? (_parseGitConfig$sync$ = parseGitConfig.sync()['remote "origin"']) === null || _parseGitConfig$sync$ === void 0 ? void 0 : _parseGitConfig$sync$.url : undefined;
   const gitInfo = hostedGitInfo.fromUrl(repositoryUrl) || {};
   if (repositoryUrl !== undefined && gitInfo.type !== 'github') {
     throw new Error('Only GitHub repositories are supported.');
   }
-  const packageConfig = loadPkg.sync();
   const packageName = parsePackagejsonName(packageConfig.name).fullName;
   return {
     apps: [{

package/dist/get-nginx-config.js

@@ -0,0 +1,22 @@
+import endent from "@dword-design/functions/dist/endent.js";
+import parsePackagejsonName from 'parse-packagejson-name';
+export default (packageConfig => {
+  const packageName = parsePackagejsonName(packageConfig.name).fullName;
+  return endent`
+    upstream web {
+      server web:3000;
+    }
+
+    server {
+      listen 80;
+      server_name ${packageName}.test;
+
+      location / {
+          proxy_pass http://web;
+          proxy_set_header Host $host;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      }
+    }
+
+  `;
+});

package/dist/index.js

@@ -1,4 +1,4 @@
-import baseConfigNuxt from '@dword-design/base-config-nuxt';
+import getBaseConfigNuxt from '@dword-design/base-config-nuxt';
 import packageName from 'depcheck-package-name';
 import { execaCommand } from 'execa';
 import loadPkg from 'load-pkg';
@@ -6,58 +6,61 @@ import outputFiles from 'output-files';
 import yaml from 'yaml';
 import dockerCompose from "./docker-compose.js";
 import getEcosystemConfig from "./get-ecosystem-config.js";
-import nginxConfig from "./nginx-config.js";
-const packageConfig = loadPkg.sync();
-export default {
-  ...baseConfigNuxt,
-  allowedMatches: [...baseConfigNuxt.allowedMatches, 'docker-compose.yml', 'ecosystem.json', 'nginx'],
-  editorIgnore: [...baseConfigNuxt.editorIgnore, 'docker-compose.yml', 'ecosystem.json', 'nginx'],
-  gitignore: [...baseConfigNuxt.gitignore, '/.ceilingrc.json', '/nginx/default.config'],
-  isLockFileFixCommitType: true,
-  npmPublish: false,
-  packageConfig: {
-    main: 'dist/index.js'
-  },
-  prepare: async () => {
-    await baseConfigNuxt.prepare();
-    return outputFiles({
-      'docker-compose.yml': yaml.stringify(dockerCompose),
-      'ecosystem.json': JSON.stringify(getEcosystemConfig(), undefined, 2),
-      'nginx/default.config': JSON.stringify(nginxConfig, undefined, 2)
-    });
-  },
-  useJobMatrix: false,
-  ...(!packageConfig.private && {
-    deployPlugins: [[packageName`@semantic-release/exec`, {
-      publishCmd: `${packageName`pm2`} deploy production --force`
-    }]],
-    preDeploySteps: [{
-      uses: 'webfactory/ssh-agent@v0.5.1',
-      with: {
-        'ssh-private-key': '${{ secrets.SSH_PRIVATE_KEY }}'
-      }
-    }, {
-      run: 'ssh-keyscan sebastianlandwehr.com >> ~/.ssh/known_hosts'
-    }]
-  }),
-  commands: {
-    ...baseConfigNuxt.commands,
-    pull: {
-      arguments: '<endpoint>',
-      handler: endpoint => execaCommand(`ceiling pull ${endpoint}`, {
-        stdio: 'inherit'
-      })
+import getNginxConfig from "./get-nginx-config.js";
+export default (config => {
+  const baseConfigNuxt = getBaseConfigNuxt(config);
+  const packageConfig = loadPkg.sync();
+  return {
+    ...baseConfigNuxt,
+    allowedMatches: [...baseConfigNuxt.allowedMatches, 'docker-compose.yml', 'ecosystem.json', 'nginx'],
+    editorIgnore: [...baseConfigNuxt.editorIgnore, 'docker-compose.yml', 'ecosystem.json', 'nginx'],
+    gitignore: [...baseConfigNuxt.gitignore, '/.ceilingrc.json', '/nginx/default.config'],
+    isLockFileFixCommitType: true,
+    npmPublish: false,
+    packageConfig: {
+      main: 'dist/index.js'
     },
-    push: {
-      arguments: '<endpoint>',
-      handler: endpoint => execaCommand(`ceiling push ${endpoint}`, {
-        stdio: 'inherit'
-      })
+    prepare: async () => {
+      await baseConfigNuxt.prepare();
+      return outputFiles({
+        'docker-compose.yml': yaml.stringify(dockerCompose),
+        'ecosystem.json': JSON.stringify(getEcosystemConfig(packageConfig), undefined, 2),
+        'nginx/default.config': JSON.stringify(getNginxConfig(packageConfig), undefined, 2)
+      });
     },
-    setupDeploy: {
-      handler: () => execaCommand('pm2 deploy production setup', {
-        stdio: 'inherit'
-      })
+    useJobMatrix: false,
+    ...(!packageConfig.private && {
+      deployPlugins: [[packageName`@semantic-release/exec`, {
+        publishCmd: `${packageName`pm2`} deploy production --force`
+      }]],
+      preDeploySteps: [{
+        uses: 'webfactory/ssh-agent@v0.5.1',
+        with: {
+          'ssh-private-key': '${{ secrets.SSH_PRIVATE_KEY }}'
+        }
+      }, {
+        run: 'ssh-keyscan sebastianlandwehr.com >> ~/.ssh/known_hosts'
+      }]
+    }),
+    commands: {
+      ...baseConfigNuxt.commands,
+      pull: {
+        arguments: '<endpoint>',
+        handler: endpoint => execaCommand(`ceiling pull ${endpoint}`, {
+          stdio: 'inherit'
+        })
+      },
+      push: {
+        arguments: '<endpoint>',
+        handler: endpoint => execaCommand(`ceiling push ${endpoint}`, {
+          stdio: 'inherit'
+        })
+      },
+      setupDeploy: {
+        handler: () => execaCommand('pm2 deploy production setup', {
+          stdio: 'inherit'
+        })
+      }
     }
-  }
-};
+  };
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dword-design/base-config-app",
-  "version": "3.0.0",
+  "version": "4.0.1",
   "repository": "dword-design/base-config-app",
   "funding": "https://github.com/sponsors/dword-design",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "test": "base test"
   },
   "dependencies": {
-    "@dword-design/base-config-nuxt": "^4.0.0",
-    "@dword-design/functions": "^4.0.0",
-    "@semantic-release/exec": "^5.0.0",
-    "ceiling": "^3.0.0",
-    "depcheck-package-name": "^3.0.0",
+    "@dword-design/base-config-nuxt": "^5.0.0",
+    "@dword-design/functions": "^5.0.20",
+    "@semantic-release/exec": "^6.0.3",
+    "ceiling": "^4.0.0",
+    "depcheck-package-name": "^3.0.1",
     "execa": "^7.1.1",
     "fs-extra": "^11.1.1",
     "hosted-git-info": "^6.1.1",
@@ -43,7 +43,7 @@
     "@dword-design/tester": "^2.0.9",
     "@dword-design/tester-plugin-puppeteer": "^2.1.19",
     "@dword-design/tester-plugin-tmp-dir": "^2.1.3",
-    "port-ready": "^0.1.0",
+    "nuxt-dev-ready": "^2.0.1",
     "tree-kill-promise": "^3.0.14"
   },
   "engines": {

package/dist/nginx-config.js

@@ -1,22 +0,0 @@
-import endent from "@dword-design/functions/dist/endent.js";
-import loadPkg from 'load-pkg';
-import parsePackagejsonName from 'parse-packagejson-name';
-const packageConfig = loadPkg.sync();
-const packageName = parsePackagejsonName(packageConfig.name).fullName;
-export default endent`
-  upstream web {
-    server web:3000;
-  }
-
-  server {
-    listen 80;
-    server_name ${packageName}.test;
-
-    location / {
-        proxy_pass http://web;
-        proxy_set_header Host $host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
-  }
-
-`;