@nocobase/cli 1.2.38-alpha → 1.2.39-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.2.38-alpha",
+  "version": "1.2.39-alpha",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
@@ -8,7 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.2.38-alpha",
+    "@nocobase/app": "1.2.39-alpha",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -25,12 +25,12 @@
     "tsx": "^4.6.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "1.2.38-alpha"
+    "@nocobase/devtools": "1.2.39-alpha"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "8dad44e01936302b5cc7f9bf342f0321c4167f44"
+  "gitHead": "ed76c0c552c58bff45b85601cebff4c4bd80c8cd"
 }

package/src/util.js

@@ -16,6 +16,7 @@ const { readFile, writeFile } = require('fs').promises;
 const { existsSync, mkdirSync, cpSync, writeFileSync } = require('fs');
 const dotenv = require('dotenv');
 const fs = require('fs');
+const moment = require('moment-timezone');
 
 exports.isPackageValid = (pkg) => {
   try {
@@ -296,6 +297,25 @@ function buildIndexHtml(force = false) {
 
 exports.buildIndexHtml = buildIndexHtml;
 
+function getTimezonesByOffset(offset) {
+  if (!/^[+-]\d{1,2}:\d{2}$/.test(offset)) {
+    return offset;
+  }
+  const offsetMinutes = moment.duration(offset).asMinutes();
+  return moment.tz.names().find((timezone) => {
+    return moment.tz(timezone).utcOffset() === offsetMinutes;
+  });
+}
+
+function areTimeZonesEqual(timeZone1, timeZone2) {
+  if (timeZone1 === timeZone2) {
+    return true;
+  }
+  timeZone1 = getTimezonesByOffset(timeZone1);
+  timeZone2 = getTimezonesByOffset(timeZone2);
+  return moment.tz(timeZone1).format() === moment.tz(timeZone2).format();
+}
+
 exports.initEnv = function initEnv() {
   const env = {
     APP_ENV: 'development',
@@ -305,7 +325,7 @@ exports.initEnv = function initEnv() {
     API_CLIENT_STORAGE_PREFIX: 'NOCOBASE_',
     DB_DIALECT: 'sqlite',
     DB_STORAGE: 'storage/db/nocobase.sqlite',
-    DB_TIMEZONE: '+00:00',
+    // DB_TIMEZONE: '+00:00',
     DB_UNDERSCORED: parseEnv('DB_UNDERSCORED'),
     DEFAULT_STORAGE_TYPE: 'local',
     LOCAL_STORAGE_DEST: 'storage/uploads',
@@ -376,4 +396,19 @@ exports.initEnv = function initEnv() {
     process.env.API_BASE_URL = process.env.APP_SERVER_BASE_URL + process.env.API_BASE_PATH;
     process.env.__env_modified__ = true;
   }
+
+  if (!process.env.TZ) {
+    const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+    process.env.TZ = getTimezonesByOffset(process.env.DB_TIMEZONE || timeZone);
+  }
+
+  if (!process.env.DB_TIMEZONE) {
+    process.env.DB_TIMEZONE = process.env.TZ;
+  }
+
+  if (!areTimeZonesEqual(process.env.DB_TIMEZONE, process.env.TZ)) {
+    throw new Error(
+      `process.env.DB_TIMEZONE="${process.env.DB_TIMEZONE}" and process.env.TZ="${process.env.TZ}" are different`,
+    );
+  }
 };