@common-stack/generate-plugin 6.0.6-alpha.10 → 6.0.6-alpha.100

package/src/generators/add-fullstack/files/LICENSE-IST

@@ -0,0 +1,39 @@
+The CDEBase Enterprise license (the “Enterprise License”)
+Copyright (c) 2018 cdebase LLC.
+
+With regard to the CDEBase Software:
+
+This software and associated documentation files (the "Software") may only be
+used in production, if you (and any entity that you represent) have agreed to,
+and are in compliance with, the CDEBase Terms of Service, available
+at https://about.cdebase.com/terms (the “Enterprise Terms”), or other
+agreement governing the use of the Software, as agreed by you and CDEBase,
+and otherwise have a valid CDEBase Enterprise subscription for the
+correct number of user seats. Subject to the foregoing sentence, you are free to
+modify this Software and publish patches to the Software. You agree that CDEBase
+and/or its licensors (as applicable) retain all right, title and interest in and
+to all such modifications and/or patches, and all such modifications and/or
+patches may only be used, copied, modified, displayed, distributed, or otherwise
+exploited with a valid CDEBase Enterprise subscription for the correct
+number of user seats. Notwithstanding the foregoing, you may copy and modify
+the Software for development and testing purposes, without requiring a
+subscription. You agree that CDEBase and/or its licensors (as applicable) retain
+all right, title and interest in and to all such modifications. You are not
+granted any other rights beyond what is expressly stated herein. Subject to the
+foregoing, it is forbidden to copy, merge, publish, distribute, sublicense,
+and/or sell the Software.
+
+The full text of this Enterprise License shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+For all third party components incorporated into the CDEBase Software, those
+components are licensed under the original license provided by the owner of the
+applicable component.

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

@@ -43,7 +43,7 @@
         "db:migrate": "knex migrate:latest --cwd . --knexfile ./servers/backend-server/knexfile.js",
         "db:migrate:rollback": "knex migrate:rollback  --cwd . --knexfile ./servers/backend-server/knexfile.js",
         "db:seed": "yarn db:migrate && knex seed:run  --cwd . --knexfile ./servers/backend-server/knexfile.js",
-        "predevpublish": "if ! git show-ref --verify --quiet refs/remotes/origin/$PUBLISH_BRANCH; then git checkout -b $PUBLISH_BRANCH && git push -u origin $PUBLISH_BRANCH; fi && git fetch origin $PUBLISH_BRANCH && git checkout $PUBLISH_BRANCH && git pull origin $PUBLISH_BRANCH && git merge -s recursive -X theirs $REPOSITORY_BRANCH -m \"merge from $REPOSITORY_BRANCH\" && yarn gitcommit && node tools/update-dependency-version.js && yarn gitcommit",
+        "predevpublish": "if ! git show-ref --verify --quiet refs/remotes/origin/$PUBLISH_BRANCH; then git checkout -b $PUBLISH_BRANCH && git push -u origin $PUBLISH_BRANCH; fi && git fetch origin $PUBLISH_BRANCH && git checkout $PUBLISH_BRANCH && git pull origin $PUBLISH_BRANCH && git merge -s recursive -X theirs $REPOSITORY_BRANCH -m \"merge from $REPOSITORY_BRANCH\" && yarn gitcommit && node tools/update-dependency-version.mjs && yarn gitcommit",
         "devpublish": "lerna publish prerelease --ignore-scripts --exact",
         "postdevpublish": "git checkout $REPOSITORY_BRANCH",
         "devpublish:auto": "yarn devpublish -- --yes",
@@ -60,7 +60,7 @@
         "husky-skip": "cross-env HUSKY_SKIP_HOOKS=1",
         "jest": "./node_modules/.bin/jest",
         "lerna": "lerna bootstrap",
-        "prelernapublish": "git checkout publish && git pull origin publish  && git merge -s recursive -X theirs master  -m 'merge from master' && yarn gitcommit && node tools/update-dependency-version.js && yarn gitcommit",
+        "prelernapublish": "git checkout publish && git pull origin publish  && git merge -s recursive -X theirs master  -m 'merge from master' && yarn gitcommit && node tools/update-dependency-version.mjs && yarn gitcommit",
         "lernapublish": "lerna publish patch --ignore-scripts",
         "postlernapublish": "yarn update-lerna-on-develop && git checkout master",
         "lint": "eslint --ext js --ext ts --ext tsx --ext md",
