@common-stack/generate-plugin 6.0.8-alpha.10 → 6.0.8-alpha.11

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.11](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.10...v6.0.8-alpha.11) (2024-12-29)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
 ## [6.0.8-alpha.10](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.9...v6.0.8-alpha.10) (2024-12-20)
 
 **Note:** Version bump only for package @common-stack/generate-plugin

package/docker-releases/backend/package.json

@@ -74,8 +74,8 @@
         "@common-stack/client-core": "6.0.8-alpha.7",
         "@common-stack/core": "6.0.8-alpha.7",
         "@common-stack/server-core": "6.0.8-alpha.9",
-        "@common-stack/server-stack": "6.0.8-alpha.9",
-        "@common-stack/store-mongo": "6.0.8-alpha.8",
+        "@common-stack/server-stack": "6.0.8-alpha.10",
+        "@common-stack/store-mongo": "6.0.8-alpha.10",
         "@graphql-tools/links": "~9.0.1",
         "@graphql-tools/schema": "~10.0.6",
         "@graphql-tools/stitch": "~9.2.10",

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

@@ -62,7 +62,7 @@
     "dependencies": {
         "@apollo/client": "^3.9.0",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/server-stack": "6.0.8-alpha.9",
+        "@common-stack/server-stack": "6.0.8-alpha.10",
         "@remix-run/node": "~2.10.1",
         "lodash": "^4.17.15",
         "react": "18.2.0"

package/lib/generators/add-backend/files/webpack.config.js

@@ -1,4 +1,6 @@
-process.env.ENV_FILE !== null && require('dotenv').config({ path: process.env.ENV_FILE });
+if (process.env.ENV_FILE) {
+    require('dotenv').config({ path: process.env.ENV_FILE });
+}
 const webpack = require('webpack');
 const path = require('path');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');

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

@@ -147,7 +147,7 @@
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
         "@common-stack/env-list-loader": "6.0.8-alpha.7",
-        "@common-stack/generate-plugin": "6.0.8-alpha.9",
+        "@common-stack/generate-plugin": "6.0.8-alpha.10",
         "@common-stack/rollup-vite-utils": "6.0.8-alpha.7",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
@@ -272,7 +272,7 @@
         "jest-raw-loader": "^1.0.1",
         "jest-transform-graphql": "^2.1.0",
         "jsdom": "^20.0.2",
-        "lerna": "8",
+        "lerna": "8.1.8",
         "less": "^4.1.3",
         "less-loader": "^11.0.0",
         "lint-staged": "^15.2.7",

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

@@ -28,8 +28,8 @@
         "@common-stack/client-core": "6.0.8-alpha.7",
         "@common-stack/core": "6.0.8-alpha.7",
         "@common-stack/server-core": "6.0.8-alpha.9",
-        "@common-stack/server-stack": "6.0.8-alpha.9",
-        "@common-stack/store-mongo": "6.0.8-alpha.8",
+        "@common-stack/server-stack": "6.0.8-alpha.10",
+        "@common-stack/store-mongo": "6.0.8-alpha.10",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "helmet": "^3.21.2",
         "react": "18.2.0",

package/lib/generators/add-moleculer/files/rollup.config.mjs

@@ -1,11 +1,24 @@
 import graphql from '@rollup/plugin-graphql';
 import typescript from '@rollup/plugin-typescript';
 import { string } from 'rollup-plugin-string';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { writeBackendModuleFile } from '@common-stack/rollup-vite-utils';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// Write backend module file before bundling
+try {
+    const packageConfig = await import('./config.json', { assert: { type: 'json' } });
+    await writeBackendModuleFile(path.join(__dirname, 'src/modules'), packageConfig.default);
+} catch (e) {
+    console.error('Error writing backend module file:', e);
+}
 
 const bundle = (config) => ({
     ...config,
     input: 'src/index.ts',
-    // marking all node modules as external
     external: (id) => !/^[./]/.test(id),
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/generate-plugin",
-    "version": "6.0.8-alpha.10",
+    "version": "6.0.8-alpha.11",
     "type": "module",
     "main": "./lib/index.mjs",
     "typings": "./lib/index.d.ts",
@@ -25,5 +25,5 @@
     },
     "executors": "./executors.json",
     "generators": "./generators.json",
-    "gitHead": "41ea29cfe102fb2a7949942b9f409bd43c0d05b4"
+    "gitHead": "2f5c585fe2b4d81bb3c70ce248fe3a38c7a9f43b"
 }

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

@@ -147,7 +147,7 @@
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
         "@common-stack/env-list-loader": "6.0.8-alpha.7",
-        "@common-stack/generate-plugin": "6.0.8-alpha.9",
+        "@common-stack/generate-plugin": "6.0.8-alpha.10",
         "@common-stack/rollup-vite-utils": "6.0.8-alpha.7",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
@@ -272,7 +272,7 @@
         "jest-raw-loader": "^1.0.1",
         "jest-transform-graphql": "^2.1.0",
         "jsdom": "^20.0.2",
-        "lerna": "8",
+        "lerna": "8.1.8",
         "less": "^4.1.3",
         "less-loader": "^11.0.0",
         "lint-staged": "^15.2.7",

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

@@ -28,8 +28,8 @@
         "@common-stack/client-core": "6.0.8-alpha.7",
         "@common-stack/core": "6.0.8-alpha.7",
         "@common-stack/server-core": "6.0.8-alpha.9",
-        "@common-stack/server-stack": "6.0.8-alpha.9",
-        "@common-stack/store-mongo": "6.0.8-alpha.8",
+        "@common-stack/server-stack": "6.0.8-alpha.10",
+        "@common-stack/store-mongo": "6.0.8-alpha.10",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "helmet": "^3.21.2",
         "react": "18.2.0",

package/src/generators/add-moleculer/files/rollup.config.mjs

@@ -1,11 +1,24 @@
 import graphql from '@rollup/plugin-graphql';
 import typescript from '@rollup/plugin-typescript';
 import { string } from 'rollup-plugin-string';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { writeBackendModuleFile } from '@common-stack/rollup-vite-utils';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// Write backend module file before bundling
+try {
+    const packageConfig = await import('./config.json', { assert: { type: 'json' } });
+    await writeBackendModuleFile(path.join(__dirname, 'src/modules'), packageConfig.default);
+} catch (e) {
+    console.error('Error writing backend module file:', e);
+}
 
 const bundle = (config) => ({
     ...config,
     input: 'src/index.ts',
-    // marking all node modules as external
     external: (id) => !/^[./]/.test(id),
 });
 

package/lib/generators/add-moleculer/files/src/modules/module.ts.template

@@ -1,31 +0,0 @@
-import { ContainerModule, interfaces } from 'inversify';
-import { Feature } from '@common-stack/server-core';
-import { TaggedType } from '@common-stack/core';
-import { config } from '../config';
-
-const subTopic = config.CONNECTION_ID;
-export const settings: any = {
-    connectionId: config.CONNECTION_ID,
-    namespace: config.NAMESPACE,
-    subTopic,
-    logger: config.LOG_LEVEL,
-    workspaceId: config.CONNECTION_ID || 'DEFAULT',
-    configPath: process.env.CONFIG_PATH,
-    adminApiNamespace: 'api-admin',
-    apiNamespace: 'api-admin',
-};
-
-const defaultModule = () =>
-    new ContainerModule((bind: interfaces.Bind) => {
-        bind('Settings').toConstantValue(settings).whenTargetTagged('default', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged('microservice', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged(TaggedType.MICROSERVICE, true);
-        bind('MongoOptions').toConstantValue({});
-    });
-
-const DefaultFeature = new Feature({
-    createContainerFunc: [defaultModule],
-    createHemeraContainerFunc: [defaultModule],
-});
-
-export default new Feature<any>(DefaultFeature);

package/src/generators/add-moleculer/files/src/modules/module.ts.template

@@ -1,31 +0,0 @@
-import { ContainerModule, interfaces } from 'inversify';
-import { Feature } from '@common-stack/server-core';
-import { TaggedType } from '@common-stack/core';
-import { config } from '../config';
-
-const subTopic = config.CONNECTION_ID;
-export const settings: any = {
-    connectionId: config.CONNECTION_ID,
-    namespace: config.NAMESPACE,
-    subTopic,
-    logger: config.LOG_LEVEL,
-    workspaceId: config.CONNECTION_ID || 'DEFAULT',
-    configPath: process.env.CONFIG_PATH,
-    adminApiNamespace: 'api-admin',
-    apiNamespace: 'api-admin',
-};
-
-const defaultModule = () =>
-    new ContainerModule((bind: interfaces.Bind) => {
-        bind('Settings').toConstantValue(settings).whenTargetTagged('default', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged('microservice', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged(TaggedType.MICROSERVICE, true);
-        bind('MongoOptions').toConstantValue({});
-    });
-
-const DefaultFeature = new Feature({
-    createContainerFunc: [defaultModule],
-    createHemeraContainerFunc: [defaultModule],
-});
-
-export default new Feature<any>(DefaultFeature);