@common-stack/generate-plugin 8.0.1-alpha.1 → 8.0.1-alpha.2

package/src/generators/add-fullstack/generator.ts

@@ -5,7 +5,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import { AddFullstackGeneratorSchema } from './schema';
 import { getValid, isValid } from '../../utils';
-import { 
+import {
     updateJenkinsFile,
     updatePackageJson,
     backupLernaJson,
@@ -16,19 +16,18 @@ import {
     restoreFiles,
     updateRepository,
 } from './updates';
-import {
-    generateBackend,
-    generateFrontend,
-    generateMoleculer,
-    generatePackage,
-} from '../../index';
+import { generateBackend, generateFrontend, generateMoleculer, generatePackage } from '../../index';
 
 export async function addFullstackGenerator(tree: Tree, options: AddFullstackGeneratorSchema) {
-    const basePath = options.path || '';
+    let projectPath = options.path || '';
+    if (projectPath !== '') {
+        const basePath = process.cwd();
+        projectPath = path.relative(basePath, projectPath);
+    }
     const projectName = getValid(options.name) ?? 'fullstack-pro';
-    const projectRoot = path.join(basePath, projectName);
+    const projectRoot = path.join(projectPath, projectName);
 
-    console.log(`basePath: ${basePath}`);
+    // console.log(`Project Path: ${projectPath}`);
 
     // backup existing lerna values
     const lernaBackup = backupLernaJson(tree, projectRoot);
@@ -59,7 +58,7 @@ export async function addFullstackGenerator(tree: Tree, options: AddFullstackGen
     await formatFiles(tree);
 
     if (isValid(options.config)) {
-        const configPath = path.resolve(basePath, getValid(options.config));
+        const configPath = path.resolve(projectPath, getValid(options.config));
         if (fs.existsSync(configPath)) {
             try {
                 const configs = JSON.parse(fs.readFileSync(configPath).toString());

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

@@ -16,7 +16,7 @@
         "path": {
             "type": "string",
             "description": "The base path where the project will be created or updated",
-            "x-prompt": "Where do you want to create or update the project? (Leave empty for the current directory)"
+            "x-prompt": "Where do you want to create or update the project? (Please provide in absolute path, or leave empty for the current directory)"
         }
     },
     "required": ["name"]

package/tsconfig.spec.json

@@ -0,0 +1,9 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "types": ["jest", "node"]
+    },
+    "include": ["**/*.spec.ts", "**/*.test.ts"]
+}

package/docker-releases/backend/package.json

@@ -1,134 +0,0 @@
-{
-    "name": "base-backend-server",
-    "version": "6.0.6-alpha.82",
-    "private": true,
-    "description": "Starter kit for apollo server using webpack and typescript",
-    "keywords": [
-        "apollo",
-        "apollo-server",
-        "backend",
-        "express",
-        "graphiql",
-        "graphql",
-        "typescript",
-        "webpack"
-    ],
-    "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
-    "bugs": {
-        "url": "https://github.com/cdmbase/fullstack-pro/issues"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/cdmbase/fullstack-pro.git"
-    },
-    "license": "MIT",
-    "author": "CDMBase LLC",
-    "main": "dist/index.js",
-    "typings": "dist/main.d.ts",
-    "scripts": {
-        "build": "cross-env NODE_ENV=production webpack --config webpack.config.js",
-        "build:clean": "rimraf dist .awcache",
-        "build:dev": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env webpack --config webpack.config.js",
-        "db:migrate": "knex -- migrate:latest --cwd . --knexfile ./knexfile.js",
-        "db:migrate:rollback": "knex -- migrate:rollback  --cwd . --knexfile ./knexfile.js",
-        "db:seed": "yarn db:migrate && knex -- seed:run  --cwd . --knexfile ./knexfile.js",
-        "docker:build": "yarn build && docker build . -t $npm_package_name:$npm_package_version",
-        "docker:build:debug": "yarn build:debug && docker build . -t $npm_package_name:$npm_package_version",
-        "docker:run": "docker run  --env-file ../../config/staging/docker-staging.env -p 8080:8080 -it $npm_package_name:$npm_package_version",
-        "docker:run:debug": "cross-env NODE_ENV=development docker run  --env-file ../../config/staging/docker-staging.env -p 8080:8080 -it $npm_package_name:$npm_package_version",
-        "proddb:migrate": "NODE_ENV=production yarn db:migrate",
-        "proddb:migrate:rollback": "NODE_ENV=production yarn db:migrate:rollback",
-        "proddb:seed": "NODE_ENV=production yarn db:seed",
-        "prepublish": "yarn build:clean",
-        "stagedb:migrate": "cross-env ENV_FILE=../../config/test/test.env NODE_ENV=test yarn db:migrate",
-        "stagedb:migrate:rollback": "cross-env ENV_FILE=../../config/test/test.env NODE_ENV=test yarn db:migrate:rollback",
-        "stagedb:seed": "cross-env ENV_FILE=../../config/test/test.env NODE_ENV=test yarn db:seed",
-        "start": "cross-env NODE_ENV=production tsx dist/index.js",
-        "start:dev": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env tsx watch dist/index.js",
-        "start:staging": "cross-env NODE_ENV=staging ENV_FILE=../../config/staging/staging.env tsx dist/index.js",
-        "start:test": "cross-env NODE_ENV=test ENV_FILE=../../config/test/test.env tsx dist/index.js",
-        "test": "jest",
-        "test:notify": "yarn test:watch -- --notify",
-        "test:watch": "npm test -- --watch",
-        "preupver": "npm test",
-        "upver": "standard-version",
-        "watch": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env yarn build:dev && yarn start:dev",
-        "watch:staging": "cross-env NODE_ENV=test ENV_FILE=../../config/staging/staging.env yarn build && yarn start:stage",
-        "watch:test": "cross-env NODE_ENV=test ENV_FILE=../../config/test/test.env yarn build:test && yarn start:test"
-    },
-    "resolutions": {
-        "html-to-text": "^8.0.0"
-    },
-    "dependencies": {
-        "@apollo/client": "^3.9.0",
-        "@apollo/datasource-rest": "^6.3.0",
-        "@apollo/server": "^4.10.4",
-        "@apollo/server-plugin-response-cache": "^4.1.3",
-        "@apollo/utils.keyvadapter": "^3.1.0",
-        "@babel/runtime": "^7.20.1",
-        "@casl/ability": "^4.1.5",
-        "@cdm-logger/client": "^9.0.3",
-        "@cdm-logger/server": "^9.0.3",
-        "@cdmbase/graphql-type-uri": "^4.0.0",
-        "@common-stack/cache-api-server": "8.0.1-alpha.0",
-        "@common-stack/client-core": "8.0.1-alpha.0",
-        "@common-stack/core": "8.0.1-alpha.0",
-        "@common-stack/server-core": "8.0.1-alpha.0",
-        "@common-stack/server-stack": "8.0.1-alpha.0",
-        "@common-stack/store-mongo": "8.0.1-alpha.0",
-        "@graphql-tools/links": "~9.0.1",
-        "@graphql-tools/schema": "~10.0.6",
-        "@graphql-tools/stitch": "~9.2.10",
-        "@graphql-tools/utils": "~10.5.4",
-        "@graphql-tools/wrap": "~10.0.5",
-        "@keyv/redis": "2.8.4",
-        "@remix-run/node": "~2.15.3",
-        "@sentry/node": "~7.24.2",
-        "@sentry/profiling-node": "^8.25.0",
-        "apollo-errors": "^1.9.0",
-        "body-parser": "^1.19.0",
-        "cors": "^2.8.5",
-        "dataloader": "^2.0.0",
-        "dotenv": "^8.2.0",
-        "dotenv-esm": "^16.0.3-4",
-        "envalid": "~7.2.2",
-        "express": "^4.17.1",
-        "graphql": "^16.0.0",
-        "graphql-bigint": "^1.0.0",
-        "graphql-middleware": "^6.1.33",
-        "graphql-nats-subscriptions": "^1.5.0",
-        "graphql-playground-middleware-express": "^1.7.3",
-        "graphql-shield": "^7.3.5",
-        "graphql-subscriptions": "^2.0.0",
-        "graphql-tools": "~9.0.0",
-        "graphql-type-json": "^0.3.1",
-        "graphql-ws": "^5.11.2",
-        "inversify": "~6.0.2",
-        "ioredis": "^5.4.1",
-        "isomorphic-fetch": "^2.2.1",
-        "lodash": "^4.17.15",
-        "moleculer": "^0.14.2",
-        "mongoose": "^6.3.3",
-        "mongoose-autopopulate": "^1.1.0",
-        "mongoose-execution-time": "^1.1.0",
-        "morgan": "^1.9.1",
-        "nats": "^1.3.2",
-        "react": "18.2.0",
-        "redux": "^5.0.1",
-        "reflect-metadata": "^0.1.13",
-        "rxjs": "^7.8.1",
-        "subscriptions-transport-ws": "^0.11.0",
-        "universal-cookie-express": "^4.0.1",
-        "ws": "^8.11.0"
-    },
-    "devDependencies": {
-        "cross-env": "^7.0.3",
-        "esbuild-loader": "^4.2.2",
-        "pm2": "^5.2.2",
-        "rimraf": "^3.0.2",
-        "tsx": "^4.7.0"
-    },
-    "typescript": {
-        "definition": "dist/main.d.ts"
-    }
-}

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

@@ -1,121 +0,0 @@
-{
-    "name": "base-backend-server",
-    "version": "6.0.6-alpha.82",
-    "private": true,
-    "description": "Starter kit for apollo server using webpack and typescript",
-    "keywords": [
-        "apollo",
-        "apollo-server",
-        "backend",
-        "express",
-        "graphiql",
-        "graphql",
-        "typescript",
-        "webpack"
-    ],
-    "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
-    "bugs": {
-        "url": "https://github.com/cdmbase/fullstack-pro/issues"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/cdmbase/fullstack-pro.git"
-    },
-    "license": "MIT",
-    "author": "CDMBase LLC",
-    "main": "dist/index.js",
-    "typings": "dist/main.d.ts",
-    "scripts": {
-        "build": "cross-env NODE_ENV=production webpack --config webpack.config.js",
-        "build:clean": "rimraf dist .awcache",
-        "build:dev": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env webpack --config webpack.config.js",
-        "db:migrate": "knex -- migrate:latest --cwd . --knexfile ./knexfile.js",
-        "db:migrate:rollback": "knex -- migrate:rollback  --cwd . --knexfile ./knexfile.js",
-        "db:seed": "yarn db:migrate && knex -- seed:run  --cwd . --knexfile ./knexfile.js",
-        "docker:build": "yarn build && docker build . -t $npm_package_name:$npm_package_version",
-        "docker:build:debug": "yarn build:debug && docker build . -t $npm_package_name:$npm_package_version",
-        "docker:run": "docker run  --env-file ../../config/staging/docker-staging.env -p 8080:8080 -it $npm_package_name:$npm_package_version",
-        "docker:run:debug": "cross-env NODE_ENV=development docker run  --env-file ../../config/staging/docker-staging.env -p 8080:8080 -it $npm_package_name:$npm_package_version",
-        "proddb:migrate": "NODE_ENV=production yarn db:migrate",
-        "proddb:migrate:rollback": "NODE_ENV=production yarn db:migrate:rollback",
-        "proddb:seed": "NODE_ENV=production yarn db:seed",
-        "prepublish": "yarn build:clean",
-        "stagedb:migrate": "cross-env ENV_FILE=../../config/test/test.env NODE_ENV=test yarn db:migrate",
-        "stagedb:migrate:rollback": "cross-env ENV_FILE=../../config/test/test.env NODE_ENV=test yarn db:migrate:rollback",
-        "stagedb:seed": "cross-env ENV_FILE=../../config/test/test.env NODE_ENV=test yarn db:seed",
-        "start": "cross-env NODE_ENV=production tsx dist/index.js",
-        "start:dev": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env tsx watch dist/index.js",
-        "start:staging": "cross-env NODE_ENV=staging ENV_FILE=../../config/staging/staging.env tsx dist/index.js",
-        "start:test": "cross-env NODE_ENV=test ENV_FILE=../../config/test/test.env tsx dist/index.js",
-        "test": "jest",
-        "test:notify": "yarn test:watch -- --notify",
-        "test:watch": "npm test -- --watch",
-        "preupver": "npm test",
-        "upver": "standard-version",
-        "watch": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env yarn build:dev && yarn start:dev",
-        "watch:staging": "cross-env NODE_ENV=test ENV_FILE=../../config/staging/staging.env yarn build && yarn start:stage",
-        "watch:test": "cross-env NODE_ENV=test ENV_FILE=../../config/test/test.env yarn build:test && yarn start:test"
-    },
-    "resolutions": {
-        "html-to-text": "^8.0.0"
-    },
-    "dependencies": {
-        "@apollo/client": "^3.9.0",
-        "@cdm-logger/client": "^9.0.3",
-        "@cdm-logger/server": "^9.0.3",
-        "@common-stack/cache-api-server": "8.0.1-alpha.0",
-        "@common-stack/client-core": "8.0.1-alpha.0",
-        "@common-stack/client-react": "8.0.1-alpha.0",
-        "@common-stack/components-pro": "8.0.1-alpha.0",
-        "@common-stack/core": "8.0.1-alpha.0",
-        "@common-stack/remix-router-redux": "8.0.1-alpha.0",
-        "@common-stack/server-core": "8.0.1-alpha.0",
-        "@reduxjs/toolkit": "^2.2.6",
-        "@remix-run/express": "~2.15.3",
-        "@remix-run/node": "~2.15.3",
-        "@remix-run/react": "~2.15.3",
-        "@sentry/browser": "~5.11.2",
-        "cors": "^2.8.5",
-        "cross-fetch": "^4.0.0",
-        "dotenv": "^8.2.0",
-        "envalid": "~7.2.2",
-        "express": "^4.18.2",
-        "graphql": "^16.0.0",
-        "graphql-tag": "^2.11.0",
-        "graphql-ws": "^5.11.2",
-        "i18next": "^23.10.1",
-        "i18next-browser-languagedetector": "^8.0.0",
-        "i18next-fs-backend": "^2.3.1",
-        "i18next-http-backend": "^2.5.2",
-        "inversify": "~6.0.2",
-        "ioredis": "^5.4.1",
-        "isbot": "^4.1.0",
-        "isomorphic-fetch": "^2.2.1",
-        "lodash": "^4.17.15",
-        "prop-types": "^15.8.1",
-        "react": "18.3.1",
-        "react-dom": "18.3.1",
-        "react-i18next": "^14.1.0",
-        "react-redux": "^9.1.1",
-        "redux-observable": "^3.0.0-rc.2",
-        "redux-persist": "^6.0.0",
-        "redux-persist-transform-filter": "^0.0.20",
-        "reflect-metadata": "^0.1.13",
-        "remix-i18next": "~6.1.0",
-        "remix-island": "^0.2.0",
-        "rxjs": "^7.8.1",
-        "serialize-javascript": "^6.0.0",
-        "ts-deepmerge": "^7.0.0",
-        "ts-invariant": "^0.10.3"
-    },
-    "devDependencies": {
-        "cross-env": "^7.0.3",
-        "esbuild-loader": "^4.2.2",
-        "pm2": "^5.2.2",
-        "rimraf": "^3.0.2",
-        "tsx": "^4.7.0"
-    },
-    "typescript": {
-        "definition": "dist/main.d.ts"
-    }
-}

package/lib/generators/add-frontend/templates/postcss.config.js

@@ -1,6 +0,0 @@
-export default {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-}

package/src/generators/add-frontend/generator.spec.ts

@@ -1,20 +0,0 @@
-import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Tree, readProjectConfiguration } from '@nx/devkit';
-
-import { addFrontendGenerator } from './generator';
-import { AddFrontendGeneratorSchema } from './schema';
-
-describe('add-frontend generator', () => {
-    let tree: Tree;
-    const options: AddFrontendGeneratorSchema = { ns: 'test', directory: 'lib' };
-
-    beforeEach(() => {
-        tree = createTreeWithEmptyWorkspace();
-    });
-
-    it('should run successfully', async () => {
-        await addFrontendGenerator(tree, options);
-        const config = readProjectConfiguration(tree, 'test');
-        expect(config).toBeDefined();
-    });
-});