@common-stack/generate-plugin 5.0.6-alpha.2 → 5.0.6-alpha.4

package/.eslintrc.json

@@ -22,7 +22,7 @@
             }
         },
         {
-            "files": ["./package.json", "./generators.json"],
+            "files": ["./package.json", "./generators.json", "./executors.json"],
             "parser": "jsonc-eslint-parser",
             "rules": {
                 "@nx/nx-plugin-checks": "error"

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.6-alpha.4](https://github.com/cdmbase/common-stack/compare/v5.0.6-alpha.3...v5.0.6-alpha.4) (2024-08-18)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.6-alpha.3](https://github.com/cdmbase/common-stack/compare/v5.0.6-alpha.2...v5.0.6-alpha.3) (2024-08-16)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
 ## [5.0.6-alpha.2](https://github.com/cdmbase/common-stack/compare/v5.0.6-alpha.1...v5.0.6-alpha.2) (2024-08-16)
 
 **Note:** Version bump only for package @common-stack/generate-plugin

package/executors.json

@@ -0,0 +1,14 @@
+{
+    "executors": {
+        "sort-package-json": {
+            "implementation": "./lib/executors/sort-package-json/executor.cjs",
+            "schema": "./lib/executors/sort-package-json/schema.json",
+            "description": "sort-package-json executor"
+        },
+        "update-deploy-version": {
+            "implementation": "./lib/executors/update-deploy-version/executor.cjs",
+            "schema": "./lib/executors/update-deploy-version/schema.json",
+            "description": "update-deploy-version executor"
+        }
+    }
+}

package/generators.json

@@ -24,6 +24,21 @@
             "factory": "./lib/generators/add-browser-package/generator.cjs",
             "schema": "./lib/generators/add-browser-package/schema.json",
             "description": "add-browser-package generator"
+        },
+        "add-core-package": {
+            "factory": "./lib/generators/add-core-package/generator.cjs",
+            "schema": "./lib/generators/add-core-package/schema.json",
+            "description": "add-core-package generator"
+        },
+        "add-server-package": {
+            "factory": "./lib/generators/add-server-package/generator.cjs",
+            "schema": "./lib/generators/add-server-package/schema.json",
+            "description": "add-server-package generator"
+        },
+        "add-client-package": {
+            "factory": "./lib/generators/add-client-package/generator.cjs",
+            "schema": "./lib/generators/add-client-package/schema.json",
+            "description": "add-client-package generator"
         }
     }
 }

package/lib/executors/sort-package-json/executor.cjs

@@ -0,0 +1,46 @@
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),fs=require('fs'),path=require('path');// const __filename = fileURLToPath(import.meta.url);
+// const __dirname = path.dirname(__filename);
+function sortPackageJsonFile(filePath) {
+    return tslib.__awaiter(this, void 0, void 0, function* () {
+        const packageJson = JSON.parse(yield fs.promises.readFile(filePath, 'utf8'));
+        const sortPackageJson = yield import('sort-package-json').then(module => module.default);
+        const sortedPackageJson = sortPackageJson(packageJson);
+        yield fs.promises.writeFile(filePath, JSON.stringify(sortedPackageJson, null, 2) + '\n');
+    });
+}
+function sortAllPackageJsonFiles(dir) {
+    return tslib.__awaiter(this, void 0, void 0, function* () {
+        const files = yield fs.promises.readdir(dir);
+        for (const file of files) {
+            const fullPath = path.join(dir, file);
+            const stat = yield fs.promises.lstat(fullPath);
+            if (stat.isDirectory() && ["src", "lib", "node_modules"].includes(file) === false) {
+                yield sortAllPackageJsonFiles(fullPath);
+            }
+            else if (file === 'package.json') {
+                yield sortPackageJsonFile(fullPath);
+                console.log(`Sorted ${fullPath}`);
+            }
+        }
+    });
+}
+function processDirectories(dirs) {
+    return tslib.__awaiter(this, void 0, void 0, function* () {
+        for (const dir of dirs) {
+            yield sortAllPackageJsonFiles(dir);
+        }
+    });
+}
+const runExecutor = (options) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+    console.log('Executor ran for SortPackageJson', options);
+    const basePath = process.cwd();
+    const directories = [
+        path.join(basePath, './packages'),
+        path.join(basePath, './servers'),
+        path.join(basePath, './portable-devices')
+    ];
+    yield processDirectories(directories);
+    return {
+        success: true,
+    };
+});exports.default=runExecutor;exports.runExecutor=runExecutor;//# sourceMappingURL=executor.cjs.map

