@common-stack/generate-plugin 6.0.8-alpha.5 → 6.0.8-alpha.50

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 (85) hide show
  1. package/CHANGELOG.md +184 -4
  2. package/lib/common/package-releases/package.json +26 -0
  3. package/lib/common/package-releases/package.json.cjs +33 -0
  4. package/lib/common/package-releases/package.json.cjs.map +1 -0
  5. package/lib/common/package-releases/package.json.mjs +33 -0
  6. package/lib/common/package-releases/package.json.mjs.map +1 -0
  7. package/lib/generators/add-backend/files/Dockerfile +2 -0
  8. package/lib/generators/add-backend/files/package.json +4 -2
  9. package/lib/generators/add-backend/files/webpack.config.js +3 -1
  10. package/lib/generators/add-frontend/frameworks/antui/src/context.tsx.template +8 -0
  11. package/lib/generators/add-frontend/frameworks/antui/{entry.client.tsx.template → src/entry.client.tsx.template} +12 -12
  12. package/{src/generators/add-frontend/frameworks/antui → lib/generators/add-frontend/frameworks/antui/src}/entry.server.tsx.template +61 -51
  13. package/{src/generators/add-frontend/frameworks/antui → lib/generators/add-frontend/frameworks/antui/src}/root.tsx.template +6 -15
  14. package/lib/generators/add-frontend/frameworks/chakraui/{context.tsx.template → src/context.tsx.template} +6 -0
  15. package/lib/generators/add-frontend/frameworks/chakraui/{entry.client.tsx.template → src/entry.client.tsx.template} +21 -18
  16. package/{src/generators/add-frontend/frameworks/chakraui → lib/generators/add-frontend/frameworks/chakraui/src}/entry.server.tsx.template +33 -30
  17. package/lib/generators/add-frontend/frameworks/chakraui/{root.tsx.template → src/root.tsx.template} +8 -4
  18. package/{src/generators/add-frontend/frameworks/tailwindui → lib/generators/add-frontend/frameworks/tailwindui/src}/entry.client.tsx.template +3 -10
  19. package/lib/generators/add-frontend/generator.cjs +83 -36
  20. package/lib/generators/add-frontend/generator.cjs.map +1 -1
  21. package/lib/generators/add-frontend/generator.mjs +83 -36
  22. package/lib/generators/add-frontend/generator.mjs.map +1 -1
  23. package/lib/generators/add-frontend/templates/Dockerfile +4 -0
  24. package/lib/generators/add-frontend/templates/package.json +7 -3
  25. package/lib/generators/add-frontend/templates/vite.config.ts.template +18 -1
  26. package/lib/generators/add-fullstack/files/Jenkinsfile +2 -2
  27. package/lib/generators/add-fullstack/files/cdecode-config.json +126 -0
  28. package/lib/generators/add-fullstack/files/package.json +31 -18
  29. package/lib/generators/add-fullstack/files/rollup.config.base.mjs +17 -95
  30. package/lib/generators/add-fullstack/files/tools/codegenGenerator.mjs +36 -0
  31. package/lib/generators/add-fullstack/generator.cjs +8 -4
  32. package/lib/generators/add-fullstack/generator.cjs.map +1 -1
  33. package/lib/generators/add-fullstack/generator.mjs +8 -4
  34. package/lib/generators/add-fullstack/generator.mjs.map +1 -1
  35. package/lib/generators/add-fullstack/schema.json +1 -1
  36. package/lib/generators/add-moleculer/files/Dockerfile +2 -0
  37. package/lib/generators/add-moleculer/files/config.json +5 -0
  38. package/lib/generators/add-moleculer/files/package.json +10 -6
  39. package/lib/generators/add-moleculer/files/rollup.config.mjs +14 -1
  40. package/package.json +3 -3
  41. package/rollup.config.mjs +3 -0
  42. package/src/common/package-releases/package.json +26 -0
  43. package/src/generators/add-frontend/__snapshots__/generator.test.ts.snap +33 -0
  44. package/src/generators/add-frontend/frameworks/antui/src/context.tsx.template +8 -0
  45. package/src/generators/add-frontend/frameworks/antui/{entry.client.tsx.template → src/entry.client.tsx.template} +12 -12
  46. package/{lib/generators/add-frontend/frameworks/antui → src/generators/add-frontend/frameworks/antui/src}/entry.server.tsx.template +61 -51
  47. package/{lib/generators/add-frontend/frameworks/antui → src/generators/add-frontend/frameworks/antui/src}/root.tsx.template +6 -15
  48. package/src/generators/add-frontend/frameworks/chakraui/{context.tsx.template → src/context.tsx.template} +6 -0
  49. package/src/generators/add-frontend/frameworks/chakraui/{entry.client.tsx.template → src/entry.client.tsx.template} +21 -18
  50. package/{lib/generators/add-frontend/frameworks/chakraui → src/generators/add-frontend/frameworks/chakraui/src}/entry.server.tsx.template +33 -30
  51. package/src/generators/add-frontend/frameworks/chakraui/{root.tsx.template → src/root.tsx.template} +8 -4
  52. package/src/generators/add-frontend/frameworks/tailwindui/postcss.config.js +6 -0
  53. package/{lib/generators/add-frontend/frameworks/tailwindui → src/generators/add-frontend/frameworks/tailwindui/src}/entry.client.tsx.template +3 -10
  54. package/src/generators/add-frontend/frameworks/tailwindui/tailwind.config.ts.template +12 -0
  55. package/src/generators/add-frontend/generator.test.ts +79 -0
  56. package/src/generators/add-frontend/generator.ts +109 -44
  57. package/src/generators/add-fullstack/files/Jenkinsfile +2 -2
  58. package/src/generators/add-fullstack/files/cdecode-config.json +126 -0
  59. package/src/generators/add-fullstack/files/package.json +31 -18
  60. package/src/generators/add-fullstack/files/rollup.config.base.mjs +17 -95
  61. package/src/generators/add-fullstack/files/tools/codegenGenerator.mjs +36 -0
  62. package/src/generators/add-fullstack/generator.ts +8 -4
  63. package/src/generators/add-fullstack/schema.json +1 -1
  64. package/src/generators/add-moleculer/files/.dockerignore +2 -1
  65. package/src/generators/add-moleculer/files/Dockerfile +2 -0
  66. package/src/generators/add-moleculer/files/config.json +5 -0
  67. package/src/generators/add-moleculer/files/package.json +10 -6
  68. package/src/generators/add-moleculer/files/rollup.config.mjs +14 -1
  69. package/tsconfig.spec.json +9 -0
  70. package/docker-releases/backend/package.json +0 -134
  71. package/docker-releases/frontend/antd/package.json +0 -121
  72. package/lib/generators/add-fullstack/files/codegen.yml +0 -47
  73. package/lib/generators/add-moleculer/files/src/modules/module.ts.template +0 -31
  74. package/src/generators/add-frontend/generator.spec.ts +0 -20
  75. package/src/generators/add-fullstack/files/codegen.yml +0 -47
  76. package/src/generators/add-moleculer/files/src/modules/module.ts.template +0 -31
  77. /package/lib/generators/add-frontend/{templates → frameworks/tailwindui}/postcss.config.js +0 -0
  78. /package/lib/generators/add-frontend/frameworks/tailwindui/{entry.server.tsx.template → src/entry.server.tsx.template} +0 -0
  79. /package/lib/generators/add-frontend/frameworks/tailwindui/{root.tsx.template → src/root.tsx.template} +0 -0
  80. /package/lib/generators/add-frontend/frameworks/tailwindui/{tailwind.css → src/tailwind.css} +0 -0
  81. /package/lib/generators/add-frontend/{templates → frameworks/tailwindui}/tailwind.config.ts.template +0 -0
  82. /package/lib/generators/add-frontend/{generator.spec.d.ts → generator.test.d.ts} +0 -0
  83. /package/src/generators/add-frontend/frameworks/tailwindui/{entry.server.tsx.template → src/entry.server.tsx.template} +0 -0
  84. /package/src/generators/add-frontend/frameworks/tailwindui/{root.tsx.template → src/root.tsx.template} +0 -0
  85. /package/src/generators/add-frontend/frameworks/tailwindui/{tailwind.css → src/tailwind.css} +0 -0
