@common-stack/generate-plugin 6.0.8-alpha.31 → 6.0.8-alpha.32

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.0.8-alpha.32](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.31...v6.0.8-alpha.32) (2025-01-31)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
 ## [6.0.8-alpha.31](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.30...v6.0.8-alpha.31) (2025-01-27)
 
 **Note:** Version bump only for package @common-stack/generate-plugin

package/docker-releases/backend/package.json

@@ -70,12 +70,12 @@
         "@cdm-logger/client": "^9.0.3",
         "@cdm-logger/server": "^9.0.3",
         "@cdmbase/graphql-type-uri": "^4.0.0",
-        "@common-stack/cache-api-server": "6.0.8-alpha.30",
-        "@common-stack/client-core": "6.0.8-alpha.30",
-        "@common-stack/core": "6.0.8-alpha.30",
-        "@common-stack/server-core": "6.0.8-alpha.30",
-        "@common-stack/server-stack": "6.0.8-alpha.30",
-        "@common-stack/store-mongo": "6.0.8-alpha.30",
+        "@common-stack/cache-api-server": "6.0.8-alpha.31",
+        "@common-stack/client-core": "6.0.8-alpha.31",
+        "@common-stack/core": "6.0.8-alpha.31",
+        "@common-stack/server-core": "6.0.8-alpha.31",
+        "@common-stack/server-stack": "6.0.8-alpha.31",
+        "@common-stack/store-mongo": "6.0.8-alpha.31",
         "@graphql-tools/links": "~9.0.1",
         "@graphql-tools/schema": "~10.0.6",
         "@graphql-tools/stitch": "~9.2.10",

package/docker-releases/frontend/antd/package.json

@@ -63,13 +63,13 @@
         "@apollo/client": "^3.9.0",
         "@cdm-logger/client": "^9.0.3",
         "@cdm-logger/server": "^9.0.3",
-        "@common-stack/cache-api-server": "6.0.8-alpha.30",
-        "@common-stack/client-core": "6.0.8-alpha.30",
-        "@common-stack/client-react": "6.0.8-alpha.30",
-        "@common-stack/components-pro": "6.0.8-alpha.30",
-        "@common-stack/core": "6.0.8-alpha.30",
-        "@common-stack/remix-router-redux": "6.0.8-alpha.30",
-        "@common-stack/server-core": "6.0.8-alpha.30",
+        "@common-stack/cache-api-server": "6.0.8-alpha.31",
+        "@common-stack/client-core": "6.0.8-alpha.31",
+        "@common-stack/client-react": "6.0.8-alpha.31",
+        "@common-stack/components-pro": "6.0.8-alpha.31",
+        "@common-stack/core": "6.0.8-alpha.31",
+        "@common-stack/remix-router-redux": "6.0.8-alpha.31",
+        "@common-stack/server-core": "6.0.8-alpha.31",
         "@reduxjs/toolkit": "^2.2.6",
         "@remix-run/express": "~2.10.1",
         "@remix-run/node": "~2.10.1",

package/lib/generators/add-backend/files/Dockerfile

@@ -4,6 +4,7 @@ FROM node:20.16-bullseye
 ENV PYTHON=/usr/bin/python
 
 COPY .npmrc package.json /tmp/
+COPY common /tmp/common
 
 RUN set -ex \
 	&& cd /tmp \
@@ -13,6 +14,7 @@ RUN set -ex \
 	&& rm -f /tmp/.npmrc \
 	&& mkdir -p /home/app \
 	&& cp -a /tmp/node_modules /home/app/ \