package/lib/executors/sort-package-json/executor.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor.cjs","sources":["../../../src/executors/sort-package-json/executor.ts"],"sourcesContent":[null],"names":["fsPromises","__awaiter"],"mappings":"uIAMA;AACA;AAEA,SAAe,mBAAmB,CAAC,QAAQ,EAAA;;AACvC,QAAA,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAMA,WAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;AAC5E,QAAA,MAAM,eAAe,GAAG,MAAM,OAAO,mBAAmB,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;AACzF,QAAA,MAAM,iBAAiB,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;AACvD,QAAA,MAAMA,WAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;KAC3F,CAAA,CAAA;AAAA,CAAA;AAED,SAAe,uBAAuB,CAAC,GAAG,EAAA;;QACtC,MAAM,KAAK,GAAG,MAAMA,WAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAC5C,QAAA,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,MAAMA,WAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC9C,IAAI,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE;AAC/E,gBAAA,MAAM,uBAAuB,CAAC,QAAQ,CAAC,CAAC;aAC3C;AAAM,iBAAA,IAAI,IAAI,KAAK,cAAc,EAAE;AAChC,gBAAA,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAC;AACpC,gBAAA,OAAO,CAAC,GAAG,CAAC,UAAU,QAAQ,CAAA,CAAE,CAAC,CAAC;aACrC;SACJ;KACJ,CAAA,CAAA;AAAA,CAAA;AAED,SAAe,kBAAkB,CAAC,IAAI,EAAA;;AAClC,QAAA,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;AACpB,YAAA,MAAM,uBAAuB,CAAC,GAAG,CAAC,CAAC;SACtC;KACJ,CAAA,CAAA;AAAA,CAAA;AAEY,MAAA,WAAW,GAAmD,CAAO,OAAO,KAAIC,eAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;AACzF,IAAA,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE,OAAO,CAAC,CAAC;AAEzD,IAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AAC/B,IAAA,MAAM,WAAW,GAAG;AAChB,QAAA,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC;AACjC,QAAA,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC;AAChC,QAAA,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,CAAC;KAC5C,CAAC;AACF,IAAA,MAAM,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAEtC,OAAO;AACH,QAAA,OAAO,EAAE,IAAI;KAChB,CAAC;AACN,CAAC"}

package/lib/executors/sort-package-json/executor.d.ts

@@ -0,0 +1,4 @@
+import { PromiseExecutor } from '@nx/devkit';
+import { SortPackageJsonExecutorSchema } from './schema';
+export declare const runExecutor: PromiseExecutor<SortPackageJsonExecutorSchema>;
+export default runExecutor;

package/lib/executors/sort-package-json/executor.mjs

@@ -0,0 +1,46 @@
+import {__awaiter}from'tslib';import {promises}from'fs';import path__default from'path';// const __filename = fileURLToPath(import.meta.url);
+// const __dirname = path.dirname(__filename);
+function sortPackageJsonFile(filePath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const packageJson = JSON.parse(yield promises.readFile(filePath, 'utf8'));
+        const sortPackageJson = yield import('sort-package-json').then(module => module.default);
+        const sortedPackageJson = sortPackageJson(packageJson);
+        yield promises.writeFile(filePath, JSON.stringify(sortedPackageJson, null, 2) + '\n');
+    });
+}
+function sortAllPackageJsonFiles(dir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const files = yield promises.readdir(dir);
+        for (const file of files) {
+            const fullPath = path__default.join(dir, file);
+            const stat = yield promises.lstat(fullPath);
+            if (stat.isDirectory() && ["src", "lib", "node_modules"].includes(file) === false) {
+                yield sortAllPackageJsonFiles(fullPath);
+            }
+            else if (file === 'package.json') {
+                yield sortPackageJsonFile(fullPath);
+                console.log(`Sorted ${fullPath}`);
+            }
+        }
+    });
+}
+function processDirectories(dirs) {
+    return __awaiter(this, void 0, void 0, function* () {
+        for (const dir of dirs) {
+            yield sortAllPackageJsonFiles(dir);
+        }
+    });
+}
+const runExecutor = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    console.log('Executor ran for SortPackageJson', options);
+    const basePath = process.cwd();
+    const directories = [
+        path__default.join(basePath, './packages'),
+        path__default.join(basePath, './servers'),
+        path__default.join(basePath, './portable-devices')
+    ];
+    yield processDirectories(directories);
+    return {
+        success: true,
+    };
+});export{runExecutor as default,runExecutor};//# sourceMappingURL=executor.mjs.map