@@ -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":"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"}
@@ -5,6 +5,9 @@ ENV PYTHON=/usr/bin/python
5
5
 
6
6
  COPY .npmrc package.json /tmp/
7
7
 
8
+ # Copy the common package to the temporary directory
9
+ COPY common /tmp/common
10
+
8
11
  RUN set -ex \
9
12
  && cd /tmp \
10
13
  && npm install -g node-gyp \
@@ -13,6 +16,7 @@ RUN set -ex \
13
16
  && rm -f /tmp/.npmrc \
14
17
  && mkdir -p /home/app \
15
18
  && cp -a /tmp/node_modules /home/app/ \
19
+ && cp -a /tmp/common /home/app/common \
16
20
  && rm -Rf /tmp/*
17
21
 
18
22
 
@@ -25,8 +25,9 @@
25
25
  "build:dev": "cross-env ENV_FILE=../../config/development/dev.env yarn build",
26
26
  "build:devSSR": "cross-env SSR=true NODE_ENV=development ENV_FILE=../../config/development/dev.env yarn build",
27
27
  "build:stats": "cross-env BUNDLE_STATS=true yarn build:debug",
28
+ "copycommon": "cp -r ../../packages/common .",
28
29
  "dev:vite:ssr": "cross-env SSR=true NODE_ENV=development ENV_FILE=../../config/development/dev.env node ./server.js",
29
- "docker:build": "cross-env yarn build && docker build . -t $npm_package_name:$npm_package_version",
30
+ "docker:build": "yarn copycommon && yarn build && docker build . -t $npm_package_name:$npm_package_version",
30
31
  "docker:build:debug": "yarn build:debug && docker build . -t $npm_package_name:$npm_package_version",
31
32
  "docker:run": "docker run --env-file ../../config/staging/docker-staging.env -p 3000:3000 -it $npm_package_name:$npm_package_version",
32
33
  "genconfig": "node ./tools/mergeConfig.js",
@@ -51,8 +52,11 @@
51
52
  "watch:staging": "cross-env ENV_FILE=../../config/staging/staging.env node ./server.js",
52
53
  "watch:test": "cross-env ENV_FILE=../../config/test/test.env node ./server.js"
53
54
  },
55
+ "resolutions": {
56
+ "common": "link:./common"
57
+ },
54
58
  "dependencies": {
55
- "@common-stack/frontend-stack-react": "6.0.8-alpha.1",
59
+ "@common-stack/frontend-stack-react": "6.0.8-alpha.48",
56
60
  "@react-icons/all-files": "^4.1.0",
57
61
  "classnames": "^2.2.6",
58
62
  "compression": "^1.7.4",
@@ -77,7 +81,7 @@
77
81
  },
78
82
  "devDependencies": {
79
83
  "@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
80
- "@common-stack/rollup-vite-utils": "6.0.8-alpha.1",
84
+ "@common-stack/rollup-vite-utils": "6.0.8-alpha.48",
81
85
  "@remix-run/dev": "~2.10.1",
82
86
  "@remix-run/serve": "~2.10.1",
83
87
  "cross-env": "^7.0.3",
@@ -61,6 +61,9 @@ export default defineConfig(async ({ isSsrBuild }) => {
61
61
  paths: config.paths,
62
62
  iconsRepository: config?.iconsRepository,
63
63
  rootPath: resolve(directoryName, '../..'),
64
+ settings: {
65
+ _useFutureCommonPackage: true,
66
+ },
64
67
  },
65
68
  metaJson
66
69
  )
@@ -85,6 +88,14 @@ export default defineConfig(async ({ isSsrBuild }) => {
85
88
  }),
86
89
  tsconfigPaths({ ignoreConfigErrors: true }),
87
90
  ],
91
+ optimizeDeps: {
92
+ esbuildOptions: {
93
+ target: 'esnext',
94
+ },
95
+ },
96
+ build: {
97
+ target: 'esnext',
98
+ },
88
99
  resolve: {
89
100
  alias: {
90
101
  '@app': resolve(directoryName, 'app'),
@@ -94,5 +105,11 @@ export default defineConfig(async ({ isSsrBuild }) => {
94
105
  };
95
106
 
96
107
  // Deep merge custom Vite config from config.json
97
- return mergeWith(viteConfig, config.viteConfig);
108
+ // to merge Arrays properly need to concat.
109
+ const result = mergeWith(config.viteConfig, viteConfig, (objValue, srcValue) => {
110
+ if (Array.isArray(objValue)) {
111
+ return objValue.concat(srcValue);
112
+ }
113
+ });
114
+ return result;
98
115
  });
@@ -29,7 +29,7 @@ pipeline {
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.11','0.7.9', '0.6.0'], description: 'Choose Idestack chart version', name: 'IDESTACK_CHART_VERSION'
32
+ choice choices: ['0.7.12','0.7.11', '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'
@@ -646,7 +646,7 @@ def buildAndPushDockerImage(server, name, version) {
646
646
  } else {
647
647
  sh """
648
648
  npx lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run ${env.BUILD_COMMAND};
649
-
649
+ npx lerna exec --scope=*${server} ${params.BUILD_STRATEGY} copycommon
650
650
  docker buildx create --name ${server} --driver docker-container --use
651
651
  docker buildx inspect ${server} --bootstrap
652
652
 
@@ -0,0 +1,126 @@
1
+ {
2
+ "servers": ["servers/frontend-server/config.json", "servers/backend-server/config.json"],
3
+ "codegen": {
4
+ "outputFile": "codegen.ts",
5
+ "rootSchema": "servers/backend-server/src/api/root-schema.graphqls",
6
+ "fullConfig": {
7
+ "overwrite": true,
8
+ "schema": ["$PRIMARY_SCHEMA_PLACEHOLDER$"],
9
+ "generates": {
10
+ "packages/common/src/generated/generated-models.ts": {
11
+ "schema": "%discoveredSchemas%",
12
+ "documents": "%discoveredDocuments%",
13
+ "config": {
14
+ "scalars": {
15
+ "URI": "URI",
16
+ "URIInput": "URI | UriComponents"
17
+ },
18
+ "enumPrefix": false,
19
+ "enumValues": {
20
+ "ConfigurationScope": "@workbench-stack/core/lib/interfaces/configuration/configuration.js#ConfigurationScope",
21
+ "ConfigurationTarget": "../configuration#ConfigurationTarget"
22
+ },
23
+ "constEnums": false,
24
+ "contextType": "../apollo-context#MyContext",
25
+ "withHooks": true,
26
+ "typesPrefix": "I",
27
+ "noNamespaces": true,
28
+ "noGraphQLTag": true
29
+ },
30
+ "plugins": [
31
+ {
32
+ "add": {
33
+ "content": [
34
+ "import { URI, UriComponents } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';"
35
+ ]
36
+ }
37
+ },
38
+ "typescript",
39
+ "typescript-operations",
40
+ "typescript-resolvers"
41
+ ]
42
+ },
43
+ "packages/common/src/generated/generated.tsx": {
44
+ "schema": "%discoveredSchemas%",
45
+ "documents": "%discoveredDocuments%",
46
+ "config": {
47
+ "scalars": {
48
+ "URI": "URI",
49
+ "URIInput": "URI | UriComponents"
50
+ },
51
+ "enumPrefix": false,
52
+ "withHooks": true,
53
+ "typesPrefix": "I",
54
+ "noNamespaces": true,
55
+ "noGraphQLTag": true
56
+ },
57
+ "preset": "import-types-preset",
58
+ "presetConfig": {
59
+ "typesPath": "./generated-models",
60
+ "importTypesNamespace": "SchemaTypes"
61
+ },
62
+ "plugins": [
63
+ {
64
+ "add": {
65
+ "content": [
66
+ "import { URI, UriComponents } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';"
67
+ ]
68
+ }
69
+ },
70
+ "typescript-react-apollo"
71
+ ]
72
+ },
73
+ "packages/common/src/generated/introspection-result.ts": {
74
+ "schema": "%discoveredSchemas%",
75
+ "documents": "%discoveredDocuments%",
76
+ "config": {
77
+ "typesPrefix": "I"
78
+ },
79
+ "plugins": [
80
+ {
81
+ "add": {
82
+ "content": ["/* tslint:disable */"]
83
+ }
84
+ },
85
+ "fragment-matcher"
86
+ ]
87
+ }
88
+ }
89
+ }
90
+ },
91
+ "updateDependencies": {
92
+ "packagesToCheck": [
93
+ "@common-stack/server-stack",
94
+ "@common-stack/frontend-stack-react",
95
+ "@common-stack/mobile-stack-react"
96
+ ],
97
+ "packagePaths": {
98
+ "backend": ["servers/backend-server/package.json"],
99
+ "frontend": ["servers/frontend-server/package.json"],
100
+ "mobile": ["portable-devices/mobile/package.json"]
101
+ }
102
+ },
103
+ "updateDependencyVersion": {
104
+ "roots": ["servers", "portable-devices", "packages", "packages-modules"],
105
+ "ignorePattern": "**/node_modules/**",
106
+ "jsonSpacing": 4,
107
+ "addEndNewLine": true,
108
+ "commitMessage": "Updated packages to use correct versions"
109
+ },
110
+ "sortPackageJson": {
111
+ "directories": [".", "packages", "packages-modules", "servers", "portable-devices"],
112
+ "skipNodeModules": true
113
+ },
114
+ "deployVersionUpdate": {
115
+ "lernaJsonPath": "lerna.json",
116
+ "jenkinsfilePath": "Jenkinsfile",
117
+ "valuesDevYamlPath": "values-dev.yaml",
118
+ "valuesProdYamlPath": "values-prod.yaml"
119
+ },
120
+ "projectPaths": {
121
+ "packages": "packages",
122
+ "packagesModules": "packages-modules",
123
+ "servers": "servers",
124
+ "portableDevices": "portable-devices"
125
+ }
126
+ }
@@ -25,7 +25,7 @@
25
25
  },
