Merge branch 'main' into next

KaneFreeman · KaneFreeman · commit 4ffd38c44184 · 2023-10-31T12:05:55.000-04:00
diff --git a/lerna.json b/lerna.json
@@ -1,4 +1,4 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.4.2"
+  "version": "3.4.4"
 }
diff --git a/packages/app/.editorconfig b/packages/app/.editorconfig
@@ -17,3 +17,6 @@ quote_type = single
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.mdx]
+trim_trailing_whitespace = false
diff --git a/packages/app/.eslintrc.js b/packages/app/.eslintrc.js
@@ -15,7 +15,7 @@ module.exports = {
     'cypress/globals': true,
   },
   globals: {
-    STATIC_CMS_CORE_VERSION: false,
+    STATIC_CMS_APP_VERSION: false,
     CMS_ENV: false,
   },
   rules: {
diff --git a/packages/app/babel.config.js b/packages/app/babel.config.js
@@ -1,6 +1,6 @@
 const path = require('path');
 
-const coreVersion = require('./package.json').version;
+const appVersion = require('./package.json').version;
 const isProduction = process.env.NODE_ENV === 'production';
 const isTest = process.env.NODE_ENV === 'test';
 const isESM = process.env.NODE_ENV === 'esm';
@@ -53,7 +53,7 @@ function plugins() {
       [
         'transform-define',
         {
-          STATIC_CMS_CORE_VERSION: `${coreVersion}`,
+          STATIC_CMS_APP_VERSION: `${appVersion}`,
         },
       ],
       [
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@staticcms/app",
-  "version": "3.4.2",
+  "version": "3.4.4",
   "license": "MIT",
   "description": "Static CMS application.",
   "repository": "https://github.com/StaticJsCMS/static-cms",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@babel/eslint-parser": "7.22.15",
     "@babel/runtime": "7.23.1",
-    "@staticcms/core": "^3.4.2",
+    "@staticcms/core": "^3.4.4",
     "buffer": "6.0.3",
     "react": "18.2.0",
     "react-dom": "18.2.0",
diff --git a/packages/app/webpack.config.js b/packages/app/webpack.config.js
@@ -3,6 +3,7 @@ const webpack = require('webpack');
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const pkg = require('./package.json');
 
 const isProduction = process.env.NODE_ENV === 'production';
 const devServerPort = parseInt(process.env.STATIC_CMS_DEV_SERVER_PORT || `${8080}`);
@@ -89,6 +90,9 @@ module.exports = {
       process: 'process/browser',
       Buffer: ['buffer', 'Buffer'],
     }),
+    new webpack.DefinePlugin({
+      STATIC_CMS_APP_VERSION: JSON.stringify(`${pkg.version}${isProduction ? '' : '-dev'}`),
+    }),
   ].filter(Boolean),
   output: {
     path: path.resolve(__dirname, 'dist'),
diff --git a/packages/core/.editorconfig b/packages/core/.editorconfig
@@ -17,3 +17,6 @@ quote_type = single
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.mdx]
+trim_trailing_whitespace = false
diff --git a/packages/core/dev-test/backends/proxy/_data/navigation.mdx b/packages/core/dev-test/backends/proxy/_data/navigation.mdx
@@ -0,0 +1,26 @@
+---
+main_menu:
+  - label: News
+    href: /news
+  - label: Features
+    href: '#features'
+  - label: About
+    href: '#about'
+  - label: Contact
+    href: '#contact'
+footer_menus:
+  - label: Company
+    links:
+      - label: Home
+        href: /
+      - label: 'Privacy Policy '
+        href: '#'
+      - label: About us
+        href: '#'
+  - label: Documentation
+    links:
+      - label: Docs
+        href: '#'
+      - label: Blog
+        href: '#'
+---
diff --git a/packages/core/dev-test/backends/proxy/config.yml b/packages/core/dev-test/backends/proxy/config.yml
@@ -172,6 +172,45 @@ collections:
               - label: Description
                 name: description
                 widget: text
+
+      - name: navigation
+        label: Navigation
+        file: packages/core/dev-test/backends/proxy/_data/navigation.mdx
+        extension: mdx
+        format: yaml-frontmatter
+        fields:
+          - name: main_menu
+            label: Main Menu
+            widget: list
+            collapsed: true
+            fields:
+              - name: label
+                label: Label
+                widget: string
+              - name: href
+                label: Href
+                widget: string
+          - name: footer_menus
+            label: Footer Menus
+            widget: list
+            collapsed: true
+            reuired: false
+            fields:
+              - name: label
+                label: Label
+                widget: string
+              - name: links
+                label: Links
+                widget: list
+                collapsed: true
+                fields:
+                  - name: label
+                    label: Label
+                    widget: string
+                  - name: href
+                    label: Href
+                    widget: string
+
   - name: kitchenSink
     label: Kitchen Sink
     folder: packages/core/dev-test/backends/proxy/_sink
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@staticcms/core",
-  "version": "3.4.2",
+  "version": "3.4.4",
   "license": "MIT",
   "description": "Static CMS core application.",
   "repository": "https://github.com/StaticJsCMS/static-cms",
diff --git a/packages/core/src/bootstrap.tsx b/packages/core/src/bootstrap.tsx
@@ -81,7 +81,9 @@ function bootstrap<F extends BaseField = UnknownField>(opts?: {
   /**
    * Log the version number.
    */
-  if (typeof STATIC_CMS_CORE_VERSION === 'string') {
+  if (typeof STATIC_CMS_APP_VERSION === 'string') {
+    console.info(`[StaticCMS] Using @staticcms/app ${STATIC_CMS_APP_VERSION}`);
+  } else if (typeof STATIC_CMS_CORE_VERSION === 'string') {
     console.info(`[StaticCMS] Using @staticcms/core ${STATIC_CMS_CORE_VERSION}`);
   }
 
diff --git a/packages/core/src/components/ErrorBoundary.tsx b/packages/core/src/components/ErrorBoundary.tsx
@@ -51,8 +51,10 @@ ${config}
 
 function buildIssueTemplate(config?: Config) {
   let version = '';
-  if (typeof STATIC_CMS_CORE_VERSION === 'string') {
-    version = `static-cms@${STATIC_CMS_CORE_VERSION}`;
+  if (typeof STATIC_CMS_APP_VERSION === 'string') {
+    version = `@staticcms/app@${STATIC_CMS_APP_VERSION}`;
+  } else if (typeof STATIC_CMS_CORE_VERSION === 'string') {
+    version = `@staticcms/core@${STATIC_CMS_CORE_VERSION}`;
   }
   const template = getIssueTemplate(
     version,
diff --git a/packages/core/src/formats/formats.ts b/packages/core/src/formats/formats.ts
@@ -26,6 +26,7 @@ export const extensionFormatters: Record<string, FileFormatter> = {
   toml: TomlFormatter,
   json: JsonFormatter,
   md: FrontmatterInfer,
+  mdx: FrontmatterInfer,
   markdown: FrontmatterInfer,
   html: FrontmatterInfer,
 };
diff --git a/packages/core/src/lib/util/media.util.ts b/packages/core/src/lib/util/media.util.ts
@@ -254,6 +254,7 @@ export function selectMediaFolder<EF extends BaseField>(
         : joinUrlPath(
             collection && 'folder' in collection ? collection.folder : '',
             DRAFT_MEDIA_FILES,
+            folder,
           );
     }
   }
diff --git a/packages/core/src/types/constants.d.ts b/packages/core/src/types/constants.d.ts
@@ -1 +1,2 @@
 declare const STATIC_CMS_CORE_VERSION: string;
+declare const STATIC_CMS_APP_VERSION: string;
diff --git a/packages/docs/.editorconfig b/packages/docs/.editorconfig
@@ -17,3 +17,6 @@ quote_type = single
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.mdx]
+trim_trailing_whitespace = false
diff --git a/packages/docs/.eslintrc.js b/packages/docs/.eslintrc.js
@@ -15,7 +15,6 @@ module.exports = {
     jest: true,
   },
   globals: {
-    STATIC_CMS_CORE_VERSION: false,
     CMS_ENV: false,
   },
   rules: {
diff --git a/packages/docs/content/docs/collection-overview.mdx b/packages/docs/content/docs/collection-overview.mdx
@@ -58,7 +58,7 @@ collections: [
 
 These settings determine how collection files are parsed and saved. Both are optional—Static CMS will attempt to infer your settings based on existing items in the collection. If your collection is empty, or you'd like more control, you can set these fields explicitly.
 
-`extension` determines the file extension searched for when finding existing entries in a folder collection and it determines the file extension used to save new collection items. It accepts the following values: `yml`, `yaml`, `json`, `md`, `markdown`, `html`.
+`extension` determines the file extension searched for when finding existing entries in a folder collection and it determines the file extension used to save new collection items. It accepts the following values: `yml`, `yaml`, `json`, `md`, `markdown`, `mdx`, `html`.
 
 You may also specify a custom `extension` not included in the list above, as long as the collection files can be parsed and saved in one of the supported formats below.
 
diff --git a/packages/docs/content/docs/configuration-options.mdx b/packages/docs/content/docs/configuration-options.mdx
@@ -15,7 +15,7 @@ Alternatively, you can specify a custom config file using a link tag:
 
 If you prefer, you can use a javascript file (`admin/config.js`) instead of a yaml file. Simply import the javascript config and pass it into your `CMS.init({ config })` call.
 
-To see working configuration examples, you can [start from a template](/docs/start-with-a-template) or check out the [CMS demo site](https://demo-staticcms.org/). (No login required: click the login button and Static CMS will open.) You can refer to the demo [configuration code](https://github.com/StaticJsCMS/static-cms/blob/main/core/dev-test/config.yml) to see how each option was configured.
+To see working configuration examples, you can [start from a template](/docs/start-with-a-template) or check out the [CMS demo site](https://demo.staticcms.org/). (No login required: click the login button and Static CMS will open.) You can refer to the demo [configuration code](https://github.com/StaticJsCMS/static-cms/blob/main/core/dev-test/config.yml) to see how each option was configured.
 
 You can find details about all configuration options below. Note that [YAML syntax](https://en.wikipedia.org/wiki/YAML#Basic_components) allows lists and objects to be written in block or inline style, and the code samples below include a mix of both.
 
diff --git a/packages/docs/content/docs/test-backend.mdx b/packages/docs/content/docs/test-backend.mdx
@@ -6,7 +6,7 @@ weight: 60
 
 - **Name**: `gitlab`
 
-You can use the `test-repo` backend to try out Static CMS without connecting to a Git repo. With this backend, you can write and publish content normally, but any changes will disappear when you reload the page. This backend powers the Static CMS [demo site](https://demo-staticcms.org/).
+You can use the `test-repo` backend to try out Static CMS without connecting to a Git repo. With this backend, you can write and publish content normally, but any changes will disappear when you reload the page. This backend powers the Static CMS [demo site](https://demo.staticcms.org/).
 
 **Note:** The `test-repo` backend can't access your local file system, nor does it connect to a Git repo, thus you won't see any existing files while using it.
 
diff --git a/packages/docs/content/releases.json b/packages/docs/content/releases.json
@@ -1,5 +1,15 @@
 {
   "releases": [
+    {
+      "date": "2023-10-31T11:00:00.000Z",
+      "version": "v3.4.4",
+      "type": "patch"
+    },
+    {
+      "date": "2023-10-31T10:00:00.000Z",
+      "version": "v3.4.3",
+      "type": "patch"
+    },
     {
       "date": "2023-10-27T10:00:00.000Z",
       "version": "v3.4.2",
diff --git a/packages/tools/babel.config.js b/packages/tools/babel.config.js
@@ -56,12 +56,6 @@ function plugins() {
   if (isESM) {
     return [
       ...defaultPlugins,
-      [
-        'transform-define',
-        {
-          STATIC_CMS_CORE_VERSION: `${coreVersion}`,
-        },
-      ],
       [
         'inline-react-svg',
         {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "node_modules/lerna/schemas/lerna-schema.json",`
`3`		`- "version": "3.4.2"`
	`3`	`+ "version": "3.4.4"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`const path = require('path');`
`2`	`2`
`3`		`-const coreVersion = require('./package.json').version;`
	`3`	`+const appVersion = require('./package.json').version;`
`4`	`4`	`const isProduction = process.env.NODE_ENV === 'production';`
`5`	`5`	`const isTest = process.env.NODE_ENV === 'test';`
`6`	`6`	`const isESM = process.env.NODE_ENV === 'esm';`
`@@ -53,7 +53,7 @@ function plugins() {`
`53`	`53`	`[`
`54`	`54`	`'transform-define',`
`55`	`55`	`{`
`56`		- STATIC_CMS_CORE_VERSION: `${coreVersion}`,
	`56`	+ STATIC_CMS_APP_VERSION: `${appVersion}`,
`57`	`57`	`},`
`58`	`58`	`],`
`59`	`59`	`[`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@staticcms/core",`
`3`		`- "version": "3.4.2",`
	`3`	`+ "version": "3.4.4",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"description": "Static CMS core application.",`
`6`	`6`	`"repository": "https://github.com/StaticJsCMS/static-cms",`