refactor: add hasLabel to Checkbox vm

.eslintignore

@@ -6,3 +6,4 @@
 **/*.d.ts
 idea.js
 scripts/**/*.js
+packages/create-webiny-project/utils/binaries/**

.prettierignore

@@ -12,3 +12,4 @@ packages/admin-ui/scripts/importFromFigma/exports/Alias tokens.json
 lerna.json
 coverage/**
 packages/cli/files/**/*.json
+packages/create-webiny-project/utils/binaries/**

.yarnrc.yml

@@ -23,4 +23,4 @@ packageExtensions:
     peerDependencies:
       react-dom: ^16.14.0
 
-yarnPath: .yarn/releases/yarn-4.5.3.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

apps/admin/package.json

@@ -3,10 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@editorjs/delimiter": "^1.2.0",
-    "@editorjs/list": "^1.6.0",
-    "@editorjs/quote": "^2.4.0",
-    "@editorjs/underline": "^1.0.0",
+    "@editorjs/delimiter": "^1.3.0",
+    "@editorjs/list": "^1.8.0",
+    "@editorjs/quote": "^2.5.0",
+    "@editorjs/underline": "^1.1.0",
     "@types/react": "18.2.79",
     "@webiny/app-admin": "0.0.0",
     "@webiny/app-admin-users-cognito": "0.0.0",
@@ -18,12 +18,12 @@
     "@webiny/plugins": "0.0.0",
     "@webiny/react-properties": "0.0.0",
     "@webiny/serverless-cms-aws": "0.0.0",
-    "core-js": "^3.0.1",
-    "cross-fetch": "^3.0.4",
-    "prop-types": "^15.7.2",
+    "core-js": "3.39.0",
+    "cross-fetch": "^3.1.5",
+    "prop-types": "^15.8.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "regenerator-runtime": "^0.13.5",
+    "regenerator-runtime": "^0.13.11",
     "theme": "^1.0.0",
     "tslib": "^2.8.1"
   },

apps/admin/src/Extensions.tsx

@@ -1,4 +1,5 @@
 // This file is automatically updated via scaffolding utilities.
+// Learn more about extensions: https://webiny.link/extensions
 import React from "react";
 
 export const Extensions = () => {

apps/admin/src/plugins/formBuilder/richTextEditor.ts

@@ -1,13 +1,6 @@
-/**
- * Package @editorjs/* is missing types.
- */
-// @ts-expect-error
 import Delimiter from "@editorjs/delimiter";
-// @ts-expect-error
 import Quote from "@editorjs/quote";
-// @ts-expect-error
 import List from "@editorjs/list";
-// @ts-expect-error
 import Underline from "@editorjs/underline";
 import Image from "@webiny/app-admin/components/RichTextEditor/tools/image";
 import TextColor from "@webiny/app-admin/components/RichTextEditor/tools/textColor";

apps/admin/src/plugins/headlessCMS/richTextEditor.ts

@@ -1,13 +1,6 @@
-/**
- * Package @editorjs/* is missing types.
- */
-// @ts-expect-error
 import Delimiter from "@editorjs/delimiter";
-// @ts-expect-error
 import Quote from "@editorjs/quote";
-// @ts-expect-error
 import List from "@editorjs/list";
-// @ts-expect-error
 import Underline from "@editorjs/underline";
 import Image from "@webiny/app-admin/components/RichTextEditor/tools/image";
 import TextColor from "@webiny/app-admin/components/RichTextEditor/tools/textColor";

apps/admin/src/plugins/pageBuilder/richTextEditor.ts

@@ -1,13 +1,6 @@
-/**
- * Package @editorjs/* is missing types.
- */
-// @ts-expect-error
 import Delimiter from "@editorjs/delimiter";
-// @ts-expect-error
 import Quote from "@editorjs/quote";
-// @ts-expect-error
 import List from "@editorjs/list";
-// @ts-expect-error
 import Underline from "@editorjs/underline";
 import Image from "@webiny/app-admin/components/RichTextEditor/tools/image";
 import TextColor from "@webiny/app-admin/components/RichTextEditor/tools/textColor";

apps/api/graphql/package.json

