@naturalcycles/backend-lib 9.0.7 → 9.0.8

package/dist/deploy/deployGae.js

@@ -1,5 +1,5 @@
 import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib';
-import { appendToGithubSummary, exec2 } from '@naturalcycles/nodejs-lib';
+import { appendToGithubSummary, exec2, fs2 } from '@naturalcycles/nodejs-lib';
 import { getBackendCfg } from './backend.cfg.util.js';
 import { createDeployInfo } from './deploy.util.js';
 import { deployHealthCheck } from './deployHealthCheck.js';
@@ -7,7 +7,8 @@ import { deployPrepare } from './deployPrepare.js';
 export async function deployGae(opt = {}) {
     const { logOnFailure, logOnSuccess } = opt;
     // 1. build
-    exec2.spawn('yarn build');
+    const packageManager = detectPackageManager();
+    exec2.spawn(`${packageManager} build`);
     // 2. deploy-prepare
     const deployInfo = await deployPrepare();
     const targetDir = './tmp/deploy';
@@ -76,3 +77,10 @@ function logs(gaeProject, gaeService, gaeVersion) {
     }
     catch { }
 }
+function detectPackageManager() {
+    const pj = fs2.readText('package.json');
+    if (pj.includes('pnpm')) {
+        return 'pnpm';
+    }
+    return 'yarn'; // yarn is still the default
+}

package/dist/deploy/deployPrepare.js

@@ -39,8 +39,9 @@ const DEFAULT_FILES = [
     'package.json',
     'yarn.lock',
     '.yarnrc',
-    'tsconfig.json', // for path-mapping to work!
-    'tsconfig.dist.json',
+    'pnpm-lock.yaml',
+    // 'tsconfig.json', // for path-mapping to work!
+    // 'tsconfig.dist.json',
     '.gcloudignore',
     'app.yaml',
     'patches', // to allow patch-package

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.0.7",
+  "version": "9.0.8",
   "peerDependencies": {
     "@sentry/node": "^9"
   },
@@ -24,7 +24,7 @@
     "simple-git": "^3"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "^18",
+    "@naturalcycles/dev-lib": "*",
     "@sentry/node": "^9",
     "@types/ejs": "^3",
     "fastify": "^5"
@@ -70,10 +70,10 @@
     "dev": "APP_ENV=dev tsx watch src/test/server/server.ts",
     "docs-serve": "NODE_OPTIONS=--openssl-legacy-provider vuepress dev docs",
     "docs-build": "NODE_OPTIONS=--openssl-legacy-provider vuepress build docs",
-    "deploy-gae": "yarn tsx src/bin/deploy-gae.ts",
-    "deploy-prepare": "yarn tsx src/bin/deploy-prepare.ts",
-    "deploy-prepare-debug": "AA=AA1 BB=BB1 yarn tsx src/bin/deploy-prepare.ts --projectDir ./src/test/project",
-    "deploy-health-check-debug1": "yarn tsx src/bin/deploy-health-check.ts --url https://api-master.naturalcycles.com",
-    "deploy-health-check-debug2": "yarn tsx src/bin/deploy-health-check.ts --url https://api-master2.naturalcycles.com --thresholdUnhealthy 5"
+    "deploy-gae": "tsx src/bin/deploy-gae.ts",
+    "deploy-prepare": "tsx src/bin/deploy-prepare.ts",
+    "deploy-prepare-debug": "AA=AA1 BB=BB1 tsx src/bin/deploy-prepare.ts --projectDir ./src/test/project",
+    "deploy-health-check-debug1": "tsx src/bin/deploy-health-check.ts --url https://api-master.naturalcycles.com",
+    "deploy-health-check-debug2": "tsx src/bin/deploy-health-check.ts --url https://api-master2.naturalcycles.com --thresholdUnhealthy 5"
   }
 }

package/src/deploy/deployGae.ts

@@ -1,5 +1,5 @@
 import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib'
-import { appendToGithubSummary, exec2 } from '@naturalcycles/nodejs-lib'
+import { appendToGithubSummary, exec2, fs2 } from '@naturalcycles/nodejs-lib'
 import { getBackendCfg } from './backend.cfg.util.js'
 import { createDeployInfo } from './deploy.util.js'
 import type { DeployHealthCheckOptions } from './deployHealthCheck.js'
@@ -14,7 +14,9 @@ export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
 
   // 1. build
 
-  exec2.spawn('yarn build')
+  const packageManager = detectPackageManager()
+
+  exec2.spawn(`${packageManager} build`)
 
   // 2. deploy-prepare
 
@@ -111,3 +113,11 @@ function logs(gaeProject: string, gaeService: string, gaeVersion: string): void
     )
   } catch {}
 }
+
+function detectPackageManager(): string {
+  const pj = fs2.readText('package.json')
+  if (pj.includes('pnpm')) {
+    return 'pnpm'
+  }
+  return 'yarn' // yarn is still the default
+}

package/src/deploy/deployPrepare.ts

@@ -54,8 +54,9 @@ const DEFAULT_FILES = [
   'package.json',
   'yarn.lock',
   '.yarnrc',
-  'tsconfig.json', // for path-mapping to work!
-  'tsconfig.dist.json',
+  'pnpm-lock.yaml',
+  // 'tsconfig.json', // for path-mapping to work!
+  // 'tsconfig.dist.json',
   '.gcloudignore',
   'app.yaml',
   'patches', // to allow patch-package