package/lib/executors/sort-package-json/executor.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor.mjs","sources":["../../../src/executors/sort-package-json/executor.ts"],"sourcesContent":[null],"names":["fsPromises","path"],"mappings":"wFAMA;AACA;AAEA,SAAe,mBAAmB,CAAC,QAAQ,EAAA;;AACvC,QAAA,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAMA,QAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;AAC5E,QAAA,MAAM,eAAe,GAAG,MAAM,OAAO,mBAAmB,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;AACzF,QAAA,MAAM,iBAAiB,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;AACvD,QAAA,MAAMA,QAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;KAC3F,CAAA,CAAA;AAAA,CAAA;AAED,SAAe,uBAAuB,CAAC,GAAG,EAAA;;QACtC,MAAM,KAAK,GAAG,MAAMA,QAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAC5C,QAAA,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,MAAM,QAAQ,GAAGC,aAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,MAAMD,QAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC9C,IAAI,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE;AAC/E,gBAAA,MAAM,uBAAuB,CAAC,QAAQ,CAAC,CAAC;aAC3C;AAAM,iBAAA,IAAI,IAAI,KAAK,cAAc,EAAE;AAChC,gBAAA,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAC;AACpC,gBAAA,OAAO,CAAC,GAAG,CAAC,UAAU,QAAQ,CAAA,CAAE,CAAC,CAAC;aACrC;SACJ;KACJ,CAAA,CAAA;AAAA,CAAA;AAED,SAAe,kBAAkB,CAAC,IAAI,EAAA;;AAClC,QAAA,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;AACpB,YAAA,MAAM,uBAAuB,CAAC,GAAG,CAAC,CAAC;SACtC;KACJ,CAAA,CAAA;AAAA,CAAA;AAEY,MAAA,WAAW,GAAmD,CAAO,OAAO,KAAI,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;AACzF,IAAA,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE,OAAO,CAAC,CAAC;AAEzD,IAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AAC/B,IAAA,MAAM,WAAW,GAAG;AAChB,QAAAC,aAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC;AACjC,QAAAA,aAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC;AAChC,QAAAA,aAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,CAAC;KAC5C,CAAC;AACF,IAAA,MAAM,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAEtC,OAAO;AACH,QAAA,OAAO,EAAE,IAAI;KAChB,CAAC;AACN,CAAC"}

package/lib/executors/sort-package-json/executor.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/executors/sort-package-json/schema.json

@@ -0,0 +1,9 @@
+{
+    "$schema": "https://json-schema.org/schema",
+    "version": 2,
+    "title": "SortPackageJson executor",
+    "description": "",
+    "type": "object",
+    "properties": {},
+    "required": []
+}

package/lib/executors/update-deploy-version/executor.cjs

@@ -0,0 +1,22 @@
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),child_process=require('child_process'),util=require('util'),path=require('path');const basePath = process.cwd();
+const LERNA_JSON_PATH = path.join(basePath, 'lerna.json');
+const JENKINSFILE_PATH = path.join(basePath, 'Jenkinsfile');
+const CONFIG_FILE_PATH = path.join(basePath, 'values-dev.yaml'); // Updated path
+const runScript = (scriptPath, args) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+    console.log(`Running script: ${scriptPath} with args: ${args}`);
+    const { stdout, stderr } = yield util.promisify(child_process.exec)(`node ${scriptPath} ${args}`);
+    console.log(stdout);
+    console.error(stderr);
+    return !stderr;
+});
+const runExecutor = (options) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+    console.log('Executor ran for UpdateDeployVersion', options);
+    const success = yield Promise.all([
+        runScript(path.join(basePath, './tools/deploy-cli/updateLernaVersion.js'), `${LERNA_JSON_PATH} ${options.version}`),
+        runScript(path.join(basePath, './tools/deploy-cli/updateJenkinsfileVersion.js'), `${JENKINSFILE_PATH} ${options.version}`),
+        runScript(path.join(basePath, './tools/deploy-cli/updateYamlSettings.js'), `${CONFIG_FILE_PATH} ${options.version}`),
+    ]).then((values) => {
+        return !(values.some(value => value === false));
+    });
+    return { success };
+});exports.default=runExecutor;exports.runExecutor=runExecutor;//# sourceMappingURL=executor.cjs.map