@@ -23,20 +23,19 @@
     "@webiny/api-headless-cms-ddb": "0.0.0",
     "@webiny/api-headless-cms-tasks": "0.0.0",
     "@webiny/api-i18n": "0.0.0",
-    "@webiny/api-i18n-content": "0.0.0",
     "@webiny/api-i18n-ddb": "0.0.0",
     "@webiny/api-log": "0.0.0",
     "@webiny/api-page-builder": "0.0.0",
     "@webiny/api-page-builder-aco": "0.0.0",
     "@webiny/api-page-builder-import-export": "0.0.0",
     "@webiny/api-page-builder-import-export-so-ddb": "0.0.0",
     "@webiny/api-page-builder-so-ddb": "0.0.0",
-    "@webiny/api-prerendering-service": "0.0.0",
     "@webiny/api-prerendering-service-aws": "0.0.0",
     "@webiny/api-record-locking": "0.0.0",
     "@webiny/api-security": "0.0.0",
     "@webiny/api-security-cognito": "0.0.0",
     "@webiny/api-security-so-ddb": "0.0.0",
+    "@webiny/api-serverless-cms": "0.0.0",
     "@webiny/api-tenancy": "0.0.0",
     "@webiny/api-tenancy-so-ddb": "0.0.0",
     "@webiny/api-tenant-manager": "0.0.0",

apps/api/graphql/src/extensions.ts

@@ -1,4 +1,5 @@
 // This file is automatically updated via scaffolding utilities.
+// Learn more about extensions: https://webiny.link/extensions
 export const extensions = () => {
     return [];
 };

apps/api/graphql/src/plugins/continuingTask.ts

@@ -1,5 +1,5 @@
 import { createTaskDefinition } from "@webiny/tasks";
-import { Context } from "../types";
+import { Context } from "@webiny/api-serverless-cms";
 import { ITaskResponseContinueOptions } from "@webiny/tasks/response/abstractions";
 
 const MAX_RUNS = 5;

apps/api/graphql/src/security.okta.ts

@@ -11,7 +11,7 @@ import anonymousAuthorization from "@webiny/api-security/plugins/anonymousAuthor
 import tenantLinkAuthorization from "@webiny/api-security/plugins/tenantLinkAuthorization";
 import createAdminUsersApp from "@webiny/api-admin-users";
 import { createStorageOperations as createAdminUsersStorageOperations } from "@webiny/api-admin-users-so-ddb";