+	&& cp -a /tmp/common /home/app/common \
 	&& rm -Rf /tmp/*
 
 WORKDIR /home/app

package/lib/generators/add-backend/files/package.json

@@ -57,12 +57,13 @@
         "watch:test": "cross-env NODE_ENV=test ENV_FILE=../../config/test/test.env yarn build:test && yarn start:test"
     },
     "resolutions": {
+        "common": "link:./common",
         "html-to-text": "^8.0.0"
     },
     "dependencies": {
         "@apollo/client": "^3.9.0",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/server-stack": "6.0.8-alpha.30",
+        "@common-stack/server-stack": "6.0.8-alpha.31",
         "@remix-run/node": "~2.10.1",
         "lodash": "^4.17.15",
         "react": "18.2.0"

package/lib/generators/add-frontend/templates/Dockerfile

@@ -5,6 +5,9 @@ ENV PYTHON=/usr/bin/python
 
 COPY .npmrc package.json /tmp/
 
+# Copy the common package to the temporary directory
+COPY common /tmp/common
+
 RUN set -ex \
 	&& cd /tmp \
 	&& npm install -g node-gyp \
@@ -13,6 +16,7 @@ RUN set -ex \
 	&& rm -f /tmp/.npmrc \
 	&& mkdir -p /home/app \
 	&& cp -a /tmp/node_modules /home/app/ \
+	&& cp -a /tmp/common /home/app/common \
 	&& rm -Rf /tmp/*
 
 

package/lib/generators/add-frontend/templates/package.json

@@ -51,8 +51,11 @@
         "watch:staging": "cross-env ENV_FILE=../../config/staging/staging.env node ./server.js",
         "watch:test": "cross-env ENV_FILE=../../config/test/test.env node ./server.js"
     },
+    "resolutions": {
+        "common": "link:./common"
+    },
     "dependencies": {
-        "@common-stack/frontend-stack-react": "6.0.8-alpha.30",
+        "@common-stack/frontend-stack-react": "6.0.8-alpha.31",
         "@react-icons/all-files": "^4.1.0",
         "classnames": "^2.2.6",
         "compression": "^1.7.4",
@@ -77,7 +80,7 @@
     },
     "devDependencies": {
         "@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
-        "@common-stack/rollup-vite-utils": "6.0.8-alpha.30",
+        "@common-stack/rollup-vite-utils": "6.0.8-alpha.31",
         "@remix-run/dev": "~2.10.1",
         "@remix-run/serve": "~2.10.1",
         "cross-env": "^7.0.3",

package/lib/generators/add-fullstack/files/package.json

@@ -52,7 +52,9 @@
         "devpublish:push": "yarn predevpublish && git push origin $PUBLISH_BRANCH && yarn postdevpublish",
         "format": "yarn lint --fix",
         "format:md": "yarn lint:md --fix",
-        "generateGraphql": "graphql-codegen",
+        "pregenerateGraphql": " node --experimental-modules tools/codegenGenerator.mjs",
+        "generateGraphql": "graphql-codegen-esm",
+        "postgenerateGraphql": "lerna run watch --scope=common",
         "generateGraphql:watch": "yarn generateGraphql -- --watch",
         "git:pull": "git pull origin $(git rev-parse --abbrev-ref HEAD)",
         "git:push": "git push origin $(git rev-parse --abbrev-ref HEAD)",
@@ -146,9 +148,9 @@
         "@babel/preset-typescript": "^7.18.6",
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/env-list-loader": "6.0.8-alpha.30",
-        "@common-stack/generate-plugin": "6.0.8-alpha.30",
-        "@common-stack/rollup-vite-utils": "6.0.8-alpha.30",
+        "@common-stack/env-list-loader": "6.0.8-alpha.31",
+        "@common-stack/generate-plugin": "6.0.8-alpha.31",
+        "@common-stack/rollup-vite-utils": "6.0.8-alpha.31",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
         "@graphql-codegen/cli": "^5.0.2",

package/lib/generators/add-fullstack/files/tools/codegenGenerator.mjs

@@ -0,0 +1,36 @@
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+import { runCodegenTasks } from '@common-stack/rollup-vite-utils/lib/tools/codegen/index.js';
+
+/**
+ * This main script orchestrates your codegen steps, using cdecode-config.json.
+ * Usage:
+ *   node tools/mainScript.mjs
+ */
+
+// ESM housekeeping
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+(async function main() {
+  try {
+    // 1) Locate and parse cdecode-config.json
+    const configPath = path.join(__dirname, '../cdecode-config.json');
+    if (!fs.existsSync(configPath)) {
+      console.error(`cdecode-config.json not found at: ${configPath}`);
+      process.exit(1);
+    }
+    const rawConfig = fs.readFileSync(configPath, 'utf-8');
+    const cdecodeConfig = JSON.parse(rawConfig);
+
+    // 2) Run the orchestrated tasks
+    await runCodegenTasks(cdecodeConfig);
+
+    console.log('mainScript completed successfully!');
+  } catch (err) {
+    console.error('Error running mainScript:', err);
+    process.exit(1);
+  }
+})(); 

package/lib/generators/add-moleculer/files/Dockerfile

@@ -1,6 +1,7 @@
 FROM node:20.16-alpine
 
 COPY .npmrc package.json /tmp/
+COPY common /tmp/common
 
 RUN set -ex \
   && apk add --no-cache \
@@ -13,6 +14,7 @@ RUN set -ex \
 	&& rm -f /tmp/.npmrc \
 	&& mkdir -p /home/app \
 	&& cp -a /tmp/node_modules /home/app/ \