26
26
  "scripts": {
27
27
  "prebootstrap": "lerna run prepare",
28
- "bootstrap": "yarn && yarn lerna",
28
+ "bootstrap": "yarn",
29
29
  "postbootstrap": "yarn build",
30
30
  "build": "yarn build:packages",
31
31
  "build:clean": "lerna exec yarn build:clean",
@@ -52,14 +52,15 @@
52
52
  "devpublish:push": "yarn predevpublish && git push origin $PUBLISH_BRANCH && yarn postdevpublish",
53
53
  "format": "yarn lint --fix",
54
54
  "format:md": "yarn lint:md --fix",
55
- "generateGraphql": "graphql-codegen",
55
+ "pregenerateGraphql": " node --experimental-modules tools/codegenGenerator.mjs",
56
+ "generateGraphql": "graphql-codegen-esm",
57
+ "postgenerateGraphql": "lerna run watch --scope=common",
56
58
  "generateGraphql:watch": "yarn generateGraphql -- --watch",
57
59
  "git:pull": "git pull origin $(git rev-parse --abbrev-ref HEAD)",
58
60
  "git:push": "git push origin $(git rev-parse --abbrev-ref HEAD)",
59
61
  "gitcommit": "git add -A && git diff --staged --quiet || git commit -am 'auto publish [skip ci] \r\n'",
60
62
  "husky-skip": "cross-env HUSKY_SKIP_HOOKS=1",
61
63
  "jest": "./node_modules/.bin/jest",
62
- "lerna": "lerna bootstrap",
63
64
  "prelernapublish": "git checkout $PUBLISH_BRANCH && git pull origin $PUBLISH_BRANCH && git merge -s recursive -X theirs $MASTER_BRANCH -m 'merge from master' && yarn gitcommit && node tools/update-dependency-version.mjs && yarn gitcommit",
64
65
  "lernapublish": "lerna publish patch --ignore-scripts",
65
66
  "postlernapublish": "yarn update-lerna-on-develop && git checkout $MASTER_BRANCH",
@@ -105,9 +106,11 @@
105
106
  },