-import { Context } from "./types";
+import { Context } from "@webiny/api-serverless-cms";
 
 export default ({ documentClient }: { documentClient: DynamoDBDocument }) => [
     /**

apps/api/graphql/tsconfig.json

@@ -53,9 +53,6 @@
     {
       "path": "../../../packages/api-i18n/tsconfig.build.json"
     },
-    {
-      "path": "../../../packages/api-i18n-content/tsconfig.build.json"
-    },
     {
       "path": "../../../packages/api-i18n-ddb/tsconfig.build.json"
     },
@@ -75,7 +72,7 @@
       "path": "../../../packages/api-page-builder-so-ddb/tsconfig.build.json"
     },
     {
-      "path": "../../../packages/api-prerendering-service/tsconfig.build.json"
+      "path": "../../../packages/api-prerendering-service-aws/tsconfig.build.json"
     },
     {
       "path": "../../../packages/api-security/tsconfig.build.json"
@@ -86,6 +83,9 @@
     {
       "path": "../../../packages/api-security-so-ddb/tsconfig.build.json"
     },
+    {
+      "path": "../../../packages/api-serverless-cms/tsconfig.build.json"
+    },
     {
       "path": "../../../packages/api-tenancy/tsconfig.build.json"
     },
@@ -165,8 +165,6 @@
       "@webiny/api-record-locking": ["../../../packages/api-record-locking/src"],
       "@webiny/api-i18n/*": ["../../../packages/api-i18n/src/*"],
       "@webiny/api-i18n": ["../../../packages/api-i18n/src"],
-      "@webiny/api-i18n-content/*": ["../../../packages/api-i18n-content/src/*"],
-      "@webiny/api-i18n-content": ["../../../packages/api-i18n-content/src"],
       "@webiny/api-i18n-ddb/*": ["../../../packages/api-i18n-ddb/src/*"],
       "@webiny/api-i18n-ddb": ["../../../packages/api-i18n-ddb/src"],
       "@webiny/api-page-builder/*": ["../../../packages/api-page-builder/src/*"],
@@ -187,14 +185,19 @@
       ],
       "@webiny/api-page-builder-so-ddb/*": ["../../../packages/api-page-builder-so-ddb/src/*"],
       "@webiny/api-page-builder-so-ddb": ["../../../packages/api-page-builder-so-ddb/src"],
-      "@webiny/api-prerendering-service/*": ["../../../packages/api-prerendering-service/src/*"],
-      "@webiny/api-prerendering-service": ["../../../packages/api-prerendering-service/src"],
+      "@webiny/api-prerendering-service-aws/*": [
+        "../../../packages/api-prerendering-service-aws/src/*"
+      ],
+      "@webiny/api-prerendering-service-aws": [
+        "../../../packages/api-prerendering-service-aws/src"
+      ],
       "@webiny/api-security/*": ["../../../packages/api-security/src/*"],
       "@webiny/api-security": ["../../../packages/api-security/src"],
       "@webiny/api-security-cognito/*": ["../../../packages/api-security-cognito/src/*"],
       "@webiny/api-security-cognito": ["../../../packages/api-security-cognito/src"],
       "@webiny/api-security-so-ddb/*": ["../../../packages/api-security-so-ddb/src/*"],
       "@webiny/api-security-so-ddb": ["../../../packages/api-security-so-ddb/src"],
+      "@webiny/api-serverless-cms": ["../../../packages/api-serverless-cms/src"],
       "@webiny/api-tenancy/*": ["../../../packages/api-tenancy/src/*"],
       "@webiny/api-tenancy": ["../../../packages/api-tenancy/src"],
       "@webiny/api-tenancy-so-ddb/*": ["../../../packages/api-tenancy-so-ddb/src/*"],

apps/website/package.json

@@ -15,12 +15,12 @@
     "@webiny/serverless-cms-aws": "0.0.0",
     "apollo-client": "^2.6.10",
     "apollo-link": "^1.2.14",
-    "core-js": "^3.0.1",
-    "cross-fetch": "^3.0.4",
+    "core-js": "3.39.0",
+    "cross-fetch": "^3.1.5",
     "graphql": "^15.9.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "regenerator-runtime": "^0.13.5",
+    "regenerator-runtime": "^0.13.11",
     "theme": "^1.0.0"
   },
   "devDependencies": {

apps/website/src/Extensions.tsx

@@ -1,4 +1,5 @@
 // This file is automatically updated via scaffolding utilities.
+// Learn more about extensions: https://webiny.link/extensions
 import React from "react";
 
 export const Extensions = () => {

extensions/theme/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@apollo/react-hooks": "^3.1.5",
     "@emotion/react": "11.10.8",
-    "@emotion/styled": "^11.10.6",
+    "@emotion/styled": "11.10.6",
     "@webiny/app-form-builder": "0.0.0",
     "@webiny/app-page-builder": "0.0.0",
     "@webiny/app-page-builder-elements": "0.0.0",
@@ -18,7 +18,7 @@
     "@webiny/validation": "0.0.0",
     "graphql": "^15.9.0",
     "react": "18.2.0",
-    "react-hamburger-menu": "^1.1.1"
+    "react-hamburger-menu": "1.2.1"
   },
   "devDependencies": {
     "@types/react-hamburger-menu": "^0.0.4"

package.json

@@ -59,8 +59,8 @@
     "@types/prettier": "^2.7.3",
     "@types/react": "18.2.79",
     "@types/react-dom": "18.2.25",
-    "@typescript-eslint/eslint-plugin": "^5.5.0",
-    "@typescript-eslint/parser": "^5.5.0",
+    "@typescript-eslint/eslint-plugin": "^5.51.0",
+    "@typescript-eslint/parser": "^5.51.0",
     "adio": "^1.0.1",
     "axios": "^1.7.9",
     "babel-jest": "29.7.0",
@@ -76,13 +76,13 @@
     "env-ci": "2.0.1",
     "eslint": "^8.57.1",
     "eslint-config-standard": "^16.0.3",
-    "eslint-import-resolver-babel-module": "^5.3.1",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jest": "^25.3.0",
+    "eslint-import-resolver-babel-module": "^5.3.2",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jest": "^25.7.0",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.2.0",
-    "eslint-plugin-react": "^7.27.1",
+    "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-standard": "^5.0.0",
     "execa": "^5.1.1",
     "folder-hash": "^4.0.4",
@@ -118,7 +118,7 @@
     "ts-node": "^10.9.2",
     "typescript": "4.9.5",
     "typescript-transform-paths": "^3.4.6",
-    "verdaccio": "^5.29.1",
+    "verdaccio": "^6.0.5",
     "write-json-file": "^4.3.0",
     "yargs": "^17.7.2"
   },
@@ -243,7 +243,6 @@
     "crypto-js": "^4.2.0",
     "ip": "^2.0.1",
     "tar": "^6.2.1",
-    "express": "^4.21.2",
     "ejs": "^3.1.10",
     "@grpc/grpc-js": "^1.11.1",
     "postcss": "^8.4.35",
@@ -258,11 +257,11 @@
     "apollo-link@^1.0.0": "patch:apollo-link@npm%3A1.2.14#./.yarn/patches/apollo-link-npm-1.2.14-74f0ba01f9.patch",
     "@material/base@^14.0.0": "patch:@material/base@npm%3A14.0.0#./.yarn/patches/@material-base-npm-14.0.0-36e0a55c42.patch"
   },
-  "packageManager": "yarn@4.5.3",
+  "packageManager": "yarn@4.6.0",
   "dependencies": {
     "@types/hoist-non-react-statics": "^3.3.5"
   },
   "engines": {
-    "node": ">=20.0.0 <23.0.0"
+    "node": ">=20.0.0"
   }
 }

packages/admin-ui/package.json

@@ -28,10 +28,12 @@
     "@webiny/react-composition": "0.0.0",
     "@webiny/react-router": "0.0.0",
     "@webiny/utils": "0.0.0",
+    "ace-builds": "^1.37.1",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "mobx": "^6.9.0",
     "react": "18.2.0",
+    "react-ace": "^13.0.0",
     "tailwind-merge": "^2.4.0",
     "tailwindcss": "^3.4.6",
     "tailwindcss-animate": "^1.0.7"

packages/admin-ui/src/Checkbox/CheckboxItemFormatted.ts

@@ -7,4 +7,5 @@ export interface CheckboxItemFormatted {
     checked: boolean;
     indeterminate: boolean;
     disabled: boolean;
+    hasLabel: boolean;
 }

packages/admin-ui/src/Checkbox/CheckboxItemMapper.ts

@@ -9,7 +9,8 @@ export class CheckboxItemMapper {
             value: item.value,
             checked: item.checked,
             indeterminate: item.indeterminate,
-            disabled: item.disabled
+            disabled: item.disabled,
+            hasLabel: !!item.label
         };
     }
 }

packages/admin-ui/src/Checkbox/CheckboxPresenter.test.ts

@@ -13,7 +13,7 @@ describe("CheckboxPresenter", () => {
                 label: "Label"
             });
             expect(presenter.vm.item?.label).toEqual("Label");
-            expect(presenter.vm.hasLabel).toEqual(true);
+            expect(presenter.vm.item?.hasLabel).toEqual(true);
         }
 
         // `id`
@@ -61,9 +61,9 @@ describe("CheckboxPresenter", () => {
                 id: expect.any(String),
                 checked: false,
                 indeterminate: false,
-                disabled: false
+                disabled: false,
+                hasLabel: false
             });
-            expect(presenter.vm.hasLabel).toEqual(false);
         }
     });
 

packages/admin-ui/src/Checkbox/CheckboxPresenter.ts

@@ -36,8 +36,7 @@ class CheckboxPresenter implements ICheckboxPresenter {
 
     get vm() {
         return {
-            item: this.item ? CheckboxItemMapper.toFormatted(this.item) : undefined,
-            hasLabel: this.item ? !!this.item.label : false
+            item: this.item ? CheckboxItemMapper.toFormatted(this.item) : undefined
         };
     }