package/lib/executors/update-deploy-version/executor.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor.cjs","sources":["../../../src/executors/update-deploy-version/executor.ts"],"sourcesContent":[null],"names":["__awaiter","promisify","exec"],"mappings":"kLAMA,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AAC/B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AAC1D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;AAC5D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;AAEhE,MAAM,SAAS,GAAG,CAAO,UAAU,EAAE,IAAI,KAAIA,eAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;IACzC,OAAO,CAAC,GAAG,CAAC,CAAA,gBAAA,EAAmB,UAAU,CAAe,YAAA,EAAA,IAAI,CAAE,CAAA,CAAC,CAAC;AAChE,IAAA,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAMC,cAAS,CAACC,kBAAI,CAAC,CAC5C,CAAQ,KAAA,EAAA,UAAU,IAAI,IAAI,CAAA,CAAE,CAC/B,CAAC;AACF,IAAA,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACpB,IAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAEtB,OAAO,CAAC,MAAM,CAAC;AACnB,CAAC,CAAA,CAAA;AAEY,MAAA,WAAW,GAAuD,CAAO,OAAO,KAAIF,eAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;AAC7F,IAAA,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;AAC7D,IAAA,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;AAC9B,QAAA,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,0CAA0C,CAAC,EAAE,GAAG,eAAe,CAAA,CAAA,EAAI,OAAO,CAAC,OAAO,EAAE,CAAC;AACnH,QAAA,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,gDAAgD,CAAC,EAAE,GAAG,gBAAgB,CAAA,CAAA,EAAI,OAAO,CAAC,OAAO,EAAE,CAAC;AAC1H,QAAA,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,0CAA0C,CAAC,EAAE,GAAG,gBAAgB,CAAA,CAAA,EAAI,OAAO,CAAC,OAAO,EAAE,CAAC;AACvH,KAAA,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAI;AACf,QAAA,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC;AACpD,KAAC,CAAC,CAAC;IAEH,OAAO,EAAE,OAAO,EAAE,CAAC;AACvB,CAAC"}

package/lib/executors/update-deploy-version/executor.d.ts

@@ -0,0 +1,4 @@
+import { PromiseExecutor } from '@nx/devkit';
+import { UpdateDeployVersionExecutorSchema } from './schema';
+export declare const runExecutor: PromiseExecutor<UpdateDeployVersionExecutorSchema>;
+export default runExecutor;

package/lib/executors/update-deploy-version/executor.mjs

@@ -0,0 +1,22 @@
+import {__awaiter}from'tslib';import {exec}from'child_process';import {promisify}from'util';import path__default from'path';const basePath = process.cwd();
+const LERNA_JSON_PATH = path__default.join(basePath, 'lerna.json');
+const JENKINSFILE_PATH = path__default.join(basePath, 'Jenkinsfile');
+const CONFIG_FILE_PATH = path__default.join(basePath, 'values-dev.yaml'); // Updated path
+const runScript = (scriptPath, args) => __awaiter(void 0, void 0, void 0, function* () {
+    console.log(`Running script: ${scriptPath} with args: ${args}`);
+    const { stdout, stderr } = yield promisify(exec)(`node ${scriptPath} ${args}`);
+    console.log(stdout);
+    console.error(stderr);
+    return !stderr;
+});
+const runExecutor = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    console.log('Executor ran for UpdateDeployVersion', options);
+    const success = yield Promise.all([
+        runScript(path__default.join(basePath, './tools/deploy-cli/updateLernaVersion.js'), `${LERNA_JSON_PATH} ${options.version}`),
+        runScript(path__default.join(basePath, './tools/deploy-cli/updateJenkinsfileVersion.js'), `${JENKINSFILE_PATH} ${options.version}`),
+        runScript(path__default.join(basePath, './tools/deploy-cli/updateYamlSettings.js'), `${CONFIG_FILE_PATH} ${options.version}`),
+    ]).then((values) => {
+        return !(values.some(value => value === false));
+    });
+    return { success };
+});export{runExecutor as default,runExecutor};//# sourceMappingURL=executor.mjs.map

