Release: release/1.10 to develop (#1740)

@coderabbitai: ignore
apitable · May 7, 2024 · e7a0954 · e7a0954
2 parents 63051dc + e37c60c
commit e7a0954
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 432 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
   "typescript.tsdk": ".yarn/sdks/typescript/lib",
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "editor.formatOnSave": false,
   "[typescriptreact]": {

diff --git a/packages/datasheet/next.config.js b/packages/datasheet/next.config.js
@@ -38,7 +38,7 @@ const sentryWebpackPluginOptions = {
   release: process.env.WEB_CLIENT_VERSION ?? '',
   silent: false, // Suppresses all logs
   hideSourceMaps: true,
-  debug: true
+  debug: false
 
   // For all available options, see:
   // https://github.com/getsentry/sentry-webpack-plugin#options.
@@ -120,4 +120,4 @@ const plugins = [
 ];
 
 const config = () => plugins.reduce((acc, next) => next(acc), nextConfig);
-module.exports = isProd ? withSentryConfig(config, sentryWebpackPluginOptions, sentryWebpackPluginOptions) : config;
+module.exports = isProd && process.env.SENTRY_AUTH_TOKEN_VIKA ? withSentryConfig(config, sentryWebpackPluginOptions, sentryWebpackPluginOptions) : config;
diff --git a/packaging/Dockerfile.room-server b/packaging/Dockerfile.room-server
@@ -24,6 +24,7 @@ FROM apitable/node:v16.15.0 AS builder
 WORKDIR /app
 
 COPY --from=deps /app/node_modules ./node_modules
+COPY --from=deps /app/patches ./patches
 COPY --from=deps /app/packages/i18n-lang/node_modules ./packages/i18n-lang/node_modules
 COPY --from=deps /app/packages/core/node_modules ./packages/core/node_modules
 COPY --from=deps /app/packages/room-server/node_modules ./packages/room-server/node_modules

diff --git a/packaging/Dockerfile.storybook b/packaging/Dockerfile.storybook
@@ -16,6 +16,7 @@ FROM apitable/nodepy:16.15.0-alpine AS builder
 
 WORKDIR /app
 
+COPY --from=deps /workspace-install/patches ./patches
 COPY --from=deps /workspace-install/node_modules ./node_modules
 COPY --from=deps /workspace-install/packages/components/node_modules ./packages/components/node_modules
 

diff --git a/packaging/Dockerfile.web-server b/packaging/Dockerfile.web-server
@@ -39,6 +39,7 @@ WORKDIR /app
 COPY ./pnpm-workspace.yaml ./build.js ./package.json ./pnpm-lock.yaml ./nx.json ./common-tsconfig.json ./tsconfig.json ./.eslintrc ./
 COPY packages/ ./packages/
 
+COPY --from=deps /workspace-install/patches ./patches
 COPY --from=deps /workspace-install/node_modules ./node_modules
 COPY --from=deps /workspace-install/packages/datasheet/node_modules ./packages/datasheet/node_modules
 COPY --from=deps /workspace-install/packages/components/node_modules ./packages/components/node_modules