@@ -146,8 +146,9 @@
         "@babel/preset-typescript": "^7.18.6",
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/env-list-loader": "6.0.6-alpha.5",
-        "@common-stack/generate-plugin": "6.0.6-alpha.9",
+        "@common-stack/env-list-loader": "6.0.6-alpha.91",
+        "@common-stack/generate-plugin": "6.0.6-alpha.99",
+        "@common-stack/rollup-vite-utils": "6.0.6-alpha.99",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
         "@graphql-codegen/cli": "^5.0.2",
@@ -166,15 +167,16 @@
         "@redux-devtools/core": "^3.13.1",
         "@redux-devtools/dock-monitor": "^3.0.1",
         "@redux-devtools/log-monitor": "^4.0.1",
-        "@remix-run/dev": "^2.9.2",
-        "@remix-run/react": "^2.9.2",
+        "@rollup/plugin-alias": "^5.1.0",
+        "@rollup/plugin-babel": "^6.0.4",
         "@rollup/plugin-graphql": "2.0.2",
         "@rollup/plugin-image": "^3.0.1",
         "@rollup/plugin-json": "^6.1.0",
-        "@rollup/plugin-typescript": "^9.0.2",
+        "@rollup/plugin-node-resolve": "^15.2.3",
+        "@rollup/plugin-typescript": "^11.1.5",
         "@shelf/jest-mongodb": "^4.1.3",
         "@svgr/webpack": "^6.5.1",
-        "@testing-library/react": "^16.4.0",
+        "@testing-library/react": "^16.0.1",
         "@testing-library/react-hooks": "^8.0.1",
         "@types/async": "^3.2.15",
         "@types/body-parser": "1.19.2",
@@ -193,7 +195,6 @@
         "@types/react": "^18.2.20",
         "@types/react-dom": "^18.2.7",
         "@types/react-helmet": "^6.1.5",
-        "@types/react-redux": "^7.1.24",
         "@types/react-test-renderer": "^18.0.0",
         "@types/redux-logger": "^3.0.9",
         "@types/semver": "^7.3.13",
@@ -205,6 +206,7 @@
         "@typescript-eslint/parser": "^6.7.4",
         "@web/rollup-plugin-copy": "^0.5.1",
         "@webpack-cli/serve": "^1.7.0",
+        "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
         "autoprefixer": "^10.4.13",
         "babel-core": "^7.0.0-bridge.0",
         "babel-eslint": "^10.1.0",
@@ -235,7 +237,6 @@
         "eslint-config-airbnb-typescript": "^18.0.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-loader": "^4.0.2",
-        "eslint-plugin-graphql": "^4.0.0",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-jest": "^28.2.0",
         "eslint-plugin-jsdoc": "^48.2.3",
@@ -257,6 +258,7 @@
         "html-webpack-plugin": "^5.5.0",
         "http-proxy-middleware": "^2.0.6",
         "husky": "^9.1.5",
+        "glob": "^11.0.0",
         "ignore-loader": "^0.1.2",
         "ip": "^1.1.8",
         "isomorphic-style-loader": "^5.3.2",
@@ -265,7 +267,9 @@
         "jest-css-modules-transform": "^4.4.2",
         "jest-dom": "^4.0.0",
         "jest-junit": "^14.0.1",
+        "jest-environment-jsdom": "^29.3.0",
         "jest-matcher-utils": "^29.2.2",
+        "jest-raw-loader": "^1.0.1",
         "jest-transform-graphql": "^2.1.0",
         "jsdom": "^20.0.2",
         "lerna": "8",
@@ -326,7 +330,7 @@
         "ts-node": "^10.9.1",
         "tslib": "^2.4.1",
         "typedoc": "^0.23.20",
-        "typescript": "^5.1.6",
+        "typescript": "^5.5.4",
         "url-loader": "^4.1.1",
         "wait-on": "^6.0.1",
         "webpack": "^5.74.0",

package/src/generators/add-fullstack/files/tools/html-plugin-template.ejs

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <base href="/">
+    <meta charset="utf-8">
+    <title>
+        <@= htmlWebpackPlugin.options.title @>
+    </title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+
+<body>
+    <div class="demo">
+        <div id="root">
+            Try building the demo:
+            <pre>
+        </pre> ...and refreshing this page!
+        </div>
+    </div>
+    <footer class="dark">
+        <section class="container copyright">
+            CDMBase LLC
+        </section>
+    </footer>
+</body>
+
+</html>

package/src/generators/add-fullstack/files/tools/update-dependencies.mjs