package/lib/executors/update-deploy-version/executor.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor.mjs","sources":["../../../src/executors/update-deploy-version/executor.ts"],"sourcesContent":[null],"names":["path"],"mappings":"4HAMA,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AAC/B,MAAM,eAAe,GAAGA,aAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AAC1D,MAAM,gBAAgB,GAAGA,aAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;AAC5D,MAAM,gBAAgB,GAAGA,aAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;AAEhE,MAAM,SAAS,GAAG,CAAO,UAAU,EAAE,IAAI,KAAI,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;IACzC,OAAO,CAAC,GAAG,CAAC,CAAA,gBAAA,EAAmB,UAAU,CAAe,YAAA,EAAA,IAAI,CAAE,CAAA,CAAC,CAAC;AAChE,IAAA,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAC5C,CAAQ,KAAA,EAAA,UAAU,IAAI,IAAI,CAAA,CAAE,CAC/B,CAAC;AACF,IAAA,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACpB,IAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAEtB,OAAO,CAAC,MAAM,CAAC;AACnB,CAAC,CAAA,CAAA;AAEY,MAAA,WAAW,GAAuD,CAAO,OAAO,KAAI,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;AAC7F,IAAA,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;AAC7D,IAAA,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;AAC9B,QAAA,SAAS,CAACA,aAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,0CAA0C,CAAC,EAAE,GAAG,eAAe,CAAA,CAAA,EAAI,OAAO,CAAC,OAAO,EAAE,CAAC;AACnH,QAAA,SAAS,CAACA,aAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,gDAAgD,CAAC,EAAE,GAAG,gBAAgB,CAAA,CAAA,EAAI,OAAO,CAAC,OAAO,EAAE,CAAC;AAC1H,QAAA,SAAS,CAACA,aAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,0CAA0C,CAAC,EAAE,GAAG,gBAAgB,CAAA,CAAA,EAAI,OAAO,CAAC,OAAO,EAAE,CAAC;AACvH,KAAA,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAI;AACf,QAAA,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC;AACpD,KAAC,CAAC,CAAC;IAEH,OAAO,EAAE,OAAO,EAAE,CAAC;AACvB,CAAC"}

package/lib/executors/update-deploy-version/executor.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/executors/update-deploy-version/schema.json

@@ -0,0 +1,14 @@
+{
+    "$schema": "https://json-schema.org/schema",
+    "version": 2,
+    "title": "UpdateDeployVersion executor",
+    "description": "",
+    "type": "object",
+    "properties": {
+        "version": {
+            "type": "string",
+            "description": "Version to set"
+        }
+    },
+    "required": ["version"]
+}

package/lib/generators/add-backend/files/__tests__/test.ts.template

@@ -1,8 +1,7 @@
 import { createServer } from "http";
 import express from "express";
-import { gql } from 'graphql';
-import { ApolloServer } from '@apollo/server';
-import { ApolloServerPluginDrainHttpServer, } from '@apollo/server/plugin/drainHttpServer';
+import { ApolloServer, gql } from "apollo-server-express";
+import { ApolloServerPluginDrainHttpServer } from "apollo-server-core";
 import { PubSub } from "graphql-subscriptions";
 import { makeExecutableSchema } from "@graphql-tools/schema";
 import { WebSocketServer } from "ws";

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

@@ -81,11 +81,11 @@
         "@cdm-logger/client": "9.0.3",
         "@cdm-logger/server": "^9.0.3",
         "@cdmbase/graphql-type-uri": "^3.0.0",
-        "@common-stack/cache-api-server": "5.0.6-alpha.1",
-        "@common-stack/client-core": "5.0.6-alpha.1",
-        "@common-stack/core": "5.0.6-alpha.1",
-        "@common-stack/server-core": "5.0.6-alpha.1",
-        "@common-stack/store-mongo": "5.0.6-alpha.1",
+        "@common-stack/cache-api-server": "5.0.6-alpha.3",
+        "@common-stack/client-core": "5.0.6-alpha.3",
+        "@common-stack/core": "5.0.6-alpha.3",
+        "@common-stack/server-core": "5.0.6-alpha.3",
+        "@common-stack/store-mongo": "5.0.6-alpha.3",
         "@container-stack/core": "5.1.2",
         "@container-stack/mailing-api": "5.1.2",
         "@container-stack/notification-api-core": "5.1.2",