106
107
  "resolutions": {
107
108
  "@apollo/client": "^3.9.0",
108
- "@types/react": "^18.0.25",
109
- "@types/react-dom": "^18.0.8",
109
+ "@types/react": "^18.2.25",
110
+ "@types/react-dom": "^18.2.7",
111
+ "common": "link:packages/common",
110
112
  "html-to-text": "^8.0.0",
113
+ "lerna": "8.1.8",
111
114
  "react": "18.3.0-canary-c3048aab4-20240326",
112
115
  "react-dom": "18.3.0-canary-c3048aab4-20240326",
113
116
  "react-native": "0.72.10",
@@ -146,20 +149,20 @@
146
149
  "@babel/preset-typescript": "^7.18.6",
147
150
  "@babel/register": "^7.18.9",
148
151
  "@babel/runtime": "^7.20.1",
149
- "@common-stack/env-list-loader": "6.0.8-alpha.1",
150
- "@common-stack/generate-plugin": "6.0.8-alpha.4",
151
- "@common-stack/rollup-vite-utils": "6.0.8-alpha.1",
152
+ "@common-stack/env-list-loader": "6.0.8-alpha.31",
153
+ "@common-stack/generate-plugin": "6.0.8-alpha.49",
154
+ "@common-stack/rollup-vite-utils": "6.0.8-alpha.48",
152
155
  "@emotion/babel-plugin": "^11.11.0",
153
- "@graphql-codegen/add": "^5.0.2",
154
- "@graphql-codegen/cli": "^5.0.2",
155
- "@graphql-codegen/fragment-matcher": "^5.0.2",
156
+ "@graphql-codegen/add": "^5.0.3",
157
+ "@graphql-codegen/cli": "^5.0.4",
158
+ "@graphql-codegen/fragment-matcher": "^5.1.0",
156
159
  "@graphql-codegen/import-types-preset": "^3.0.0",
157
160
  "@graphql-codegen/near-operation-file-preset": "^3.0.0",
158
- "@graphql-codegen/typescript": "^4.0.6",
161
+ "@graphql-codegen/typescript": "^4.1.3",
159
162
  "@graphql-codegen/typescript-graphql-files-modules": "^3.0.0",
160
- "@graphql-codegen/typescript-operations": "^4.2.0",
161
- "@graphql-codegen/typescript-react-apollo": "^4.3.0",
162
- "@graphql-codegen/typescript-resolvers": "^4.0.6",
163
+ "@graphql-codegen/typescript-operations": "^4.4.1",
164
+ "@graphql-codegen/typescript-react-apollo": "^4.3.2",
165
+ "@graphql-codegen/typescript-resolvers": "^4.4.2",
163
166
  "@loadable/babel-plugin": "^5.13.2",
164
167
  "@loadable/webpack-plugin": "^5.15.2",
165
168
  "@nx-aws-plugin/nx-aws-cache": "^3.2.2",
@@ -176,7 +179,8 @@
176
179
  "@rollup/plugin-typescript": "^11.1.5",
177
180
  "@shelf/jest-mongodb": "^4.1.3",
178
181
  "@svgr/webpack": "^6.5.1",
179
- "@testing-library/react": "^16.0.1",
182
+ "@testing-library/dom": "^10.4.0",
183
+ "@testing-library/react": "^16.1.0",
180
184
  "@testing-library/react-hooks": "^8.0.1",
181
185
  "@types/async": "^3.2.15",
182
186
  "@types/body-parser": "1.19.2",
@@ -272,7 +276,7 @@
272
276
  "jest-raw-loader": "^1.0.1",
273
277
  "jest-transform-graphql": "^2.1.0",
274
278
  "jsdom": "^20.0.2",
275
- "lerna": "8",
279
+ "lerna": "8.1.8",
276
280
  "less": "^4.1.3",
277
281
  "less-loader": "^11.0.0",
278
282
  "lint-staged": "^15.2.7",
@@ -307,11 +311,15 @@
307
311
  "redux-devtools-extension": "^2.13.9",
308
312
  "redux-mock-store": "^1.5.4",
309
313
  "remap-istanbul": "^0.13.0",
314
+ "remix-development-tools": "^4.4.1",
310
315
  "resolve-url-loader": "^5.0.0",
311
316
  "rimraf": "^3.0.2",
312
317
  "rollup": "^4.13.0",
313
318
  "rollup-plugin-esbuild": "^6.1.1",
319
+ "rollup-plugin-multi-input": "^1.5.0",
314
320
  "rollup-plugin-string": "^3.0.0",
321
+ "rollup-plugin-svg": "^2.0.0",
322
+ "rollup-plugin-visualizer": "^5.14.0",
315
323
  "sass-loader": "^13.1.0",
316
324
  "shelljs": "^0.8.5",
317
325
  "simple-git": "^3.14.1",
@@ -332,10 +340,15 @@
332
340
  "typedoc": "^0.23.20",
333
341
  "typescript": "^5.5.4",
334
342
  "url-loader": "^4.1.1",
343
+ "vite": "^5.1.1",
344
+ "vite-plugin-babel-macros": "^1.0.6",
345
+ "vite-plugin-cjs-interop": "^2.0.6",
346
+ "vite-plugin-compression": "^0.5.1",
347
+ "vitest": "^3.0.4",
335
348
  "wait-on": "^6.0.1",
336
349
  "webpack": "^5.74.0",
337
350
  "webpack-bundle-analyzer": "^4.7.0",
338
- "webpack-cli": "^4.10.0",
351
+ "webpack-cli": "^5.1.4",
339
352
  "webpack-dev-server": "^4.11.1",
340
353
  "webpack-manifest-plugin": "^5.0.0",
341
354
  "webpack-merge": "^5.8.0",
@@ -3,15 +3,15 @@ import graphql from '@rollup/plugin-graphql';
3
3
  import image from '@rollup/plugin-image';
4
4
  import typescript from '@rollup/plugin-typescript';
5
5
  import { string } from 'rollup-plugin-string';
6
+ import svg from 'rollup-plugin-svg';
6
7
  import { copy } from '@web/rollup-plugin-copy';
7
8
  import modifyLibFilesPlugin from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginModifyLibFiles.js';
8
9
  import generateJsonFromObject from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginGenerateJson.js';
9
10
  import addJsExtensionToImportsPlugin from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginAddJsExtension.js';
10
11
  import { ignoreCssUrlPlugin } from '@common-stack/rollup-vite-utils/lib/rollup/pluginIgnore.js';
11
-
12
- // Define any additional plugins specific to this bundle
12
+ // Define any additional plugins specific to this bundle
13
13
  const additionalPlugins = [
14
- copy({ patterns: ['**/cdm-locales/**/*', '**/styles/**/*'], rootDir: './src' }),
14
+ copy({ patterns: ['**/cdm-locales/**/*', '**/*.gql', '**/**/*.graphql', '**/styles/**/*', '**/css/**/*'], rootDir: './src' }),
15
15
  ];
16
16
 
17
17
  function deepMergeConfigs(baseConfig, specificConfig) {
@@ -28,7 +28,8 @@ function deepMergeConfigs(baseConfig, specificConfig) {
28
28
  // Base configuration
29
29
  const baseConfig = {
30
30
  plugins: [
31
- image(),
31
+ image({ exclude: '**/*.svg' }),
32
+ svg({ include: '**/*.svg' }),
32
33
  graphql({ include: '**/*.gql' }),
33
34
  string({
34
35
  include: ['**/*.ejs', '**/*.graphql'],
@@ -45,6 +46,7 @@ const baseConfig = {
45
46
  outputDir: 'lib', // Ensure this matches your actual output directory
46
47
  }),
47
48
  generateJsonFromObject({}),
49
+
48
50
  ...additionalPlugins,
49
51
  ],
50
52
  external: (id) => !/^[./]/.test(id),
@@ -52,101 +54,21 @@ const baseConfig = {
52
54
  };
53
55
 
54
56
  // Function to create a configuration by extending the base
55
- function createRollupConfig(overrides) {
56
- return deepMergeConfigs(baseConfig, overrides);
57
- }
58
- function watch(watchOptions, buildMode = '') {
59
- const filename = path.basename(watchOptions.input);
60
- message(
61
- 'note',
62
- `${dt()} Rollup: Watcher Starting - watching for changes starting with: "${filename}" buildMode="${buildMode}"...`,
63
- 'WATCH ',
64
- true,
65
- );
66
- const watcher = rollup.watch(watchOptions);
67
-
68
- watcher.on('event', (event) => {
69
- // event.code can be one of:
70
- // START — the watcher is (re)starting
71
- // BUNDLE_START — building an individual bundle
72
- // * event.input will be the input options object if present
73
- // * event.output contains an array of the "file" or
74
- // "dir" option values of the generated outputs
75
- // BUNDLE_END — finished building a bundle
76
- // * event.input will be the input options object if present
77
- // * event.output contains an array of the "file" or
78
- // "dir" option values of the generated outputs
79
- // * event.duration is the build duration in milliseconds
80
- // * event.result contains the bundle object that can be
81
- // used to generate additional outputs by calling
82
- // bundle.generate or bundle.write. This is especially
83
- // important when the watch.skipWrite option is used.
84
- // You should call "event.result.close()" once you are done
85
- // generating outputs, or if you do not generate outputs.
86
- // This will allow plugins to clean up resources via the
87
- // "closeBundle" hook.
88
- // END — finished building all bundles
89
- // ERROR — encountered an error while bundling
90
- // * event.error contains the error that was thrown
91
- // * event.result is null for build errors and contains the
92
- // bundle object for output generation errors. As with
93
- // "BUNDLE_END", you should call "event.result.close()" if
94
- // present once you are done.
95
- // If you return a Promise from your event handler, Rollup will wait until the
96
- // Promise is resolved before continuing.
97
- // console.log(`rollup: ${event.code}`)
98
- if (event.code === 'BUNDLE_END') {
99
- const outputFiles = event.output.map((o) => path.basename(o)).join(', .../');
100
- const msg = `${dt()} Rollup: wrote bundle${event.output.length > 1 ? 's' : ''}: ".../${outputFiles}"`;
101
- if (NOTIFY) {
102
- notifier.notify({
103
- title: 'React Component Build',
104
- message: msg,
105
- });
106
- }
107
- // messenger: success, warn, critical, note, log
108
- message('success', msg, 'SUCCESS', true);
109
- } else if (event.code === 'ERROR') {
110
- message('critical', `!!!!!!!!!!!!!!!\nRollup ${event.error}\n!!!!!!!!!!!!!!!\n`, 'ERROR', true);
111
- if (NOTIFY) {
112
- notifier.notify({
113
- title: 'NotePlan Plugins Build',
114
- message: `An error occurred during build process.\nSee console for more information`,
115
- });
116
- }
117
- }
118
- });
57
+ function createRollupConfig(overrides, isWatchMode = false) {
58
+ const config = deepMergeConfigs(baseConfig, overrides);
119
59
 
120
- // This will make sure that bundles are properly closed after each run
121
- watcher.on('event', ({ result }) => {
122
- if (result) {
123
- result.close();
60
+ // Adjust TypeScript plugin based on watch mode
61
+ config.plugins = config.plugins.map((plugin) => {
62
+ if (plugin.name === 'typescript') {
63
+ return typescript({
64
+ ...plugin.options,
65
+ noEmitOnError: !isWatchMode, // Set to false only in watch mode
66
+ });
124
67
  }
68
+ return plugin;
125
69
  });
126
70
 
127
- // Additionally, you can hook into the following. Again, return a Promise to
128
- // make Rollup wait at that stage:
129
- watcher.on('change', (id /* , { event } */) => {
130
- const filename = path.basename(id);
131
- message('info', `${dt()} Rollup: file: "${filename}" changed`, 'CHANGE', true);
132
- /* a file was modified */
133
- });
134
- watcher.on('restart', () => {
135
- // console.log(`rollup: restarting`)
136
- /* a new run was triggered (usually a watched file change) */
137
- });
138
- watcher.on('close', () => {
139
- console.log(`rollup: closing`);
140
- /* the watcher was closed, see below */
141
- });
142
- process.on('SIGINT', async function () {
143
- console.log('\n\n');
144
- console.log(colors.yellow('Quitting...\n'));
145
- if (watcher) {
146
- await watcher.close();
147
- }
148
- process.exit();
149
- });
71
+ return config;
150
72
  }
151
73
 
152
74
  export { createRollupConfig, baseConfig };
@@ -0,0 +1,36 @@
1
+ import fs from 'fs';
2
+ import path from 'path';
3
+ import { fileURLToPath } from 'url';
4
+
5
+ import { runCodegenTasks } from '@common-stack/rollup-vite-utils/lib/tools/codegen/index.js';
6
+
7
+ /**
8
+ * This main script orchestrates your codegen steps, using cdecode-config.json.
9
+ * Usage:
10
+ * node tools/mainScript.mjs
11
+ */
12
+
13
+ // ESM housekeeping
14
+ const __filename = fileURLToPath(import.meta.url);
15
+ const __dirname = path.dirname(__filename);
16
+
17
+ (async function main() {
18
+ try {
19
+ // 1) Locate and parse cdecode-config.json
20
+ const configPath = path.join(__dirname, '../cdecode-config.json');
21
+ if (!fs.existsSync(configPath)) {
22
+ console.error(`cdecode-config.json not found at: ${configPath}`);
23
+ process.exit(1);
24
+ }
25
+ const rawConfig = fs.readFileSync(configPath, 'utf-8');
26
+ const cdecodeConfig = JSON.parse(rawConfig);
27
+
28
+ // 2) Run the orchestrated tasks
29
+ await runCodegenTasks(cdecodeConfig);
30
+
31
+ console.log('mainScript completed successfully!');
32
+ } catch (err) {
33
+ console.error('Error running mainScript:', err);
34
+ process.exit(1);
35
+ }
36
+ })();
@@ -1,10 +1,14 @@
1
1
  'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),fs=require('fs'),index=require('../../utils/index.cjs'),jenkinsfileUpdate=require('./updates/jenkinsfileUpdate.cjs'),packageJsonUpdate=require('./updates/packageJsonUpdate.cjs'),lernaJsonUpdate=require('./updates/lernaJsonUpdate.cjs'),htmlPluginUpdate=require('./updates/htmlPluginUpdate.cjs'),licenseUpdate=require('./updates/licenseUpdate.cjs'),ignoreUpdate=require('./updates/ignoreUpdate.cjs'),generator$2=require('../add-frontend/generator.cjs'),generator$1=require('../add-backend/generator.cjs'),generator=require('../add-moleculer/generator.cjs'),generator$3=require('../add-package/generator.cjs');require('../../executors/update-deploy-version/executor.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);var fs__namespace=/*#__PURE__*/_interopNamespaceDefault(fs);function addFullstackGenerator(tree, options) {
2
2
  return tslib.__awaiter(this, void 0, void 0, function* () {
3
3
  var _a;
4
- const basePath = options.path || '';
4
+ let projectPath = options.path || '';
5
+ if (projectPath !== '') {
6
+ const basePath = process.cwd();
7
+ projectPath = path__namespace.relative(basePath, projectPath);
8
+ }
5
9
  const projectName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro';
6
- const projectRoot = path__namespace.join(basePath, projectName);
7
- console.log(`basePath: ${basePath}`);
10
+ const projectRoot = path__namespace.join(projectPath, projectName);
11
+ // console.log(`Project Path: ${projectPath}`);
8
12
  // backup existing lerna values
9
13
  const lernaBackup = lernaJsonUpdate.backupLernaJson(tree, projectRoot);
10
14
  // backup files codegen.yaml
@@ -25,7 +29,7 @@
25
29
  ignoreUpdate.restoreFiles(tree, projectRoot, filesBackup);
26
30
  yield devkit.formatFiles(tree);
27
31
  if (index.isValid(options.config)) {
28
- const configPath = path__namespace.resolve(basePath, index.getValid(options.config));
32
+ const configPath = path__namespace.resolve(projectPath, index.getValid(options.config));
29
33
  if (fs__namespace.existsSync(configPath)) {
30
34
  try {
31
35
  const configs = JSON.parse(fs__namespace.readFileSync(configPath).toString());
@@ -1 +1 @@
1
- {"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":["getValid","path","backupLernaJson","backupFiles","generateFiles","updateJenkinsFile","updatePackageJson","updateHtmlPlugin","restoreLernaJson","restoreFiles","formatFiles","isValid","fs","updateLicense","__awaiter","generateFrontend","generateBackend","generateMoleculer","generatePackage","updateRepository"],"mappings":"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"}
1
+ {"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":["path","getValid","backupLernaJson","backupFiles","generateFiles","updateJenkinsFile","updatePackageJson","updateHtmlPlugin","restoreLernaJson","restoreFiles","formatFiles","isValid","fs","updateLicense","__awaiter","generateFrontend","generateBackend","generateMoleculer","generatePackage","updateRepository"],"mappings":"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"}