+	&& cp -a /tmp/common /home/app/common \
 	&& rm -Rf /tmp/*
 
 WORKDIR /home/app

package/lib/generators/add-moleculer/files/package.json

@@ -24,12 +24,15 @@
         "test:watch": "npm test -- --watch",
         "watch": "npm run start:dev"
     },
+    "resolutions": {
+        "common": "link:./common"
+    },
     "dependencies": {
-        "@common-stack/client-core": "6.0.8-alpha.30",
-        "@common-stack/core": "6.0.8-alpha.30",
-        "@common-stack/server-core": "6.0.8-alpha.30",
-        "@common-stack/server-stack": "6.0.8-alpha.30",
-        "@common-stack/store-mongo": "6.0.8-alpha.30",
+        "@common-stack/client-core": "6.0.8-alpha.31",
+        "@common-stack/core": "6.0.8-alpha.31",
+        "@common-stack/server-core": "6.0.8-alpha.31",
+        "@common-stack/server-stack": "6.0.8-alpha.31",
+        "@common-stack/store-mongo": "6.0.8-alpha.31",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "helmet": "^3.21.2",
         "react": "18.2.0",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/generate-plugin",
-    "version": "6.0.8-alpha.31",
+    "version": "6.0.8-alpha.32",
     "type": "module",
     "main": "./lib/index.mjs",
     "typings": "./lib/index.d.ts",
@@ -25,5 +25,5 @@
     },
     "executors": "./executors.json",
     "generators": "./generators.json",
-    "gitHead": "f615de2ffa877f041318af0b0e7991b7f4fb7f70"
+    "gitHead": "cc43472b14fd4266f6df999a9102434b52e0f568"
 }

package/src/generators/add-fullstack/files/package.json

@@ -52,7 +52,9 @@
         "devpublish:push": "yarn predevpublish && git push origin $PUBLISH_BRANCH && yarn postdevpublish",
         "format": "yarn lint --fix",
         "format:md": "yarn lint:md --fix",
-        "generateGraphql": "graphql-codegen",
+        "pregenerateGraphql": " node --experimental-modules tools/codegenGenerator.mjs",
+        "generateGraphql": "graphql-codegen-esm",
+        "postgenerateGraphql": "lerna run watch --scope=common",
         "generateGraphql:watch": "yarn generateGraphql -- --watch",
         "git:pull": "git pull origin $(git rev-parse --abbrev-ref HEAD)",
         "git:push": "git push origin $(git rev-parse --abbrev-ref HEAD)",
@@ -146,9 +148,9 @@
         "@babel/preset-typescript": "^7.18.6",
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/env-list-loader": "6.0.8-alpha.30",
-        "@common-stack/generate-plugin": "6.0.8-alpha.30",
-        "@common-stack/rollup-vite-utils": "6.0.8-alpha.30",
+        "@common-stack/env-list-loader": "6.0.8-alpha.31",
+        "@common-stack/generate-plugin": "6.0.8-alpha.31",
+        "@common-stack/rollup-vite-utils": "6.0.8-alpha.31",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
         "@graphql-codegen/cli": "^5.0.2",

package/src/generators/add-fullstack/files/tools/codegenGenerator.mjs

@@ -0,0 +1,36 @@
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+import { runCodegenTasks } from '@common-stack/rollup-vite-utils/lib/tools/codegen/index.js';
+
+/**
+ * This main script orchestrates your codegen steps, using cdecode-config.json.
+ * Usage:
+ *   node tools/mainScript.mjs
+ */
+
+// ESM housekeeping
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+(async function main() {
+  try {
+    // 1) Locate and parse cdecode-config.json
+    const configPath = path.join(__dirname, '../cdecode-config.json');
+    if (!fs.existsSync(configPath)) {
+      console.error(`cdecode-config.json not found at: ${configPath}`);
+      process.exit(1);
+    }
+    const rawConfig = fs.readFileSync(configPath, 'utf-8');
+    const cdecodeConfig = JSON.parse(rawConfig);
+
+    // 2) Run the orchestrated tasks
+    await runCodegenTasks(cdecodeConfig);
+
+    console.log('mainScript completed successfully!');
+  } catch (err) {
+    console.error('Error running mainScript:', err);
+    process.exit(1);
+  }
+})(); 

package/src/generators/add-moleculer/files/.dockerignore

@@ -2,4 +2,5 @@
 !dist/
 !*.js
 !*.json
-!.npmrc
+!.npmrc
+!common/

package/src/generators/add-moleculer/files/Dockerfile

@@ -1,6 +1,7 @@
 FROM node:20.16-alpine
 
 COPY .npmrc package.json /tmp/
+COPY common /tmp/common
 
 RUN set -ex \
   && apk add --no-cache \
@@ -13,6 +14,7 @@ RUN set -ex \
 	&& rm -f /tmp/.npmrc \
 	&& mkdir -p /home/app \
 	&& cp -a /tmp/node_modules /home/app/ \
+	&& cp -a /tmp/common /home/app/common \
 	&& rm -Rf /tmp/*
 
 WORKDIR /home/app

package/src/generators/add-moleculer/files/package.json

@@ -24,12 +24,15 @@
         "test:watch": "npm test -- --watch",
         "watch": "npm run start:dev"
     },
+    "resolutions": {
+        "common": "link:./common"
+    },
     "dependencies": {
-        "@common-stack/client-core": "6.0.8-alpha.30",
-        "@common-stack/core": "6.0.8-alpha.30",
-        "@common-stack/server-core": "6.0.8-alpha.30",
-        "@common-stack/server-stack": "6.0.8-alpha.30",
-        "@common-stack/store-mongo": "6.0.8-alpha.30",
+        "@common-stack/client-core": "6.0.8-alpha.31",
+        "@common-stack/core": "6.0.8-alpha.31",
+        "@common-stack/server-core": "6.0.8-alpha.31",
+        "@common-stack/server-stack": "6.0.8-alpha.31",
+        "@common-stack/store-mongo": "6.0.8-alpha.31",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "helmet": "^3.21.2",
         "react": "18.2.0",