@@ -100,8 +100,15 @@
         "@remix-run/node": "^2.8.1",
         "@sentry/node": "~7.24.2",
         "apollo-datasource": "^3.3.1",
+        "apollo-datasource-rest": "^3.3.1",
         "apollo-errors": "^1.9.0",
+        "apollo-server-cache-memcached": "^3.3.1",
         "apollo-server-cache-redis": "^3.3.1",
+        "apollo-server-caching": "^3.3.0",
+        "apollo-server-core": "^3.11.1",
+        "apollo-server-errors": "^3.3.1",
+        "apollo-server-express": "^3.11.1",
+        "apollo-server-plugin-response-cache": "^3.8.1",
         "app-root-path": "^3.0.0",
         "body-parser": "^1.19.0",
         "cors": "^2.8.5",

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

@@ -4,7 +4,7 @@
     "sourceMap": true,
     "declaration": false,
     "allowSyntheticDefaultImports": true,
-    "rootDirs": ["./src","../knexfile.ts"],
+    "rootDirs": ["./src"],
     "outDir": "./dist"
   },
   "include": [

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

@@ -6,15 +6,13 @@ const nodeExternals = require('webpack-node-externals');
 const NodemonPlugin = require('nodemon-webpack-plugin'); // Ding
 const EnvListPlugin = require('@common-stack/env-list-loader');
 const buildConfig = require('./build.config');
-const { writeBackendModuleFile } = require('@common-stack/rollup-vite-utils/lib/utils/utils.cjs');
-const packageConfig = require('./config.json');
 
 const modulenameExtra = process.env.BUILD_MODULE_TO_INCLUDE ? `${process.env.BUILD_MODULE_TO_INCLUDE}|` : '';
 let modulenameRegex;
 
 try {
     modulenameRegex = new RegExp(
-        `(${modulenameExtra}ts-invariant|webpack/hot/poll)|(\\.(css|less|scss|png|ico|jpg|gif|xml|woff|woff2|otf|ttf|eot|svg)(\\?[0-9a-z]+)?$)`,
+        `(${modulenameExtra}ts-invariant|@common-stack/server-stack|webpack/hot/poll)|(\\.(css|less|scss|png|ico|jpg|gif|xml|woff|woff2|otf|ttf|eot|svg)(\\?[0-9a-z]+)?$)`,
     );
     console.log('Module Name Regex: ', modulenameRegex);
 } catch (error) {
@@ -27,12 +25,6 @@ if (process.env.BUILD_MODULE_TO_INCLUDE) {
     console.log('BUILD_MODULE_TO_INCLUDE is not set.');
 }
 
-try {
-    writeBackendModuleFile(path.join(__dirname, 'src/modules'), packageConfig);
-} catch (e) {
-    console.error(e);
-}
-
 const config = {
     entry: {
         index: (process.env.NODE_ENV !== 'production' ? ['webpack/hot/poll?200'] : []).concat([
@@ -81,7 +73,7 @@ const config = {
                     { loader: 'less-loader', options: { javascriptEnabled: true, sourceMap: true } },
                 ],
             },
-            { test: /\.graphqls/, use: { loader: 'raw-loader' } },
+            { test: /\.graphqls$/, use: { loader: 'raw-loader' } },
             { test: /\.(graphql|gql)$/, use: [{ loader: 'graphql-tag/loader' }] },
             // {
             //     test: /\.[tj]sx?$/,
@@ -120,6 +112,10 @@ const config = {
         unsafeCache: false,
     },
     resolve: {
+        alias: {
+            // Define your alias here
+            '@src': path.resolve(__dirname, 'src'),
+        },
         symlinks: true,
         cacheWithContext: false,
         unsafeCache: false,

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

@@ -29,7 +29,7 @@
     },
     "peerDependencies": {
         "@cdm-logger/client": "*",
-        "@common-stack/client-react": "5.0.6-alpha.1",
+        "@common-stack/client-react": "5.0.6-alpha.3",
         "@remix-run/react": "*",
         "antd": ">=5.1.6",
         "lodash": "*",