@common-stack/generate-plugin 6.0.6-alpha.16 → 6.0.6-alpha.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/lib/generators/add-backend/files/package.json +3 -1
- package/lib/generators/add-backend/generator.cjs +1 -1
- package/lib/generators/add-backend/generator.cjs.map +1 -1
- package/lib/generators/add-backend/generator.mjs +1 -1
- package/lib/generators/add-backend/generator.mjs.map +1 -1
- package/lib/generators/add-frontend/frameworks/antui/root.tsx.template +0 -2
- package/lib/generators/add-frontend/frameworks/chakraui/root.tsx.template +3 -2
- package/lib/generators/add-frontend/frameworks/tailwindui/root.tsx.template +2 -2
- package/lib/generators/add-frontend/generator.cjs +1 -1
- package/lib/generators/add-frontend/generator.cjs.map +1 -1
- package/lib/generators/add-frontend/generator.mjs +1 -1
- package/lib/generators/add-frontend/generator.mjs.map +1 -1
- package/lib/generators/add-frontend/templates/package.json +3 -3
- package/lib/generators/add-fullstack/files/package.json +1 -1
- package/lib/generators/add-fullstack/files/tools/html-plugin-template.ejs +28 -0
- package/lib/generators/add-fullstack/updates/lernaJsonUpdate.cjs +3 -3
- package/lib/generators/add-fullstack/updates/lernaJsonUpdate.cjs.map +1 -1
- package/lib/generators/add-fullstack/updates/lernaJsonUpdate.mjs +3 -3
- package/lib/generators/add-fullstack/updates/lernaJsonUpdate.mjs.map +1 -1
- package/lib/generators/add-moleculer/files/package.json +1 -1
- package/lib/utils/index.cjs +1 -18
- package/lib/utils/index.cjs.map +1 -1
- package/lib/utils/index.d.ts +0 -2
- package/lib/utils/index.mjs +1 -18
- package/lib/utils/index.mjs.map +1 -1
- package/lib/utils/syncConfig.cjs +2 -2
- package/lib/utils/syncConfig.cjs.map +1 -1
- package/lib/utils/syncConfig.mjs +2 -2
- package/lib/utils/syncConfig.mjs.map +1 -1
- package/package.json +3 -3
- package/src/generators/add-backend/generator.ts +1 -1
- package/src/generators/add-frontend/frameworks/antui/root.tsx.template +0 -2
- package/src/generators/add-frontend/frameworks/chakraui/root.tsx.template +3 -2
- package/src/generators/add-frontend/frameworks/tailwindui/root.tsx.template +2 -2
- package/src/generators/add-frontend/generator.ts +1 -1
- package/src/generators/add-fullstack/files/package.json +1 -1
- package/src/generators/add-fullstack/files/tools/html-plugin-template.ejs +28 -0
- package/src/generators/add-fullstack/updates/lernaJsonUpdate.ts +3 -3
- package/src/generators/add-moleculer/files/package.json +1 -1
- package/src/utils/index.ts +0 -19
- package/src/utils/syncConfig.ts +3 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [6.0.6-alpha.18](https://github.com/cdmbase/common-stack/compare/v6.0.6-alpha.17...v6.0.6-alpha.18) (2024-09-11)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @common-stack/generate-plugin
|
|
9
|
+
|
|
10
|
+
## [6.0.6-alpha.17](https://github.com/cdmbase/common-stack/compare/v6.0.6-alpha.16...v6.0.6-alpha.17) (2024-09-10)
|
|
11
|
+
|
|
12
|
+
**Note:** Version bump only for package @common-stack/generate-plugin
|
|
13
|
+
|
|
6
14
|
## [6.0.6-alpha.16](https://github.com/cdmbase/common-stack/compare/v6.0.6-alpha.15...v6.0.6-alpha.16) (2024-09-08)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @common-stack/generate-plugin
|
|
@@ -62,7 +62,9 @@
|
|
|
62
62
|
"dependencies": {
|
|
63
63
|
"@apollo/client": "^3.9.0",
|
|
64
64
|
"@babel/runtime": "^7.20.1",
|
|
65
|
-
"@common-stack/server-stack": "6.0.6-alpha.
|
|
65
|
+
"@common-stack/server-stack": "6.0.6-alpha.16",
|
|
66
|
+
"@container-stack/mailing-api-server": "^5.2.1-alpha.2",
|
|
67
|
+
"@container-stack/territory": "^5.2.1-alpha.2",
|
|
66
68
|
"@remix-run/node": "^2.8.1",
|
|
67
69
|
"lodash": "^4.17.15",
|
|
68
70
|
"react": "18.2.0",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),setupConfig_cjs=require('@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs'),index=require('../../utils/index.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);const DEFAULT_SERVER_NAME = 'backend-server';
|
|
2
2
|
function addBackendGenerator(tree, options) {
|
|
3
3
|
return tslib.__awaiter(this, void 0, void 0, function* () {
|
|
4
|
-
const projectName = index.isValid(options.name) ?
|
|
4
|
+
const projectName = index.isValid(options.name) ? `backend-${index.getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
|
|
5
5
|
const configs = Object.assign(Object.assign({}, options), { name: projectName });
|
|
6
6
|
return yield generateBackend(tree, configs);
|
|
7
7
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-backend/generator.ts"],"sourcesContent":[null],"names":["isValid","getValid","__awaiter","generateFiles","path","updateJson","deepMerge","formatFiles"],"mappings":"6mBAMA,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAEvB,SAAA,mBAAmB,CAAC,IAAU,EAAE,OAAkC,EAAA;;QACpF,MAAM,WAAW,GAAGA,aAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-backend/generator.ts"],"sourcesContent":[null],"names":["isValid","getValid","__awaiter","generateFiles","path","updateJson","deepMerge","formatFiles"],"mappings":"6mBAMA,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAEvB,SAAA,mBAAmB,CAAC,IAAU,EAAE,OAAkC,EAAA;;QACpF,MAAM,WAAW,GAAGA,aAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,WAAWC,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,GAAG,mBAAmB,CAAC;QAC7G,MAAM,OAAO,mCAAY,OAAO,CAAA,EAAA,EAAE,IAAI,EAAE,WAAW,GAAC,CAAC;AAErD,QAAA,OAAO,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC/C,CAAA,CAAA;AAAA,CAAA;MAEY,eAAe,GAAG,CAAO,IAAU,EAAE,OAAY,KAAIC,eAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IAC9D,IAAI,WAAW,GAAG,CAAA,EAAA,GAAAD,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,mBAAmB,CAAC;IAChE,MAAM,WAAW,GAAGD,aAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAGC,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;IAC/G,WAAW,GAAGD,aAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAG,EAAAC,cAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAI,CAAA,EAAA,WAAW,EAAE,GAAG,WAAW,CAAC;;;;;;;;AAU3F,IAAAE,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;IACpEC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AACH,IAAA,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE;QACxBA,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,YAAA,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAChD,YAAA,UAAU,GAAGC,yBAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;AAErD,YAAA,OAAO,UAAU,CAAC;AACtB,SAAC,CAAC,CAAC;KACN;AACD,IAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {deepMerge}from'@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs';import {isValid,getValid}from'../../utils/index.mjs';const DEFAULT_SERVER_NAME = 'backend-server';
|
|
2
2
|
function addBackendGenerator(tree, options) {
|
|
3
3
|
return __awaiter(this, void 0, void 0, function* () {
|
|
4
|
-
const projectName = isValid(options.name) ?
|
|
4
|
+
const projectName = isValid(options.name) ? `backend-${getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
|
|
5
5
|
const configs = Object.assign(Object.assign({}, options), { name: projectName });
|
|
6
6
|
return yield generateBackend(tree, configs);
|
|
7
7
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-backend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"6PAMA,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAEvB,SAAA,mBAAmB,CAAC,IAAU,EAAE,OAAkC,EAAA;;QACpF,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-backend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"6PAMA,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAEvB,SAAA,mBAAmB,CAAC,IAAU,EAAE,OAAkC,EAAA;;QACpF,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,GAAG,mBAAmB,CAAC;QAC7G,MAAM,OAAO,mCAAY,OAAO,CAAA,EAAA,EAAE,IAAI,EAAE,WAAW,GAAC,CAAC;AAErD,QAAA,OAAO,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC/C,CAAA,CAAA;AAAA,CAAA;MAEY,eAAe,GAAG,CAAO,IAAU,EAAE,OAAY,KAAI,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IAC9D,IAAI,WAAW,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,mBAAmB,CAAC;IAChE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;IAC/G,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAG,EAAA,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAI,CAAA,EAAA,WAAW,EAAE,GAAG,WAAW,CAAC;;;;;;;;AAU3F,IAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;IACpE,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AACH,IAAA,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE;QACxB,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,YAAA,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAChD,YAAA,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;AAErD,YAAA,OAAO,UAAU,CAAC;AACtB,SAAC,CAAC,CAAC;KACN;AACD,IAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}
|
|
@@ -34,8 +34,6 @@ export function shouldRevalidate(params: any) {
|
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
export function Layout({ children }: { children: React.ReactNode }) {
|
|
37
|
-
// useLoaderData is for happy paths with Error boundary it will fail
|
|
38
|
-
// https://github.com/remix-run/remix/issues/8951#issuecomment-1973321870
|
|
39
37
|
const data = useRouteLoaderData<{ locale: any }>('root');
|
|
40
38
|
const locale = data?.locale;
|
|
41
39
|
|
|
@@ -79,8 +79,9 @@ export function shouldRevalidate(params: any) {
|
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
export default function App() {
|
|
82
|
-
|
|
83
|
-
const locale =
|
|
82
|
+
const data = useRouteLoaderData<{ locale: any }>('root');
|
|
83
|
+
const locale = data?.locale;
|
|
84
|
+
|
|
84
85
|
useChangeLanguage(locale);
|
|
85
86
|
|
|
86
87
|
React.useEffect(() => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import 'reflect-metadata';
|
|
2
2
|
import * as React from 'react';
|
|
3
|
-
import { Links, Meta, Outlet, Scripts, ScrollRestoration,
|
|
3
|
+
import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError, json } from '@remix-run/react';
|
|
4
4
|
import type { LinksFunction } from "@remix-run/node";
|
|
5
5
|
// @ts-ignore
|
|
6
6
|
import publicEnv from '@src/config/public-config';
|
|
@@ -36,7 +36,7 @@ export function shouldRevalidate(params: any) {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
export function Layout({ children }: { children: React.ReactNode }) {
|
|
39
|
-
const data =
|
|
39
|
+
const data = useRouteLoaderData<{ locale: any }>('root');
|
|
40
40
|
const locale = data?.locale;
|
|
41
41
|
|
|
42
42
|
const { i18n } = useTranslation();
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
const DEFAULT_SERVER_NAME = 'frontend-server';
|
|
3
3
|
function addFrontendGenerator(tree, options) {
|
|
4
4
|
return tslib.__awaiter(this, void 0, void 0, function* () {
|
|
5
|
-
const projectName = index.isValid(options.name) ?
|
|
5
|
+
const projectName = index.isValid(options.name) ? `frontend-${index.getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
|
|
6
6
|
const configs = Object.assign(Object.assign({}, options), { name: projectName });
|
|
7
7
|
return yield generateFrontend(tree, configs);
|
|
8
8
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":["FRAMEWORK_ANTUI","isValid","getValid","__awaiter","generateFiles","path","updateJson","FRAMEWORK_CHAKRAUI","FRAMEWORK_TAILWINDUI","deepMerge","formatFiles"],"mappings":"6pBAQA,MAAM,iBAAiB,GAAGA,yBAAe,CAAC;AAC1C,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAExB,SAAA,oBAAoB,CAAC,IAAU,EAAE,OAAmC,EAAA;;QACtF,MAAM,WAAW,GAAGC,aAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":["FRAMEWORK_ANTUI","isValid","getValid","__awaiter","generateFiles","path","updateJson","FRAMEWORK_CHAKRAUI","FRAMEWORK_TAILWINDUI","deepMerge","formatFiles"],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'
|
|
|
2
2
|
const DEFAULT_SERVER_NAME = 'frontend-server';
|
|
3
3
|
function addFrontendGenerator(tree, options) {
|
|
4
4
|
return __awaiter(this, void 0, void 0, function* () {
|
|
5
|
-
const projectName = isValid(options.name) ?
|
|
5
|
+
const projectName = isValid(options.name) ? `frontend-${getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
|
|
6
6
|
const configs = Object.assign(Object.assign({}, options), { name: projectName });
|
|
7
7
|
return yield generateFrontend(tree, configs);
|
|
8
8
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"8VAQA,MAAM,iBAAiB,GAAG,eAAe,CAAC;AAC1C,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAExB,SAAA,oBAAoB,CAAC,IAAU,EAAE,OAAmC,EAAA;;QACtF,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"watch:test": "cross-env ENV_FILE=../../config/test/test.env node ./server.js"
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@common-stack/frontend-stack-react": "6.0.6-alpha.
|
|
55
|
+
"@common-stack/frontend-stack-react": "6.0.6-alpha.17",
|
|
56
56
|
"@react-icons/all-files": "^4.1.0",
|
|
57
57
|
"classnames": "^2.2.6",
|
|
58
58
|
"compression": "^1.7.4",
|
|
@@ -80,8 +80,8 @@
|
|
|
80
80
|
},
|
|
81
81
|
"devDependencies": {
|
|
82
82
|
"@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
|
|
83
|
-
"@common-stack/frontend-stack-react": "6.0.6-alpha.
|
|
84
|
-
"@common-stack/rollup-vite-utils": "6.0.6-alpha.
|
|
83
|
+
"@common-stack/frontend-stack-react": "6.0.6-alpha.17",
|
|
84
|
+
"@common-stack/rollup-vite-utils": "6.0.6-alpha.17",
|
|
85
85
|
"@remix-run/dev": "^2.8.1",
|
|
86
86
|
"@remix-run/serve": "^2.8.1",
|
|
87
87
|
"cross-env": "^7.0.3",
|
|
@@ -147,7 +147,7 @@
|
|
|
147
147
|
"@babel/register": "^7.18.9",
|
|
148
148
|
"@babel/runtime": "^7.20.1",
|
|
149
149
|
"@common-stack/env-list-loader": "6.0.6-alpha.5",
|
|
150
|
-
"@common-stack/generate-plugin": "6.0.6-alpha.
|
|
150
|
+
"@common-stack/generate-plugin": "6.0.6-alpha.17",
|
|
151
151
|
"@emotion/babel-plugin": "^11.11.0",
|
|
152
152
|
"@graphql-codegen/add": "^5.0.2",
|
|
153
153
|
"@graphql-codegen/cli": "^5.0.2",
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
<!DOCTYPE html>
|
|
2
|
+
<html>
|
|
3
|
+
|
|
4
|
+
<head>
|
|
5
|
+
<base href="/">
|
|
6
|
+
<meta charset="utf-8">
|
|
7
|
+
<title>
|
|
8
|
+
<@= htmlWebpackPlugin.options.title @>
|
|
9
|
+
</title>
|
|
10
|
+
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
11
|
+
</head>
|
|
12
|
+
|
|
13
|
+
<body>
|
|
14
|
+
<div class="demo">
|
|
15
|
+
<div id="root">
|
|
16
|
+
Try building the demo:
|
|
17
|
+
<pre>
|
|
18
|
+
</pre> ...and refreshing this page!
|
|
19
|
+
</div>
|
|
20
|
+
</div>
|
|
21
|
+
<footer class="dark">
|
|
22
|
+
<section class="container copyright">
|
|
23
|
+
CDMBase LLC
|
|
24
|
+
</section>
|
|
25
|
+
</footer>
|
|
26
|
+
</body>
|
|
27
|
+
|
|
28
|
+
</html>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
'use strict';var devkit=require('@nx/devkit'),path=require('path'),fs=require('fs'),
|
|
1
|
+
'use strict';var devkit=require('@nx/devkit'),path=require('path'),fs=require('fs'),lodash=require('lodash');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);var fs__namespace=/*#__PURE__*/_interopNamespaceDefault(fs);const params = ['version', 'command:publish:allowBranch', 'command:version:allowBranch', 'packages'];
|
|
2
2
|
function backupLernaJson(tree, projectRoot) {
|
|
3
3
|
const lernaJsonPath = path__namespace.join(projectRoot, 'lerna.json');
|
|
4
4
|
if (tree.exists(lernaJsonPath)) {
|
|
@@ -7,7 +7,7 @@ function backupLernaJson(tree, projectRoot) {
|
|
|
7
7
|
let exists = false;
|
|
8
8
|
for (const param of params) {
|
|
9
9
|
if (param.includes(':')) {
|
|
10
|
-
const paramValue =
|
|
10
|
+
const paramValue = lodash.get(lernaJson, param.split(':'));
|
|
11
11
|
if (paramValue) {
|
|
12
12
|
backup[param] = paramValue;
|
|
13
13
|
exists = true;
|
|
@@ -32,7 +32,7 @@ function restoreLernaJson(tree, projectRoot, backup) {
|
|
|
32
32
|
devkit.updateJson(tree, lernaJsonPath, (lernaJson) => {
|
|
33
33
|
Object.keys(backup).forEach(param => {
|
|
34
34
|
if (param.includes(':')) {
|
|
35
|
-
lernaJson =
|
|
35
|
+
lernaJson = lodash.set(lernaJson, param.split(':'), backup[param]);
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
38
|
lernaJson[param] = backup[param];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lernaJsonUpdate.cjs","sources":["../../../../src/generators/add-fullstack/updates/lernaJsonUpdate.ts"],"sourcesContent":[null],"names":["path","
|
|
1
|
+
{"version":3,"file":"lernaJsonUpdate.cjs","sources":["../../../../src/generators/add-fullstack/updates/lernaJsonUpdate.ts"],"sourcesContent":[null],"names":["path","get","fs","updateJson","set"],"mappings":"ugBAKA,MAAM,MAAM,GAAG,CAAC,SAAS,EAAE,6BAA6B,EAAE,6BAA6B,EAAE,UAAU,CAAC,CAAC;AAErF,SAAA,eAAe,CAAC,IAAU,EAAE,WAAmB,EAAA;IAC3D,MAAM,aAAa,GAAGA,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;AAE3D,IAAA,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;AAC5B,QAAA,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClE,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,MAAM,GAAG,KAAK,CAAC;AACnB,QAAA,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;AACxB,YAAA,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;AACrB,gBAAA,MAAM,UAAU,GAAGC,UAAG,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;gBACpD,IAAI,UAAU,EAAE;AACZ,oBAAA,MAAM,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;oBAC3B,MAAM,GAAG,IAAI,CAAC;iBACjB;aACJ;iBAAM;AACH,gBAAA,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE;oBAClB,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjC,MAAM,GAAG,IAAI,CAAC;iBACjB;aACJ;SACJ;QAED,IAAI,MAAM,EAAE;AACR,YAAA,OAAO,MAAM,CAAC;SACjB;KACJ;AAED,IAAA,OAAO,IAAI,CAAC;AAChB,CAAC;SAEe,gBAAgB,CAAC,IAAU,EAAE,WAAmB,EAAE,MAAW,EAAA;IACzE,MAAM,aAAa,GAAGD,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAC3D,IAAI,MAAM,IAAIE,aAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACxCC,iBAAU,CAAC,IAAI,EAAE,aAAa,EAAE,CAAC,SAAc,KAAI;YAC/C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,IAAG;AAChC,gBAAA,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;AACrB,oBAAA,SAAS,GAAGC,UAAG,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;iBAC/D;qBAAM;oBACH,SAAS,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;iBACpC;AACL,aAAC,CAAC,CAAC;AACH,YAAA,OAAO,SAAS,CAAC;AACrB,SAAC,CAAC,CAAC;AACH,QAAA,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;KACpD;AACL"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {updateJson}from'@nx/devkit';import*as path from'path';import*as fs from'fs';import {
|
|
1
|
+
import {updateJson}from'@nx/devkit';import*as path from'path';import*as fs from'fs';import {get,set}from'lodash';const params = ['version', 'command:publish:allowBranch', 'command:version:allowBranch', 'packages'];
|
|
2
2
|
function backupLernaJson(tree, projectRoot) {
|
|
3
3
|
const lernaJsonPath = path.join(projectRoot, 'lerna.json');
|
|
4
4
|
if (tree.exists(lernaJsonPath)) {
|
|
@@ -7,7 +7,7 @@ function backupLernaJson(tree, projectRoot) {
|
|
|
7
7
|
let exists = false;
|
|
8
8
|
for (const param of params) {
|
|
9
9
|
if (param.includes(':')) {
|
|
10
|
-
const paramValue =
|
|
10
|
+
const paramValue = get(lernaJson, param.split(':'));
|
|
11
11
|
if (paramValue) {
|
|
12
12
|
backup[param] = paramValue;
|
|
13
13
|
exists = true;
|
|
@@ -32,7 +32,7 @@ function restoreLernaJson(tree, projectRoot, backup) {
|
|
|
32
32
|
updateJson(tree, lernaJsonPath, (lernaJson) => {
|
|
33
33
|
Object.keys(backup).forEach(param => {
|
|
34
34
|
if (param.includes(':')) {
|
|
35
|
-
lernaJson =
|
|
35
|
+
lernaJson = set(lernaJson, param.split(':'), backup[param]);
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
38
|
lernaJson[param] = backup[param];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lernaJsonUpdate.mjs","sources":["../../../../src/generators/add-fullstack/updates/lernaJsonUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lernaJsonUpdate.mjs","sources":["../../../../src/generators/add-fullstack/updates/lernaJsonUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"iHAKA,MAAM,MAAM,GAAG,CAAC,SAAS,EAAE,6BAA6B,EAAE,6BAA6B,EAAE,UAAU,CAAC,CAAC;AAErF,SAAA,eAAe,CAAC,IAAU,EAAE,WAAmB,EAAA;IAC3D,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;AAE3D,IAAA,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;AAC5B,QAAA,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClE,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,MAAM,GAAG,KAAK,CAAC;AACnB,QAAA,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;AACxB,YAAA,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;AACrB,gBAAA,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;gBACpD,IAAI,UAAU,EAAE;AACZ,oBAAA,MAAM,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;oBAC3B,MAAM,GAAG,IAAI,CAAC;iBACjB;aACJ;iBAAM;AACH,gBAAA,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE;oBAClB,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;oBACjC,MAAM,GAAG,IAAI,CAAC;iBACjB;aACJ;SACJ;QAED,IAAI,MAAM,EAAE;AACR,YAAA,OAAO,MAAM,CAAC;SACjB;KACJ;AAED,IAAA,OAAO,IAAI,CAAC;AAChB,CAAC;SAEe,gBAAgB,CAAC,IAAU,EAAE,WAAmB,EAAE,MAAW,EAAA;IACzE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAC3D,IAAI,MAAM,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACxC,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,CAAC,SAAc,KAAI;YAC/C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,IAAG;AAChC,gBAAA,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;AACrB,oBAAA,SAAS,GAAG,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;iBAC/D;qBAAM;oBACH,SAAS,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;iBACpC;AACL,aAAC,CAAC,CAAC;AACH,YAAA,OAAO,SAAS,CAAC;AACrB,SAAC,CAAC,CAAC;AACH,QAAA,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;KACpD;AACL"}
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"@common-stack/client-core": "6.0.6-alpha.5",
|
|
29
29
|
"@common-stack/core": "6.0.6-alpha.5",
|
|
30
30
|
"@common-stack/server-core": "6.0.6-alpha.5",
|
|
31
|
-
"@common-stack/server-stack": "6.0.6-alpha.
|
|
31
|
+
"@common-stack/server-stack": "6.0.6-alpha.16",
|
|
32
32
|
"@common-stack/store-mongo": "6.0.6-alpha.5",
|
|
33
33
|
"@container-stack/mailing-api": "5.2.1-alpha.1",
|
|
34
34
|
"helmet": "^3.21.2",
|
package/lib/utils/index.cjs
CHANGED
|
@@ -4,23 +4,6 @@
|
|
|
4
4
|
const getValid = (val) => {
|
|
5
5
|
return val ? val.trim() : null;
|
|
6
6
|
};
|
|
7
|
-
const getDeepValueFromJson = (jsonData, keys) => {
|
|
8
|
-
return keys.reduce((accumulator, key) => accumulator && accumulator[key], jsonData);
|
|
9
|
-
};
|
|
10
|
-
const setDeepValueToJson = (jsonData, keys, value) => {
|
|
11
|
-
keys.reduce((accumulator, key, index) => {
|
|
12
|
-
if (index !== keys.length - 1) {
|
|
13
|
-
if (!accumulator[key]) {
|
|
14
|
-
accumulator[key] = {};
|
|
15
|
-
}
|
|
16
|
-
return accumulator[key];
|
|
17
|
-
}
|
|
18
|
-
else {
|
|
19
|
-
accumulator[key] = value;
|
|
20
|
-
}
|
|
21
|
-
}, jsonData);
|
|
22
|
-
return jsonData;
|
|
23
|
-
};
|
|
24
7
|
const convertHttpsToSsh = (url) => {
|
|
25
8
|
const httpsPattern = /^https:\/\/(.+?)\/(.+?)\/(.+?)(\.git)?$/;
|
|
26
9
|
const match = url.match(httpsPattern);
|
|
@@ -46,4 +29,4 @@ const readDir = (tree, dirPath) => {
|
|
|
46
29
|
}
|
|
47
30
|
});
|
|
48
31
|
return result;
|
|
49
|
-
};exports.convertHttpsToSsh=convertHttpsToSsh;exports.
|
|
32
|
+
};exports.convertHttpsToSsh=convertHttpsToSsh;exports.getValid=getValid;exports.isValid=isValid;exports.readDir=readDir;//# sourceMappingURL=index.cjs.map
|
package/lib/utils/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.cjs","sources":["../../src/utils/index.ts"],"sourcesContent":[null],"names":["path"],"mappings":"uZAaa,MAAA,OAAO,GAAG,CAAC,GAAW,KAAI;AACnC,IAAA,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,IAAI,GAAG,KAAK,CAAC;AAC9C,EAAC;AAEY,MAAA,QAAQ,GAAG,CAAC,GAAW,KAAI;AACpC,IAAA,OAAO,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC;AACnC,EAAC;
|
|
1
|
+
{"version":3,"file":"index.cjs","sources":["../../src/utils/index.ts"],"sourcesContent":[null],"names":["path"],"mappings":"uZAaa,MAAA,OAAO,GAAG,CAAC,GAAW,KAAI;AACnC,IAAA,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,IAAI,GAAG,KAAK,CAAC;AAC9C,EAAC;AAEY,MAAA,QAAQ,GAAG,CAAC,GAAW,KAAI;AACpC,IAAA,OAAO,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC;AACnC,EAAC;AAEY,MAAA,iBAAiB,GAAG,CAAC,GAAG,KAAI;IACrC,MAAM,YAAY,GAAG,yCAAyC,CAAC;IAE/D,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAEtC,IAAI,KAAK,EAAE;AACP,QAAA,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AACxB,QAAA,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AACtB,QAAA,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AAEtB,QAAA,OAAO,OAAO,MAAM,CAAA,CAAA,EAAI,IAAI,CAAI,CAAA,EAAA,IAAI,MAAM,CAAC;KAC9C;SAAM;AACH,QAAA,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC/C;AACL,EAAC;MAEY,OAAO,GAAG,CAAC,IAAU,EAAE,OAAe,KAAI;IACnD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,EAAE,CAAC;AAClB,IAAA,KAAK,CAAC,OAAO,CAAC,IAAI,IAAG;AACjB,QAAA,IAAI,IAAI,CAAC,MAAM,CAACA,eAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,EAAE;YACvC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAACA,eAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC7E;aAAM;AACH,YAAA,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAEA,eAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;SAC1D;AACL,KAAC,CAAC,CAAC;AACH,IAAA,OAAO,MAAM,CAAC;AAClB"}
|
package/lib/utils/index.d.ts
CHANGED
|
@@ -2,7 +2,5 @@ import { Tree } from '@nx/devkit';
|
|
|
2
2
|
export declare const resetProject: (rootDir: string) => void;
|
|
3
3
|
export declare const isValid: (val: string) => boolean;
|
|
4
4
|
export declare const getValid: (val: string) => string;
|
|
5
|
-
export declare const getDeepValueFromJson: (jsonData: any, keys: string[]) => any;
|
|
6
|
-
export declare const setDeepValueToJson: (jsonData: any, keys: string[], value: any) => any;
|
|
7
5
|
export declare const convertHttpsToSsh: (url: any) => string;
|
|
8
6
|
export declare const readDir: (tree: Tree, dirPath: string) => {};
|
package/lib/utils/index.mjs
CHANGED
|
@@ -4,23 +4,6 @@ import'node:fs';import*as path from'path';const isValid = (val) => {
|
|
|
4
4
|
const getValid = (val) => {
|
|
5
5
|
return val ? val.trim() : null;
|
|
6
6
|
};
|
|
7
|
-
const getDeepValueFromJson = (jsonData, keys) => {
|
|
8
|
-
return keys.reduce((accumulator, key) => accumulator && accumulator[key], jsonData);
|
|
9
|
-
};
|
|
10
|
-
const setDeepValueToJson = (jsonData, keys, value) => {
|
|
11
|
-
keys.reduce((accumulator, key, index) => {
|
|
12
|
-
if (index !== keys.length - 1) {
|
|
13
|
-
if (!accumulator[key]) {
|
|
14
|
-
accumulator[key] = {};
|
|
15
|
-
}
|
|
16
|
-
return accumulator[key];
|
|
17
|
-
}
|
|
18
|
-
else {
|
|
19
|
-
accumulator[key] = value;
|
|
20
|
-
}
|
|
21
|
-
}, jsonData);
|
|
22
|
-
return jsonData;
|
|
23
|
-
};
|
|
24
7
|
const convertHttpsToSsh = (url) => {
|
|
25
8
|
const httpsPattern = /^https:\/\/(.+?)\/(.+?)\/(.+?)(\.git)?$/;
|
|
26
9
|
const match = url.match(httpsPattern);
|
|
@@ -46,4 +29,4 @@ const readDir = (tree, dirPath) => {
|
|
|
46
29
|
}
|
|
47
30
|
});
|
|
48
31
|
return result;
|
|
49
|
-
};export{convertHttpsToSsh,
|
|
32
|
+
};export{convertHttpsToSsh,getValid,isValid,readDir};//# sourceMappingURL=index.mjs.map
|
package/lib/utils/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","sources":["../../src/utils/index.ts"],"sourcesContent":[null],"names":[],"mappings":"0CAaa,MAAA,OAAO,GAAG,CAAC,GAAW,KAAI;AACnC,IAAA,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,IAAI,GAAG,KAAK,CAAC;AAC9C,EAAC;AAEY,MAAA,QAAQ,GAAG,CAAC,GAAW,KAAI;AACpC,IAAA,OAAO,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC;AACnC,EAAC;
|
|
1
|
+
{"version":3,"file":"index.mjs","sources":["../../src/utils/index.ts"],"sourcesContent":[null],"names":[],"mappings":"0CAaa,MAAA,OAAO,GAAG,CAAC,GAAW,KAAI;AACnC,IAAA,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,IAAI,GAAG,KAAK,CAAC;AAC9C,EAAC;AAEY,MAAA,QAAQ,GAAG,CAAC,GAAW,KAAI;AACpC,IAAA,OAAO,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC;AACnC,EAAC;AAEY,MAAA,iBAAiB,GAAG,CAAC,GAAG,KAAI;IACrC,MAAM,YAAY,GAAG,yCAAyC,CAAC;IAE/D,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAEtC,IAAI,KAAK,EAAE;AACP,QAAA,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AACxB,QAAA,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AACtB,QAAA,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AAEtB,QAAA,OAAO,OAAO,MAAM,CAAA,CAAA,EAAI,IAAI,CAAI,CAAA,EAAA,IAAI,MAAM,CAAC;KAC9C;SAAM;AACH,QAAA,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC/C;AACL,EAAC;MAEY,OAAO,GAAG,CAAC,IAAU,EAAE,OAAe,KAAI;IACnD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,EAAE,CAAC;AAClB,IAAA,KAAK,CAAC,OAAO,CAAC,IAAI,IAAG;AACjB,QAAA,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,EAAE;YACvC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC7E;aAAM;AACH,YAAA,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;SAC1D;AACL,KAAC,CAAC,CAAC;AACH,IAAA,OAAO,MAAM,CAAC;AAClB"}
|
package/lib/utils/syncConfig.cjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
'use strict';var devkit=require('@nx/devkit'),path=require('path'),parser=require('@babel/parser'),traverse=require('@babel/traverse'),index=require('./index.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);const DEFAULT_PACKAGE = 'core';
|
|
1
|
+
'use strict';var devkit=require('@nx/devkit'),path=require('path'),parser=require('@babel/parser'),traverse=require('@babel/traverse'),lodash=require('lodash'),index=require('./index.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);const DEFAULT_PACKAGE = 'core';
|
|
2
2
|
const syncConfig = (tree, projectRoot, options) => {
|
|
3
3
|
var _a, _b;
|
|
4
4
|
// synchronize package in package.json and lerna.json
|
|
@@ -19,7 +19,7 @@ const syncConfig = (tree, projectRoot, options) => {
|
|
|
19
19
|
},
|
|
20
20
|
};
|
|
21
21
|
devkit.updateJson(tree, configPath, (config) => {
|
|
22
|
-
|
|
22
|
+
lodash.set(config, [directory, 'modules', moduleName, type], packageContent);
|
|
23
23
|
return config;
|
|
24
24
|
});
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncConfig.cjs","sources":["../../src/utils/syncConfig.ts"],"sourcesContent":[null],"names":["getValid","updateJson","
|
|
1
|
+
{"version":3,"file":"syncConfig.cjs","sources":["../../src/utils/syncConfig.ts"],"sourcesContent":[null],"names":["getValid","updateJson","set","path","parse","readDir"],"mappings":"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"}
|
package/lib/utils/syncConfig.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {updateJson}from'@nx/devkit';import*as path from'path';import {parse}from'@babel/parser';import traverse from'@babel/traverse';import {getValid,
|
|
1
|
+
import {updateJson}from'@nx/devkit';import*as path from'path';import {parse}from'@babel/parser';import traverse from'@babel/traverse';import {set}from'lodash';import {getValid,readDir}from'./index.mjs';const DEFAULT_PACKAGE = 'core';
|
|
2
2
|
const syncConfig = (tree, projectRoot, options) => {
|
|
3
3
|
var _a, _b;
|
|
4
4
|
// synchronize package in package.json and lerna.json
|
|
@@ -19,7 +19,7 @@ const syncConfig = (tree, projectRoot, options) => {
|
|
|
19
19
|
},
|
|
20
20
|
};
|
|
21
21
|
updateJson(tree, configPath, (config) => {
|
|
22
|
-
|
|
22
|
+
set(config, [directory, 'modules', moduleName, type], packageContent);
|
|
23
23
|
return config;
|
|
24
24
|
});
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncConfig.mjs","sources":["../../src/utils/syncConfig.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"syncConfig.mjs","sources":["../../src/utils/syncConfig.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@common-stack/generate-plugin",
|
|
3
|
-
"version": "6.0.6-alpha.
|
|
3
|
+
"version": "6.0.6-alpha.18",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./lib/index.mjs",
|
|
6
6
|
"typings": "./lib/index.d.ts",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"watch": "yarn build:lib:watch"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@common-stack/rollup-vite-utils": "
|
|
20
|
+
"@common-stack/rollup-vite-utils": "link:../../packags/rollup-vite-utils",
|
|
21
21
|
"tslib": "^2.3.0"
|
|
22
22
|
},
|
|
23
23
|
"publishConfig": {
|
|
@@ -25,5 +25,5 @@
|
|
|
25
25
|
},
|
|
26
26
|
"executors": "./executors.json",
|
|
27
27
|
"generators": "./generators.json",
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "ca95c69277f59ef75e660879ee0cd5ea1e1ca302"
|
|
29
29
|
}
|
|
@@ -7,7 +7,7 @@ import { isValid, getValid } from '../../utils';
|
|
|
7
7
|
const DEFAULT_SERVER_NAME = 'backend-server';
|
|
8
8
|
|
|
9
9
|
export async function addBackendGenerator(tree: Tree, options: AddBackendGeneratorSchema) {
|
|
10
|
-
const projectName = isValid(options.name) ?
|
|
10
|
+
const projectName = isValid(options.name) ? `backend-${getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
|
|
11
11
|
const configs: any = {...options, name: projectName};
|
|
12
12
|
|
|
13
13
|
return await generateBackend(tree, configs);
|
|
@@ -34,8 +34,6 @@ export function shouldRevalidate(params: any) {
|
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
export function Layout({ children }: { children: React.ReactNode }) {
|
|
37
|
-
// useLoaderData is for happy paths with Error boundary it will fail
|
|
38
|
-
// https://github.com/remix-run/remix/issues/8951#issuecomment-1973321870
|
|
39
37
|
const data = useRouteLoaderData<{ locale: any }>('root');
|
|
40
38
|
const locale = data?.locale;
|
|
41
39
|
|
|
@@ -79,8 +79,9 @@ export function shouldRevalidate(params: any) {
|
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
export default function App() {
|
|
82
|
-
|
|
83
|
-
const locale =
|
|
82
|
+
const data = useRouteLoaderData<{ locale: any }>('root');
|
|
83
|
+
const locale = data?.locale;
|
|
84
|
+
|
|
84
85
|
useChangeLanguage(locale);
|
|
85
86
|
|
|
86
87
|
React.useEffect(() => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import 'reflect-metadata';
|
|
2
2
|
import * as React from 'react';
|
|
3
|
-
import { Links, Meta, Outlet, Scripts, ScrollRestoration,
|
|
3
|
+
import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError, json } from '@remix-run/react';
|
|
4
4
|
import type { LinksFunction } from "@remix-run/node";
|
|
5
5
|
// @ts-ignore
|
|
6
6
|
import publicEnv from '@src/config/public-config';
|
|
@@ -36,7 +36,7 @@ export function shouldRevalidate(params: any) {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
export function Layout({ children }: { children: React.ReactNode }) {
|
|
39
|
-
const data =
|
|
39
|
+
const data = useRouteLoaderData<{ locale: any }>('root');
|
|
40
40
|
const locale = data?.locale;
|
|
41
41
|
|
|
42
42
|
const { i18n } = useTranslation();
|
|
@@ -10,7 +10,7 @@ const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
|
|
|
10
10
|
const DEFAULT_SERVER_NAME = 'frontend-server';
|
|
11
11
|
|
|
12
12
|
export async function addFrontendGenerator(tree: Tree, options: AddFrontendGeneratorSchema) {
|
|
13
|
-
const projectName = isValid(options.name) ?
|
|
13
|
+
const projectName = isValid(options.name) ? `frontend-${getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
|
|
14
14
|
const configs: any = {...options, name: projectName};
|
|
15
15
|
|
|
16
16
|
return await generateFrontend(tree, configs);
|
|
@@ -147,7 +147,7 @@
|
|
|
147
147
|
"@babel/register": "^7.18.9",
|
|
148
148
|
"@babel/runtime": "^7.20.1",
|
|
149
149
|
"@common-stack/env-list-loader": "6.0.6-alpha.5",
|
|
150
|
-
"@common-stack/generate-plugin": "6.0.6-alpha.
|
|
150
|
+
"@common-stack/generate-plugin": "6.0.6-alpha.17",
|
|
151
151
|
"@emotion/babel-plugin": "^11.11.0",
|
|
152
152
|
"@graphql-codegen/add": "^5.0.2",
|
|
153
153
|
"@graphql-codegen/cli": "^5.0.2",
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
<!DOCTYPE html>
|
|
2
|
+
<html>
|
|
3
|
+
|
|
4
|
+
<head>
|
|
5
|
+
<base href="/">
|
|
6
|
+
<meta charset="utf-8">
|
|
7
|
+
<title>
|
|
8
|
+
<@= htmlWebpackPlugin.options.title @>
|
|
9
|
+
</title>
|
|
10
|
+
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
11
|
+
</head>
|
|
12
|
+
|
|
13
|
+
<body>
|
|
14
|
+
<div class="demo">
|
|
15
|
+
<div id="root">
|
|
16
|
+
Try building the demo:
|
|
17
|
+
<pre>
|
|
18
|
+
</pre> ...and refreshing this page!
|
|
19
|
+
</div>
|
|
20
|
+
</div>
|
|
21
|
+
<footer class="dark">
|
|
22
|
+
<section class="container copyright">
|
|
23
|
+
CDMBase LLC
|
|
24
|
+
</section>
|
|
25
|
+
</footer>
|
|
26
|
+
</body>
|
|
27
|
+
|
|
28
|
+
</html>
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Tree, updateJson } from '@nx/devkit';
|
|
2
2
|
import * as path from 'path';
|
|
3
3
|
import * as fs from 'fs';
|
|
4
|
-
import {
|
|
4
|
+
import { get, set } from 'lodash';
|
|
5
5
|
|
|
6
6
|
const params = ['version', 'command:publish:allowBranch', 'command:version:allowBranch', 'packages'];
|
|
7
7
|
|
|
@@ -14,7 +14,7 @@ export function backupLernaJson(tree: Tree, projectRoot: string) {
|
|
|
14
14
|
let exists = false;
|
|
15
15
|
for (const param of params) {
|
|
16
16
|
if (param.includes(':')) {
|
|
17
|
-
const paramValue =
|
|
17
|
+
const paramValue = get(lernaJson, param.split(':'));
|
|
18
18
|
if (paramValue) {
|
|
19
19
|
backup[param] = paramValue;
|
|
20
20
|
exists = true;
|
|
@@ -41,7 +41,7 @@ export function restoreLernaJson(tree: Tree, projectRoot: string, backup: any) {
|
|
|
41
41
|
updateJson(tree, lernaJsonPath, (lernaJson: any) => {
|
|
42
42
|
Object.keys(backup).forEach(param => {
|
|
43
43
|
if (param.includes(':')) {
|
|
44
|
-
lernaJson =
|
|
44
|
+
lernaJson = set(lernaJson, param.split(':'), backup[param]);
|
|
45
45
|
} else {
|
|
46
46
|
lernaJson[param] = backup[param];
|
|
47
47
|
}
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"@common-stack/client-core": "6.0.6-alpha.5",
|
|
29
29
|
"@common-stack/core": "6.0.6-alpha.5",
|
|
30
30
|
"@common-stack/server-core": "6.0.6-alpha.5",
|
|
31
|
-
"@common-stack/server-stack": "6.0.6-alpha.
|
|
31
|
+
"@common-stack/server-stack": "6.0.6-alpha.16",
|
|
32
32
|
"@common-stack/store-mongo": "6.0.6-alpha.5",
|
|
33
33
|
"@container-stack/mailing-api": "5.2.1-alpha.1",
|
|
34
34
|
"helmet": "^3.21.2",
|
package/src/utils/index.ts
CHANGED
|
@@ -19,25 +19,6 @@ export const getValid = (val: string) => {
|
|
|
19
19
|
return val ? val.trim() : null;
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
-
export const getDeepValueFromJson = (jsonData: any, keys: string[]) => {
|
|
23
|
-
return keys.reduce((accumulator, key) => accumulator && accumulator[key], jsonData);
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
export const setDeepValueToJson = (jsonData: any, keys: string[], value: any) => {
|
|
27
|
-
keys.reduce((accumulator, key, index) => {
|
|
28
|
-
if (index !== keys.length - 1) {
|
|
29
|
-
if (!accumulator[key]) {
|
|
30
|
-
accumulator[key] = {};
|
|
31
|
-
}
|
|
32
|
-
return accumulator[key];
|
|
33
|
-
} else {
|
|
34
|
-
accumulator[key] = value;
|
|
35
|
-
}
|
|
36
|
-
}, jsonData);
|
|
37
|
-
|
|
38
|
-
return jsonData;
|
|
39
|
-
}
|
|
40
|
-
|
|
41
22
|
export const convertHttpsToSsh = (url) => {
|
|
42
23
|
const httpsPattern = /^https:\/\/(.+?)\/(.+?)\/(.+?)(\.git)?$/;
|
|
43
24
|
|
package/src/utils/syncConfig.ts
CHANGED
|
@@ -2,7 +2,8 @@ import { Tree, updateJson } from '@nx/devkit';
|
|
|
2
2
|
import * as path from 'path';
|
|
3
3
|
import { parse } from '@babel/parser';
|
|
4
4
|
import traverse from '@babel/traverse';
|
|
5
|
-
import {
|
|
5
|
+
import { set } from 'lodash';
|
|
6
|
+
import { getValid, readDir } from './index';
|
|
6
7
|
|
|
7
8
|
export interface SyncConfigOptions {
|
|
8
9
|
name: string;
|
|
@@ -35,7 +36,7 @@ export const syncConfig = (tree: Tree, projectRoot: string, options: SyncConfigO
|
|
|
35
36
|
};
|
|
36
37
|
|
|
37
38
|
updateJson(tree, configPath, (config: any) => {
|
|
38
|
-
|
|
39
|
+
set(config, [directory, 'modules', moduleName, type], packageContent);
|
|
39
40
|
return config;
|
|
40
41
|
});
|
|
41
42
|
} catch(e) {
|