@common-stack/generate-plugin 6.0.6-alpha.11 → 6.0.6-alpha.13

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.
Files changed (16) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/lib/generators/add-frontend/frameworks/antui/root.tsx.template +4 -2
  3. package/lib/generators/add-frontend/frameworks/chakraui/root.tsx.template +2 -2
  4. package/lib/generators/add-frontend/generator.cjs +4 -0
  5. package/lib/generators/add-frontend/generator.cjs.map +1 -1
  6. package/lib/generators/add-frontend/generator.mjs +4 -0
  7. package/lib/generators/add-frontend/generator.mjs.map +1 -1
  8. package/lib/generators/add-frontend/templates/package.json +1 -3
  9. package/lib/generators/add-fullstack/files/Jenkinsfile +5 -5
  10. package/lib/generators/add-fullstack/files/package.json +8 -5
  11. package/package.json +3 -3
  12. package/src/generators/add-frontend/frameworks/antui/root.tsx.template +4 -2
  13. package/src/generators/add-frontend/frameworks/chakraui/root.tsx.template +2 -2
  14. package/src/generators/add-frontend/generator.ts +4 -0
  15. package/src/generators/add-fullstack/files/Jenkinsfile +5 -5
  16. package/src/generators/add-fullstack/files/package.json +8 -5
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.13](https://github.com/cdmbase/common-stack/compare/v6.0.6-alpha.12...v6.0.6-alpha.13) (2024-09-08)
7
+
8
+ **Note:** Version bump only for package @common-stack/generate-plugin
9
+
10
+ ## [6.0.6-alpha.12](https://github.com/cdmbase/common-stack/compare/v6.0.6-alpha.11...v6.0.6-alpha.12) (2024-09-07)
11
+
12
+ **Note:** Version bump only for package @common-stack/generate-plugin
13
+
6
14
  ## [6.0.6-alpha.11](https://github.com/cdmbase/common-stack/compare/v6.0.6-alpha.10...v6.0.6-alpha.11) (2024-09-07)
7
15
 
8
16
  **Note:** Version bump only for package @common-stack/generate-plugin
package/lib/generators/add-frontend/frameworks/antui/root.tsx.template CHANGED
@@ -1,6 +1,6 @@
1
1
  import 'reflect-metadata';
2
2
  import * as React from 'react';
3
- import { Links, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData, useRouteError, json } from '@remix-run/react';
3
+ import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError, json } from '@remix-run/react';
4
4
  // @ts-ignore
5
5
  import publicEnv from '@src/config/public-config';
6
6
  import { PluginArea } from '@common-stack/client-react';
@@ -34,7 +34,9 @@ export function shouldRevalidate(params: any) {
34
34
  }
35
35
 
36
36
  export function Layout({ children }: { children: React.ReactNode }) {
37
- const data = useLoaderData<{ locale: any}>();
37
+ // useLoaderData is for happy paths with Error boundary it will fail
38
+ // https://github.com/remix-run/remix/issues/8951#issuecomment-1973321870
39
+ const data = useRouteLoaderData<{ locale: any }>('root');
38
40
  const locale = data?.locale;
39
41
 
40
42
  const { i18n } = useTranslation();
package/lib/generators/add-frontend/frameworks/chakraui/root.tsx.template CHANGED
@@ -1,7 +1,7 @@
1
1
  // @ts-nocheck
2
2
  import * as React from 'react';
3
3
 
4
- import { Links, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData } from '@remix-run/react';
4
+ import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData } from '@remix-run/react';
5
5
  import { json } from '@remix-run/node';
6
6
  import { PluginArea } from '@common-stack/client-react';
7
7
  import { subscribeReduxRouter } from '@common-stack/remix-router-redux';
@@ -79,7 +79,7 @@ export function shouldRevalidate(params: any) {
79
79
  }
80
80
 