@@ -10,86 +10,118 @@ const __dirname = fileURLToPath(new URL('.', import.meta.url));
 const JSON_SPACING = 4;
 const ADD_END_NEWLINE = true; // Set to true to add a newline at the end of the file
 
-// Paths to package.json files
-const backendPackagePath = resolve(__dirname, '../servers/backend-server/package.json');
-const frontendPackagePath = resolve(__dirname, '../servers/frontend-server/package.json');
+// Paths to package.json files (now using arrays to handle multiple paths for backend, frontend, and mobile)
+const packagePaths = {
+    backend: [
+        resolve(__dirname, '../servers/backend-server/package.json'),
+    ],
+    frontend: [
+        resolve(__dirname, '../servers/frontend-server/package.json'),
+    ],
+    mobile: [
+        resolve(__dirname, '../portable-devices/mobile/package.json'),
+    ]
+};
 
 // Packages to check
 const packagesToCheck = [
     '@common-stack/server-stack',
-    '@common-stack/frontend-stack-react'
+    '@common-stack/frontend-stack-react',
+    '@common-stack/mobile-stack-react'
 ];
 
+// Utility function to wrap `exec` in a promise for sequential execution
+const execCommand = (command, cwd) => {
+    return new Promise((resolve, reject) => {
+        exec(command, { cwd }, (err, stdout, stderr) => {
+            if (err) {
+                console.error(`Error executing command: ${command}\n${stderr}`);
+                return reject(err);
+            }
+            console.log(stdout);
+            resolve();
+        });
+    });
+};
+
 // Function to update dependencies
 const updateDependencies = async (targetPackagePath, sourcePackagePath) => {
-  const targetPackageJson = JSON.parse(await readFile(targetPackagePath, 'utf-8'));
-  const sourcePackageJson = JSON.parse(await readFile(sourcePackagePath, 'utf-8'));
-
-  const mergeDependencies = (targetDeps = {}, sourceDeps = {}) => ({
-    ...targetDeps,
-    ...sourceDeps
-  });
-
-  // Merge dependencies only
-  targetPackageJson.dependencies = mergeDependencies(
-    targetPackageJson.dependencies,
-    sourcePackageJson.dependencies
-  );
-
-  // Format the JSON string with the specified spacing
-  let jsonString = JSON.stringify(targetPackageJson, null, JSON_SPACING);
-
-  // Optionally add a newline at the end
-  if (ADD_END_NEWLINE) {
-    jsonString += '\n';
-  }
-
-  // Write the formatted JSON back to disk
-  await writeFile(targetPackagePath, jsonString, 'utf-8');
+    const targetPackageJson = JSON.parse(await readFile(targetPackagePath, 'utf-8'));
+    const sourcePackageJson = JSON.parse(await readFile(sourcePackagePath, 'utf-8'));
+
+    const mergeDependencies = (targetDeps = {}, sourceDeps = {}) => ({
+        ...targetDeps,
+        ...sourceDeps
+    });
+
+    // Merge dependencies only
+    targetPackageJson.dependencies = mergeDependencies(targetPackageJson.dependencies, sourcePackageJson.dependencies);
+
+    // Format the JSON string with the specified spacing
+    let jsonString = JSON.stringify(targetPackageJson, null, JSON_SPACING);
+
+    // Optionally add a newline at the end
+    if (ADD_END_NEWLINE) {
+        jsonString += '\n';
+    }
+
+    // Write the formatted JSON back to disk
+    await writeFile(targetPackagePath, jsonString, 'utf-8');
 };
 
