chore: fix env vars customizations in all-in-one image (baserow#4614)

* Fix production images

* Please linter and fix the use of the linter cache

* Polish frontend commands

* Remove build-local

* Fix dev server

* Address copilot feedback

Author: silvestrid

.github/workflows/ci.yml

@@ -235,7 +235,9 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run frontend lint
-        run: docker run --rm ${{ needs.build-frontend.outputs.image }} lint
+        run: |
+          docker run --rm \
+            ${{ needs.build-frontend.outputs.image }} lint
 
   dockerfile-lint:
     name: Dockerfile Lint (hadolint)
@@ -693,7 +695,7 @@ jobs:
             -e PRIVATE_BACKEND_URL=http://backend:8000 \
             -e FEATURE_FLAGS="*" \
             -p 3000:3000 \
-            ${{ needs.build-frontend.outputs.image }} nuxt-local &
+            ${{ needs.build-frontend.outputs.image }} nuxt-prod &
 
           # Wait for all docker run commands to complete
           wait

deploy/all-in-one/Dockerfile

@@ -93,8 +93,6 @@ ARG GID
 
 # Web-frontend
 COPY --chown=$UID:$GID --from=web_frontend_image /baserow/web-frontend /baserow/web-frontend
-COPY --chown=$UID:$GID --from=web_frontend_image /baserow/premium/web-frontend /baserow/premium/web-frontend
-COPY --chown=$UID:$GID --from=web_frontend_image /baserow/enterprise/web-frontend /baserow/enterprise/web-frontend
 
 # Backend
 COPY --chown=$UID:$GID --from=backend_image /baserow/backend /baserow/backend
@@ -144,8 +142,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 # Web-frontend
 COPY --chown=$UID:$GID --from=web_frontend_image /baserow/web-frontend /baserow/web-frontend
-COPY --chown=$UID:$GID --from=web_frontend_image /baserow/premium/web-frontend /baserow/premium/web-frontend
-COPY --chown=$UID:$GID --from=web_frontend_image /baserow/enterprise/web-frontend /baserow/enterprise/web-frontend
 
 # Backend
 COPY --chown=$UID:$GID --from=backend_image /baserow/backend /baserow/backend

deploy/all-in-one/supervisor/default_baserow_env.sh

@@ -60,7 +60,7 @@ if [[ "${BASEROW_ALL_IN_ONE_DEV_MODE:-}" == "true"  ]]; then
   DEFAULT_CELERY_BEAT_STARTUP_COMMAND='celery-beat'
 else
   DEFAULT_DJANGO_SETTINGS_MODULE='baserow.config.settings.base'
-  DEFAULT_WEB_FRONTEND_STARTUP_COMMAND='nuxt-local'
+  DEFAULT_WEB_FRONTEND_STARTUP_COMMAND='nuxt-prod'
   DEFAULT_BACKEND_STARTUP_COMMAND='gunicorn'
   DEFAULT_CELERY_WORKER_STARTUP_COMMAND='celery-worker'
   DEFAULT_CELERY_EXPORT_WORKER_STARTUP_COMMAND='celery-exportworker'

deploy/plugins/install_plugin.sh

@@ -245,15 +245,15 @@ if [[ -d "/baserow/web-frontend" && -d "$PLUGIN_WEBFRONTEND_FOLDER" ]]; then
       run_as_docker_user yarn add "$PLUGIN_WEBFRONTEND_FOLDER" && yarn cache clean
 
       # We only load web-frontend modules into nuxt which have a built marker. Touch
-      # it now so the build-local picks up the newly installed module and builds it.
+      # it now so the build picks up the newly installed module and builds it.
       touch "$WEBFRONTEND_BUILT_MARKER"
       function finish {
         rm -f "$WEBFRONTEND_BUILT_MARKER"
       }
       trap finish EXIT
 
       if [[ "$dev" != true ]]; then
-        run_as_docker_user /baserow/web-frontend/docker/docker-entrypoint.sh build-local
+        run_as_docker_user /baserow/web-frontend/docker/docker-entrypoint.sh build
       else
         log "Installing plugins dev dependencies..."
         # In dev mode yarn install the plugins own dependencies so they are available

deploy/plugins/uninstall_plugin.sh

@@ -69,11 +69,11 @@ if [[ -d "/baserow/web-frontend" && -d "$PLUGIN_WEBFRONTEND_FOLDER" ]]; then
     check_and_run_script "$PLUGIN_WEBFRONTEND_FOLDER" uninstall.sh
     run_as_docker_user yarn remove "$package_name"
 
-    # We must delete the web-frontend plugin entirely so the build-local doesn't
+    # We must delete the web-frontend plugin entirely so the build doesn't
     # pick it up and build it.
     rm -rf "$PLUGIN_WEBFRONTEND_FOLDER"
     # We need to rebuild to ensure nuxt no longer has the plugin.
-    run_as_docker_user /baserow/web-frontend/docker/docker-entrypoint.sh build-local
+    run_as_docker_user /baserow/web-frontend/docker/docker-entrypoint.sh build
     rm -f /baserow/container_markers/"$plugin_name".web-frontend-built
     rm -f /baserow/container_markers/"$plugin_name".web-frontend-runtime-setup
     found_sub_module="true"

docs/installation/install-using-standalone-images.md

@@ -30,7 +30,7 @@ images:
 * `baserow/backend:2.0.6` (default command is `gunicorn`)
 * `baserow/backend:2.0.6` with command `celery-worker`
 * `baserow/backend:2.0.6` with command `celery-export-worker`
-* `baserow/web-frontend:2.0.6` (default command is `nuxt-local`)
+* `baserow/web-frontend:2.0.6` (default command is `nuxt-prod`)
 * A postgres database 
 * A redis server
 

e2e-tests/justfile

@@ -202,7 +202,7 @@ up: _ensure-images
             -e PRIVATE_BACKEND_URL=http://e2e-backend:8000 \
             -e FEATURE_FLAGS="*" \
             -p 3000:3000 \
-            {{ frontend_image }} nuxt-local
+            {{ frontend_image }} nuxt-prod
     fi
 
     echo ""

enterprise/web-frontend/eslint.config.mjs

@@ -1,22 +1,30 @@
-// Please keep in sync with the premium/enterprise eslintrc.js
-import withNuxt from './.nuxt/eslint.config.mjs'
+// @ts-check
+import withNuxt from './web-frontend/.nuxt/eslint.config.mjs'
+import globals from './web-frontend/node_modules/globals/index.js'
+import vitest from './web-frontend/node_modules/eslint-plugin-vitest/dist/index.mjs'
+import eslintConfigPrettier from './web-frontend/node_modules/eslint-config-prettier/index.js'
 
-import globals from 'globals'
-import vitest from 'eslint-plugin-vitest'
-import eslintConfigPrettier from 'eslint-config-prettier'
-
-export default [
+export default withNuxt([
   {
     ignores: [
-      '.nuxt/**',
       '**/node_modules/**',
-      'coverage/**',
+      '**/.nuxt/**',
+      '**/coverage/**',
       '**/generated/**',
-      '.nuxt-storybook/**',
+      '**/.nuxt-storybook/**',
+      '**/dist/**',
+      '**/.output/**',
+      '**/.storybook/**',
+      '**/vitest.setup.ts',
     ],
   },
   eslintConfigPrettier, // deactivate eslint rules that conflict with prettier
   {
+    files: [
+      'web-frontend/**/*.{js,ts,mjs,mts,jsx,tsx,vue}',
+      'premium/web-frontend/**/*.{js,ts,mjs,mts,jsx,tsx,vue}',
+      'enterprise/web-frontend/**/*.{js,ts,mjs,mts,jsx,tsx,vue}',
+    ],
     languageOptions: {
       globals: {
         ...globals.browser,
@@ -40,7 +48,17 @@ export default [
       'no-empty': 'off',
     },
   },
-
+  // Premium and Enterprise-specific overrides
+  {
+    files: [
+      'premium/web-frontend/**/*.{js,ts,mjs,mts,jsx,tsx,vue}',
+      'enterprise/web-frontend/**/*.{js,ts,mjs,mts,jsx,tsx,vue}',
+    ],
+    rules: {
+      'vue/order-in-components': 'off',
+    },
+  },
+  // Test files configuration
   {
     files: [
       '**/*.{test,spec}.{js,ts,jsx,tsx}',
@@ -56,4 +74,4 @@ export default [
       ...vitest.configs.recommended.rules,
     },
   },
-]
+])

web-frontend/eslint.config.common.mjs eslint.config.mjsweb-frontend/eslint.config.common.mjs renamed to eslint.config.mjs

@@ -10,7 +10,6 @@
     "lint": "yarn eslint && yarn stylelint",
     "dev": "cd /baserow/web-frontend/ && nuxt --hostname 0.0.0.0 --config-file ./config/nuxt.config.dev.js",
     "build": "cd /baserow/web-frontend/ && nuxt build --config-file ./config/nuxt.config.dev.js",
-    "build-local": "cd /baserow/web-frontend/ && nuxt build --config-file ./config/nuxt.config.local.ts",
     "start": "cd /baserow/web-frontend/ && nuxt start --hostname 0.0.0.0 --config-file ./config/nuxt.config.local.ts"
   },
   "dependencies": {