81
81
  export default function App() {
82
- // const { locale } = useLoaderData();
82
+ // const { locale } = useRouteLoaderData();
83
83
  const locale = 'en';
84
84
  useChangeLanguage(locale);
85
85
 
package/lib/generators/add-frontend/generator.cjs CHANGED
@@ -29,6 +29,8 @@ const generateFrontend = (tree, options) => tslib.__awaiter(void 0, void 0, void
29
29
  if (framework === constants.FRAMEWORK_ANTUI) {
30
30
  packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
31
31
  packageJson['dependencies']["@ant-design/static-style-extract"] = "^1.0.2";
32
+ packageJson['dependencies']["@emotion/react"] = "^11.10.0";
33
+ packageJson['dependencies']["@emotion/server"] = "^11.10.0";
32
34
  packageJson['dependencies']["@emotion/css"] = "^11.10.0";
33
35
  packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
34
36
  packageJson['dependencies']["antd"] = "^5.14.0";
@@ -36,6 +38,8 @@ const generateFrontend = (tree, options) => tslib.__awaiter(void 0, void 0, void
36
38
  else if (framework === constants.FRAMEWORK_CHAKRAUI) {
37
39
  packageJson['dependencies']["@chakra-ui/react"] = "^2.8.2";
38
40
  packageJson['dependencies']["framer-motion"] = "^11.5.4";
41
+ packageJson['dependencies']["@emotion/react"] = "^11.10.0";
42
+ packageJson['dependencies']["@emotion/server"] = "^11.10.0";
39
43
  packageJson['dependencies']["@emotion/css"] = "^11.10.0";
40
44
  packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
41
45
  }
package/lib/generators/add-frontend/generator.cjs.map CHANGED
@@ -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":"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"}
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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"}
package/lib/generators/add-frontend/generator.mjs CHANGED
@@ -29,6 +29,8 @@ const generateFrontend = (tree, options) => __awaiter(void 0, void 0, void 0, fu
29
29
  if (framework === FRAMEWORK_ANTUI) {
30
30
  packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
31
31
  packageJson['dependencies']["@ant-design/static-style-extract"] = "^1.0.2";
32
+ packageJson['dependencies']["@emotion/react"] = "^11.10.0";
33
+ packageJson['dependencies']["@emotion/server"] = "^11.10.0";
32
34
  packageJson['dependencies']["@emotion/css"] = "^11.10.0";
33
35
  packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
34
36
  packageJson['dependencies']["antd"] = "^5.14.0";
@@ -36,6 +38,8 @@ const generateFrontend = (tree, options) => __awaiter(void 0, void 0, void 0, fu
36
38
  else if (framework === FRAMEWORK_CHAKRAUI) {
37
39
  packageJson['dependencies']["@chakra-ui/react"] = "^2.8.2";
38
40
  packageJson['dependencies']["framer-motion"] = "^11.5.4";
41
+ packageJson['dependencies']["@emotion/react"] = "^11.10.0";
42
+ packageJson['dependencies']["@emotion/server"] = "^11.10.0";
39
43
  packageJson['dependencies']["@emotion/css"] = "^11.10.0";
40
44
  packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
41
45
  }
package/lib/generators/add-frontend/generator.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
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,CAAA,EAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA,CAAA,EAAI,mBAAmB,CAAA,CAAE,GAAG,mBAAmB,CAAC;QACrH,MAAM,OAAO,mCAAY,OAAO,CAAA,EAAA,EAAE,IAAI,EAAE,WAAW,GAAC,CAAC;AAErD,QAAA,OAAO,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAChD,CAAA,CAAA;AAAA,CAAA;MAEY,gBAAgB,GAAG,CAAO,IAAU,EAAE,OAAY,KAAI,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IAC/D,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;AAC3F,IAAA,MAAM,UAAU,GAAG,CAAG,EAAA,WAAW,MAAM,CAAC;IAExC,MAAM,SAAS,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,iBAAiB,CAAC;AACnE,IAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC;;;;;;;;AAWnD,IAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACxE,IAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACxF,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,QAAA,IAAI,SAAS,KAAK,eAAe,EAAE;YAC/B,WAAW,CAAC,cAAc,CAAC,CAAC,8BAA8B,CAAC,GAAG,QAAQ,CAAC;YACvE,WAAW,CAAC,cAAc,CAAC,CAAC,kCAAkC,CAAC,GAAG,QAAQ,CAAC;YAC3E,WAAW,CAAC,cAAc,CAAC,CAAC,gBAAgB,CAAC,GAAG,UAAU,CAAC;YAC3D,WAAW,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC;YAC5D,WAAW,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;YACzD,WAAW,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC;YAC5D,WAAW,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;SACnD;AAAM,aAAA,IAAI,SAAS,KAAK,kBAAkB,EAAE;YACzC,WAAW,CAAC,cAAc,CAAC,CAAC,kBAAkB,CAAC,GAAG,QAAQ,CAAC;YAC3D,WAAW,CAAC,cAAc,CAAC,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;YACzD,WAAW,CAAC,cAAc,CAAC,CAAC,gBAAgB,CAAC,GAAG,UAAU,CAAC;YAC3D,WAAW,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC;YAC5D,WAAW,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;YACzD,WAAW,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC;SAE/D;AAAM,aAAA,IAAI,SAAS,KAAK,oBAAoB,EAAE;YAC3C,WAAW,CAAC,iBAAiB,CAAC,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;YAC1D,WAAW,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;YACtD,WAAW,CAAC,iBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;SAC/D;AAED,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;IACH,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,QAAA,UAAU,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;AACtC,QAAA,IAAI,SAAS,KAAK,eAAe,EAAE;YAC/B,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;SAC9D;AAAM,aAAA,IAAI,SAAS,KAAK,kBAAkB,EAAE;YACzC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;SACjE;AAED,QAAA,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE;AACxB,YAAA,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAChD,YAAA,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;SACxD;AAED,QAAA,OAAO,UAAU,CAAC;AACtB,KAAC,CAAC,CAAC;AAEH,IAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}
package/lib/generators/add-frontend/templates/package.json CHANGED
@@ -52,8 +52,6 @@
52
52
  "watch:test": "cross-env ENV_FILE=../../config/test/test.env node ./server.js"
53
53
  },
54
54
  "dependencies": {
55
- "@emotion/react": "^11.10.4",
56
- "@emotion/server": "^11.10.0",
57
55
  "@common-stack/frontend-stack-react": "6.0.6-alpha.6",
58
56
  "@react-icons/all-files": "^4.1.0",
59
57
  "classnames": "^2.2.6",
@@ -83,7 +81,7 @@
83
81
  "devDependencies": {
84
82
  "@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
85
83
  "@common-stack/frontend-stack-react": "6.0.6-alpha.6",
86
- "@common-stack/rollup-vite-utils": "6.0.6-alpha.9",
84
+ "@common-stack/rollup-vite-utils": "6.0.6-alpha.11",
87
85
  "@remix-run/dev": "^2.8.1",
88
86
  "@remix-run/serve": "^2.8.1",
89
87
  "cross-env": "^7.0.3",
package/lib/generators/add-fullstack/files/Jenkinsfile CHANGED
@@ -13,23 +13,23 @@ pipeline {
13
13
  string(name: 'CONNECTION_ID', defaultValue: 'test', description: 'connection id', trim: true)
14
14
  string(name: 'WORKSPACE_ID', defaultValue: 'fullstack-pro', description: 'workspace id', trim: true)
15
15
  string(name: 'UNIQUE_NAME', defaultValue: 'default', description: 'chart name', trim: true)
16
- string(name: 'VERSION', defaultValue: 'v3', description: 'version of the deployment', trim: true)
16
+ string(name: 'VERSION', defaultValue: 'v1', description: 'version of the deployment', trim: true)
17
17
  string(name: 'HEMERA_LOG_LEVEL', defaultValue: 'info', description: 'log level for hemera')
18
18
  string(name: 'LOG_LEVEL', defaultValue: 'info', description: 'log level')
19
19
  string(name: 'DEPLOYMENT_PATH', defaultValue: '/servers', description: 'folder path to load helm charts')
20
- string(name: 'PUBLISH_BRANCH', defaultValue: 'devpublish3', description: 'the publish branch for packages release')
20
+ string(name: 'PUBLISH_BRANCH', defaultValue: 'devpublish', description: 'the publish branch for packages release')
21
21
  string(name: 'EXCLUDE_SETTING_NAMESPACE_FILTER', defaultValue: 'brigade', description: 'exclude setting namespace that matches search string')
22
22
  string(name: 'GIT_CREDENTIAL_ID', defaultValue: 'fullstack-pro-github-deploy-key', description: 'jenkins credential id of git deploy secret')
23
23
  string(name: 'BUILD_MODULE_TO_INCLUDE', defaultValue: '@sample-stack*', description: 'build env')
24
24
  string(name: 'REPOSITORY_SSH_URL', defaultValue: 'git@github.com:CDEBase/fullstack-pro.git', description: 'ssh url of the git repository')
25
- string(name: 'REPOSITORY_BRANCH', defaultValue: 'develop3', description: 'the branch with changes')
26
- string(name: 'DEVELOP_BRANCH', defaultValue: 'develop3', description: 'the branch for the development')
25
+ string(name: 'REPOSITORY_BRANCH', defaultValue: 'develop', description: 'the branch with changes')
26
+ string(name: 'DEVELOP_BRANCH', defaultValue: 'develop', description: 'the branch for the development')
27
27
  string(name: 'MASTER_BRANCH', defaultValue: 'master', description: 'Master branch as default branch for production.')
28
28
 
29
29
  // by default first value of the choice will be choosen
30
30
  choice choices: ['auto', 'force'], description: 'Choose merge strategy', name: 'NPM_PUBLISH_STRATEGY'
31
31
  choice choices: ['yarn', 'npm'], description: 'Choose build strategy', name: 'BUILD_STRATEGY'
32
- choice choices: ['0.7.9','0.7.7', '0.6.0'], description: 'Choose Idestack chart version', name: 'IDESTACK_CHART_VERSION'
32
+ choice choices: ['0.7.11','0.7.9', '0.6.0'], description: 'Choose Idestack chart version', name: 'IDESTACK_CHART_VERSION'
33
33
  choice choices: ['nodejs20', 'nodejs18', 'nodejs22'], description: 'Choose NodeJS version', name: 'NODEJS_TOOL_VERSION'
34
34
  choice choices: ['buildOnly', 'buildAndTest', 'buildAndPublish', 'mobileBuild', 'mobilePreview', 'mobilePreviewLocal', 'mobilePreviewSubmit', 'mobileProd', 'mobileProdSubmit', 'devDeployOnly', 'stageDeploy', 'stageDeployOnly', 'prodDeploy', 'prodDeployOnly', 'allenv'], description: 'Where to deploy micro services?', name: 'ENV_CHOICE'
35
35
  choice choices: ['all', 'ios', 'android' ], description: 'Mobile type if it is mobile build?', name: 'MOBILE_CHOICE'
package/lib/generators/add-fullstack/files/package.json CHANGED
@@ -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.10",
150
+ "@common-stack/generate-plugin": "6.0.6-alpha.12",
151
151
  "@emotion/babel-plugin": "^11.11.0",
152
152
  "@graphql-codegen/add": "^5.0.2",
153
153
  "@graphql-codegen/cli": "^5.0.2",
@@ -166,12 +166,13 @@
166
166
  "@redux-devtools/core": "^3.13.1",
167
167
  "@redux-devtools/dock-monitor": "^3.0.1",
168
168
  "@redux-devtools/log-monitor": "^4.0.1",
169
- "@remix-run/dev": "^2.9.2",
170
- "@remix-run/react": "^2.9.2",
169
+ "@rollup/plugin-alias": "^5.1.0",
170
+ "@rollup/plugin-babel": "^6.0.4",
171
171
  "@rollup/plugin-graphql": "2.0.2",
172
172
  "@rollup/plugin-image": "^3.0.1",
173
173
  "@rollup/plugin-json": "^6.1.0",
174
- "@rollup/plugin-typescript": "^9.0.2",
174
+ "@rollup/plugin-node-resolve": "^15.2.3",
175
+ "@rollup/plugin-typescript": "^11.1.5",
175
176
  "@shelf/jest-mongodb": "^4.1.3",
176
177
  "@svgr/webpack": "^6.5.1",
177
178
  "@testing-library/react": "^16.4.0",
@@ -205,6 +206,7 @@
205
206
  "@typescript-eslint/parser": "^6.7.4",
206
207
  "@web/rollup-plugin-copy": "^0.5.1",
207
208
  "@webpack-cli/serve": "^1.7.0",
209
+ "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
208
210
  "autoprefixer": "^10.4.13",
209
211
  "babel-core": "^7.0.0-bridge.0",
210
212
  "babel-eslint": "^10.1.0",
@@ -266,6 +268,7 @@
266
268
  "jest-dom": "^4.0.0",
267
269
  "jest-junit": "^14.0.1",
268
270
  "jest-matcher-utils": "^29.2.2",
271
+ "jest-raw-loader": "^1.0.1",
269
272
  "jest-transform-graphql": "^2.1.0",
270
273
  "jsdom": "^20.0.2",
271
274
  "lerna": "8",
@@ -326,7 +329,7 @@
326
329
  "ts-node": "^10.9.1",
327
330
  "tslib": "^2.4.1",
328
331
  "typedoc": "^0.23.20",
329
- "typescript": "^5.1.6",
332
+ "typescript": "^5.5.4",
330
333
  "url-loader": "^4.1.1",
331
334
  "wait-on": "^6.0.1",
332
335
  "webpack": "^5.74.0",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@common-stack/generate-plugin",
3
- "version": "6.0.6-alpha.11",
3
+ "version": "6.0.6-alpha.13",
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": "link:../../packags/rollup-vite-utils",
20
+ "@common-stack/rollup-vite-utils": "6.0.6-alpha.13",
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": "17b1056c9f1ad5efd9b5a6fab170124ad78f82e7"
28
+ "gitHead": "1cde47293f40c6b0147b5ca73991d9a43b168f8a"
29
29
  }
package/src/generators/add-frontend/frameworks/antui/root.tsx.template CHANGED
@@ -1,6 +1,6 @@
1
1
  import 'reflect-metadata';
2
2
  import * as React from 'react';
3
- import { Links, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData, useRouteError, json } from '@remix-run/react';
3
+ import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError, json } from '@remix-run/react';
4
4
  // @ts-ignore
5
5
  import publicEnv from '@src/config/public-config';
6
6
  import { PluginArea } from '@common-stack/client-react';
@@ -34,7 +34,9 @@ export function shouldRevalidate(params: any) {
34
34
  }
35
35
 
36
36
  export function Layout({ children }: { children: React.ReactNode }) {
37
- const data = useLoaderData<{ locale: any}>();
37
+ // useLoaderData is for happy paths with Error boundary it will fail
38
+ // https://github.com/remix-run/remix/issues/8951#issuecomment-1973321870
39
+ const data = useRouteLoaderData<{ locale: any }>('root');
38
40
  const locale = data?.locale;
39
41
 
40
42
  const { i18n } = useTranslation();
package/src/generators/add-frontend/frameworks/chakraui/root.tsx.template CHANGED
@@ -1,7 +1,7 @@
1
1
  // @ts-nocheck
2
2
  import * as React from 'react';
3
3
 
4
- import { Links, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData } from '@remix-run/react';
4
+ import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData } from '@remix-run/react';
5
5
  import { json } from '@remix-run/node';
6
6
  import { PluginArea } from '@common-stack/client-react';
7
7
  import { subscribeReduxRouter } from '@common-stack/remix-router-redux';
@@ -79,7 +79,7 @@ export function shouldRevalidate(params: any) {
79
79
  }
80
80
 
81
81
  export default function App() {
82
- // const { locale } = useLoaderData();
82
+ // const { locale } = useRouteLoaderData();
83
83
  const locale = 'en';
84
84
  useChangeLanguage(locale);
85
85
 
package/src/generators/add-frontend/generator.ts CHANGED
@@ -41,12 +41,16 @@ export const generateFrontend = async (tree: Tree, options: any) => {
41
41
  if (framework === FRAMEWORK_ANTUI) {
42
42
  packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
43
43
  packageJson['dependencies']["@ant-design/static-style-extract"] = "^1.0.2";
44
+ packageJson['dependencies']["@emotion/react"] = "^11.10.0";
45
+ packageJson['dependencies']["@emotion/server"] = "^11.10.0";
44
46
  packageJson['dependencies']["@emotion/css"] = "^11.10.0";
45
47
  packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
46
48
  packageJson['dependencies']["antd"] = "^5.14.0";
47
49
  } else if (framework === FRAMEWORK_CHAKRAUI) {
48
50
  packageJson['dependencies']["@chakra-ui/react"] = "^2.8.2";
49
51
  packageJson['dependencies']["framer-motion"] = "^11.5.4";
52
+ packageJson['dependencies']["@emotion/react"] = "^11.10.0";
53
+ packageJson['dependencies']["@emotion/server"] = "^11.10.0";
50
54
  packageJson['dependencies']["@emotion/css"] = "^11.10.0";
51
55
  packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
52
56
 
package/src/generators/add-fullstack/files/Jenkinsfile CHANGED
@@ -13,23 +13,23 @@ pipeline {
13
13
  string(name: 'CONNECTION_ID', defaultValue: 'test', description: 'connection id', trim: true)
14
14
  string(name: 'WORKSPACE_ID', defaultValue: 'fullstack-pro', description: 'workspace id', trim: true)
15
15
  string(name: 'UNIQUE_NAME', defaultValue: 'default', description: 'chart name', trim: true)
16
- string(name: 'VERSION', defaultValue: 'v3', description: 'version of the deployment', trim: true)
16
+ string(name: 'VERSION', defaultValue: 'v1', description: 'version of the deployment', trim: true)
17
17
  string(name: 'HEMERA_LOG_LEVEL', defaultValue: 'info', description: 'log level for hemera')
18
18
  string(name: 'LOG_LEVEL', defaultValue: 'info', description: 'log level')
19
19
  string(name: 'DEPLOYMENT_PATH', defaultValue: '/servers', description: 'folder path to load helm charts')
20
- string(name: 'PUBLISH_BRANCH', defaultValue: 'devpublish3', description: 'the publish branch for packages release')
20
+ string(name: 'PUBLISH_BRANCH', defaultValue: 'devpublish', description: 'the publish branch for packages release')
21
21
  string(name: 'EXCLUDE_SETTING_NAMESPACE_FILTER', defaultValue: 'brigade', description: 'exclude setting namespace that matches search string')
22
22
  string(name: 'GIT_CREDENTIAL_ID', defaultValue: 'fullstack-pro-github-deploy-key', description: 'jenkins credential id of git deploy secret')
23
23
  string(name: 'BUILD_MODULE_TO_INCLUDE', defaultValue: '@sample-stack*', description: 'build env')
24
24
  string(name: 'REPOSITORY_SSH_URL', defaultValue: 'git@github.com:CDEBase/fullstack-pro.git', description: 'ssh url of the git repository')
25
- string(name: 'REPOSITORY_BRANCH', defaultValue: 'develop3', description: 'the branch with changes')
26
- string(name: 'DEVELOP_BRANCH', defaultValue: 'develop3', description: 'the branch for the development')
25
+ string(name: 'REPOSITORY_BRANCH', defaultValue: 'develop', description: 'the branch with changes')
26
+ string(name: 'DEVELOP_BRANCH', defaultValue: 'develop', description: 'the branch for the development')
27
27
  string(name: 'MASTER_BRANCH', defaultValue: 'master', description: 'Master branch as default branch for production.')
28
28
 
29
29
  // by default first value of the choice will be choosen
30
30
  choice choices: ['auto', 'force'], description: 'Choose merge strategy', name: 'NPM_PUBLISH_STRATEGY'
31
31
  choice choices: ['yarn', 'npm'], description: 'Choose build strategy', name: 'BUILD_STRATEGY'
32
- choice choices: ['0.7.9','0.7.7', '0.6.0'], description: 'Choose Idestack chart version', name: 'IDESTACK_CHART_VERSION'
32
+ choice choices: ['0.7.11','0.7.9', '0.6.0'], description: 'Choose Idestack chart version', name: 'IDESTACK_CHART_VERSION'
33
33
  choice choices: ['nodejs20', 'nodejs18', 'nodejs22'], description: 'Choose NodeJS version', name: 'NODEJS_TOOL_VERSION'
34
34
  choice choices: ['buildOnly', 'buildAndTest', 'buildAndPublish', 'mobileBuild', 'mobilePreview', 'mobilePreviewLocal', 'mobilePreviewSubmit', 'mobileProd', 'mobileProdSubmit', 'devDeployOnly', 'stageDeploy', 'stageDeployOnly', 'prodDeploy', 'prodDeployOnly', 'allenv'], description: 'Where to deploy micro services?', name: 'ENV_CHOICE'
35
35
  choice choices: ['all', 'ios', 'android' ], description: 'Mobile type if it is mobile build?', name: 'MOBILE_CHOICE'
package/src/generators/add-fullstack/files/package.json CHANGED
@@ -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.10",
150
+ "@common-stack/generate-plugin": "6.0.6-alpha.12",
151
151
  "@emotion/babel-plugin": "^11.11.0",
152
152
  "@graphql-codegen/add": "^5.0.2",
153
153
  "@graphql-codegen/cli": "^5.0.2",
@@ -166,12 +166,13 @@
166
166
  "@redux-devtools/core": "^3.13.1",
167
167
  "@redux-devtools/dock-monitor": "^3.0.1",
168
168
  "@redux-devtools/log-monitor": "^4.0.1",
169
- "@remix-run/dev": "^2.9.2",
170
- "@remix-run/react": "^2.9.2",
169
+ "@rollup/plugin-alias": "^5.1.0",
170
+ "@rollup/plugin-babel": "^6.0.4",
171
171
  "@rollup/plugin-graphql": "2.0.2",
172
172
  "@rollup/plugin-image": "^3.0.1",
173
173
  "@rollup/plugin-json": "^6.1.0",
174
- "@rollup/plugin-typescript": "^9.0.2",
174
+ "@rollup/plugin-node-resolve": "^15.2.3",
175
+ "@rollup/plugin-typescript": "^11.1.5",
175
176
  "@shelf/jest-mongodb": "^4.1.3",
176
177
  "@svgr/webpack": "^6.5.1",
177
178
  "@testing-library/react": "^16.4.0",
@@ -205,6 +206,7 @@
205
206
  "@typescript-eslint/parser": "^6.7.4",
206
207
  "@web/rollup-plugin-copy": "^0.5.1",
207
208
  "@webpack-cli/serve": "^1.7.0",
209
+ "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
208
210
  "autoprefixer": "^10.4.13",
209
211
  "babel-core": "^7.0.0-bridge.0",
210
212
  "babel-eslint": "^10.1.0",
@@ -266,6 +268,7 @@
266
268
  "jest-dom": "^4.0.0",
267
269
  "jest-junit": "^14.0.1",
268
270
  "jest-matcher-utils": "^29.2.2",
271
+ "jest-raw-loader": "^1.0.1",
269
272
  "jest-transform-graphql": "^2.1.0",
270
273
  "jsdom": "^20.0.2",
271
274
  "lerna": "8",
@@ -326,7 +329,7 @@
326
329
  "ts-node": "^10.9.1",
327
330
  "tslib": "^2.4.1",
328
331
  "typedoc": "^0.23.20",
329
- "typescript": "^5.1.6",
332
+ "typescript": "^5.5.4",
330
333
  "url-loader": "^4.1.1",
331
334
  "wait-on": "^6.0.1",
332
335
  "webpack": "^5.74.0",