-// Function to run `ncu`, update dependencies, and then run linting
+// Function to run `ncu`, `yarn` from the root, update dependencies, and then run linting
 export const runUpdateDependencies = async () => {
-  // Run `ncu` command to update the dependencies from the root level
-  await new Promise((resolve, reject) => {
-    exec('ncu -u -t minor "@common-stack*" && lerna exec "ncu -u -t minor /@common-stack*/"', { cwd: resolve(__dirname, '..') }, (err, stdout, stderr) => {
-      if (err) {
-        console.error(`Error running ncu and lerna: ${stderr}`);
-        return reject(err);
-      }
-      console.log(stdout);
-      resolve();
-    });
-  });
+    // Step 1: Run `ncu` to update the dependencies from the root level
+    console.log('Updating dependencies using `ncu`...');
+    await execCommand(
+        'ncu -u -t minor "@common-stack*" && lerna exec "ncu -u -t minor /@common-stack*/"',
+        resolve(__dirname, '..')
+    );
 
-  // Check for changes in the specified packages
-  for (const packageName of packagesToCheck) {
-    const packagePath = resolve(__dirname, `../node_modules/${packageName}/package.json`);
-    try {
-      await updateDependencies(
-        packageName.includes('server-stack') ? backendPackagePath : frontendPackagePath,
-        packagePath
-      );
-    } catch (error) {
-      console.warn(`Package ${packageName} not found or failed to update:`, error);
+    // Step 2: Run `yarn` to install updated packages from the root
+    console.log('Running yarn install...');
+    await execCommand('yarn', resolve(__dirname, '..'));
+
+    // Step 3: Update dependencies for each package
+    for (const packageName of packagesToCheck) {
+        const packagePath = resolve(__dirname, `../node_modules/${packageName}/package.json`);
+        let targetPaths;
+
+        // Determine the target package.json paths (array of paths)
+        if (packageName.includes('server-stack')) {
+            targetPaths = packagePaths.backend;
+        } else if (packageName.includes('mobile-stack-react')) {
+            targetPaths = packagePaths.mobile;
+        } else {
+            targetPaths = packagePaths.frontend;
+        }
+
+        // Iterate over all target paths in the corresponding array
+        for (const targetPackagePath of targetPaths) {
+            try {
+                await updateDependencies(targetPackagePath, packagePath);
+                console.log(`Updated dependencies for ${packageName} in ${targetPackagePath}`);
+            } catch (error) {
+                console.warn(`Package ${packageName} not found or failed to update in ${targetPackagePath}:`, error);
+            }
+        }
     }
-  }
 
-  console.log('Dependencies from @common-stack packages have been updated.');
+    console.log('Dependencies from @common-stack packages have been updated.');
 
-  // Run linting to apply Prettier
-  try {
-    await runLintStaged();
-    console.log('Prettier formatting applied.');
-  } catch (err) {
-    console.error('Failed to run Prettier:', err);
-  }
+    // Step 4: Run linting to apply Prettier
+    try {
+        await runLintStaged();
+        console.log('Prettier formatting applied.');
+    } catch (err) {
+        console.error('Failed to run Prettier:', err);
+    }
 };
 
 // Execute the function if this file is run directly
 if (import.meta.url === `file://${process.argv[1]}`) {
-  runUpdateDependencies().catch(err => {
-    console.error('Failed to update dependencies:', err);
-    process.exit(1);
-  });
+    runUpdateDependencies().catch((err) => {
+        console.error('Failed to update dependencies:', err);
+        process.exit(1);
+    });
 }

package/src/generators/add-fullstack/files/tools/update-dependency-link.mjs

@@ -1,4 +1,4 @@
-import glob from 'glob';
+import { glob } from 'glob';
 import { resolve, dirname, relative } from 'path';
 import { readFileSync, writeFileSync } from 'fs';
 import simpleGit from 'simple-git';
@@ -8,25 +8,27 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
+const git = simpleGit();
+const monorepoRoot = resolve(__dirname, '..');
+
 // matching prettier format
 const JSON_SPACING = 4;
 const ADD_END_NEWLINE = true; // Set to true to add a newline at the end of the file
 
-const git = simpleGit();
-
-const monorepoRoot = resolve(__dirname, '..');
-
-const findPackageJsonFiles = () => {
-    return new Promise((resolve, reject) => {
-        glob(
+const findPackageJsonFiles = async () => {
+    try {
+        const findings = await glob(
             `${monorepoRoot}/+(servers|portable-devices|packages|packages-modules)/**/package.json`,
             { onlyFiles: true, ignore: '**/node_modules/**' },
             (err, files) => {
-                if (err) reject(`Unable to scan directory: ${err}`);
+                if (err) reject();
                 resolve(files);
             },
         );
-    });
+        return findings;
+    } catch (err) {
+        throw new Error(`Unable to scan directory: ${err}`);
+    }
 };
 
 const buildPackageMap = async () => {

package/src/generators/add-fullstack/files/tools/{update-dependency-version.js → update-dependency-version.mjs}

@@ -1,26 +1,34 @@
-const path = require('path');
-const fs = require('fs');
-const simpleGit = require('simple-git');
-const glob = require('glob');
+import { glob } from 'glob';
+import { resolve, join, dirname, relative } from 'path';
+import { readFileSync, writeFileSync } from 'fs';
+import simpleGit from 'simple-git';
+import { runLintStaged } from './runLint.mjs';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 const git = simpleGit();
-const monorepoRoot = path.resolve(__dirname, '..');
+const monorepoRoot = resolve(__dirname, '..');
 
 // matching prettier format
 const JSON_SPACING = 4;
 const ADD_END_NEWLINE = true; // Set to true to add a newline at the end of the file
 
-const findPackageJsonFiles = () => {
-    return new Promise((resolve, reject) => {
-        glob(
+const findPackageJsonFiles = async () => {
+    try {
+        const findings = await glob(
             `${monorepoRoot}/+(servers|portable-devices|packages|packages-modules)/**/package.json`,
             { onlyFiles: true, ignore: '**/node_modules/**' },
             (err, files) => {
-                if (err) reject(`Unable to scan directory: ${err}`);
+                if (err) reject();
                 resolve(files);
             },
         );
-    });
+        return findings;
+    } catch (err) {
+        throw new Error(`Unable to scan directory: ${err}`);
+    }
 };
 
 const buildPackageMap = async () => {
@@ -28,10 +36,10 @@ const buildPackageMap = async () => {
     const packageMap = new Map();
 
     packageJsonFiles.forEach((file) => {
-        const packageJson = JSON.parse(fs.readFileSync(file, 'utf8'));
+        const packageJson = JSON.parse(readFileSync(file, 'utf8'));
         if (packageJson.name) {
             packageMap.set(packageJson.name, {
-                path: path.dirname(file),
+                path: dirname(file),
                 version: packageJson.version,
             });
         }
@@ -46,11 +54,11 @@ const searchAndUpdate = (dependencies, filePath, obj, packageMap) => {
     for (const key in dependencies) {
         if (dependencies[key].startsWith('link:')) {
             const relativeDepFolder = dependencies[key].split('link:')[1];
-            const dependencyFolder = path.join(path.dirname(filePath), relativeDepFolder);
+            const dependencyFolder = join(dirname(filePath), relativeDepFolder);
 
             try {
-                const packageJsonPath = path.join(dependencyFolder, 'package.json');
-                const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+                const packageJsonPath = join(dependencyFolder, 'package.json');
+                const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'));
                 if (dependencies[key] !== packageJson.version) {
                     dependencies[key] = packageJson.version;
                     modified = true;
@@ -74,7 +82,7 @@ const searchAndUpdate = (dependencies, filePath, obj, packageMap) => {
         if (ADD_END_NEWLINE) {
             formattedJson += '\n';
         }
-        fs.writeFileSync(filePath, formattedJson, 'utf8');
+        writeFileSync(filePath, formattedJson, 'utf8');
     }
 
     return modified;
@@ -88,7 +96,7 @@ const updateDependencies = async () => {
     packageJsonFiles.forEach((file) => {
         if (!file.includes('node_modules')) {
             try {
-                const data = fs.readFileSync(file, 'utf8');
+                const data = readFileSync(file, 'utf8');
                 const obj = JSON.parse(data);
                 const { dependencies, peerDependencies, devDependencies } = obj;
 
@@ -106,16 +114,39 @@ const updateDependencies = async () => {
         }
     });
 
-    if (modifiedFiles.length > 0) {
-        await git.add(modifiedFiles);
-        await git.commit('Updated packages to use correct versions and linked dependencies');
-    } else {
-        console.log('No changes detected');
-    }
+    return modifiedFiles;
 };
 
 updateDependencies()
-    .then(() => {
-        console.log('Dependencies updated successfully.');
+    .then((modifiedFiles) => {
+        const addArray = modifiedFiles.map((file) => `./${relative(monorepoRoot, file)}`);
+        console.log('-- Modified Files --', modifiedFiles, addArray);
+        if (addArray.length === 0) {
+            console.log('No files to stage.');
+            return null;
+        }
+        return git.add(addArray).then(() => git.status()); // Stage files and then check status
     })
-    .catch((err) => console.error(`Error in updateDependencies: ${err.message}`));
+    .then((status) => {
+        if (status && status.modified.length) {
+            const fileArray = status.modified.filter((element) => element.includes('package.json'));
+            const addArray = fileArray.map((element) => `./${element}`);
+            return git
+                .add(addArray)
+                .then(runLintStaged)
+                .then(() => git.status()); // Run lint-staged after adding
+        } else {
+            console.log('No changes to lint or commit.');
+            return null;
+        }
+    })
+    .then((status) => {
+        if (status && status.modified.length > 0) {
+            return git.commit('Updated packages to use correct versions');
+        } else {
+            console.log('No changes after linting. Nothing to commit.');
+        }
+    })
+    .catch((err) => {
+        console.error(err);
+    });