Merge branch 'main' of github.com:devgateway/data-viz-wordpress

# Conflicts:
#	plugins/wp-react-blocks-plugin/blocks/webpack.config.js

Author: sdimunzio

.dockerignore

@@ -4,7 +4,6 @@ wp-content/uploads
 node_modules/
 .git
 dist
-build/
 packages/create-wp-customizer/
 packages/upgrade-wp-customizer/
 # Log files

Dockerfile

@@ -19,19 +19,25 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
 
 FROM base AS builder
 
+ENV NODE_ENV=production
+
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
   --mount=type=bind,source=package.json,target=package.json \
   --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
   --mount=type=bind,source=packages/commons/package.json,target=packages/commons/package.json \
   pnpm install --frozen-lockfile
 
+# Build the plugins
+RUN BLOCKS_CATEGORY=wp-react-lib-blocks BLOCKS_NS=viz \
+pnpm --filter="@devgateway/dvz-wp-commons" --filter="dg-react-blocks" build
+
 # Organize WordPress files to the container
 COPY wp-content wp-content
-COPY plugins wp-content/plugins
 COPY wp-theme wp-content/themes/dg-semantic
 
-# Build the plugins
-RUN pnpm --filter="@devgateway/dvz-wp-commons" --filter="dg-react-blocks" build
+# Copy built plugins from workspace into wp-content so built assets are included
+RUN mkdir -p wp-content/plugins \
+  && cp -a plugins/. wp-content/plugins/
 
 # Create a tarball of the wp-content directory
 RUN chown -R 82:82 wp-content \

plugins/wp-react-blocks-plugin/blocks/.dockerignore

@@ -1,2 +1,2 @@
 node_modules/
-build/
+.env

plugins/wp-react-blocks-plugin/blocks/.env.example

@@ -0,0 +1,2 @@
+BLOCKS_CATEGORY=wp-react-lib-blocks
+BLOCKS_NS=viz

plugins/wp-react-blocks-plugin/blocks/style.css

@@ -0,0 +1 @@
+d

plugins/wp-react-blocks-plugin/blocks/webpack.config.js

@@ -15,6 +15,9 @@ module.exports = {
     },
     plugins: [
         ...defaultConfig.plugins,
-        new Dotenv({path: '.env'}),
+        new Dotenv({
+            systemvars: true,
+            safe: true
+        }),
     ]
 };