@strapi/admin 4.3.0-beta.1 → 4.3.1

package/admin/src/translations/zh-Hans.json

@@ -3,6 +3,7 @@
   "Auth.components.Oops.text": "你的帐号已经被停用。",
   "Auth.components.Oops.text.admin": "如果这是个错误，请联系你的管理员。",
   "Auth.components.Oops.title": "哎呀...",
+  "Auth.form.active.label": "激活",
   "Auth.form.button.forgot-password": "发送电子邮件",
   "Auth.form.button.go-home": "回到首页",
   "Auth.form.button.login": "登录",
@@ -126,7 +127,12 @@
   "Settings.profile.form.section.experience.documentation": "文档",
   "Settings.profile.form.section.experience.interfaceLanguage": "界面语言",
   "Settings.profile.form.section.experience.interfaceLanguage.hint": "将会用所选择的语言显示你的界面",
-  "Settings.profile.form.section.experience.interfaceLanguageHelp": "当前的语言选择只会更改你当前帐号界面语言。 请参考此 {documentation} 为你的团队提供其他语言。",
+  "Settings.profile.form.section.experience.interfaceLanguageHelp": "当前的语言选择只会更改你当前帐号界面语言。 请参考此 {here} 为你的团队提供其他语言。",
+  "Settings.profile.form.section.experience.mode.label": "界面风格",
+  "Settings.profile.form.section.experience.mode.hint": "将会用所选择的风格显示你的界面",
+  "Settings.profile.form.section.experience.mode.option-label": "{name}界面",
+  "light": "浅色",
+  "dark": "深色",
   "Settings.profile.form.section.experience.title": "体验",
   "Settings.profile.form.section.helmet.title": "用户个人信息",
   "Settings.profile.form.section.profile.page.title": "个人信息页面",
@@ -196,7 +202,7 @@
   "anErrorOccurred": "唉呀! 出错了。请再试一次。",
   "app.component.CopyToClipboard.label": "复制到剪贴板",
   "app.component.search.label": "搜索 {target}",
-  "app.component.table.duplicate": "创建副本 {target}",
+  "app.component.table.duplicate": "创建 {target} 的副本",
   "app.component.table.edit": "编辑 {target}",
   "app.component.table.select.one-entry": "选择 {target}",
   "app.components.BlockLink.blog": "博客",
@@ -239,7 +245,11 @@
   "app.components.InstallPluginPage.description": "轻松地扩展你的应用程序。",
   "app.components.LeftMenu.collapse": "收起导航栏",
   "app.components.LeftMenu.expand": "展开导航栏",
+  "app.components.LeftMenu.general": "通用",
   "app.components.LeftMenu.logout": "退出",
+  "app.components.LeftMenu.plugins": "插件",
+  "app.components.LeftMenu.navbrand.title": "Strapi 仪表盘",
+  "app.components.LeftMenu.navbrand.workplace": "工作空间",
   "app.components.LeftMenuFooter.help": "帮助",
   "app.components.LeftMenuFooter.poweredBy": "由以下机构提供",
   "app.components.LeftMenuLinkContainer.collectionTypes": "集合类型",
@@ -338,6 +348,7 @@
   "components.FilterOptions.FILTER_TYPES.$lt": "小于",
   "components.FilterOptions.FILTER_TYPES.$lte": "小于或等于",
   "components.FilterOptions.FILTER_TYPES.$ne": "不等于",
+  "components.FilterOptions.FILTER_TYPES.$neq": "不等于",
   "components.FilterOptions.FILTER_TYPES.$notContains": "不包含 (区分大小写)",
   "components.FilterOptions.FILTER_TYPES.$notNull": "不为空",
   "components.FilterOptions.FILTER_TYPES.$null": "为空",
@@ -368,11 +379,11 @@
   "components.OverlayBlocker.description.serverError": "服务器已经重新启动，请在终端检查日志。",
   "components.OverlayBlocker.title": "等待重新启动...",
   "components.OverlayBlocker.title.serverError": "重新启动时间超过预期",
-  "components.PageFooter.select": "每页条目",
+  "components.PageFooter.select": "条每页",
   "components.ProductionBlocker.description": "为了安全起见，我们必须在其他环境下禁用这个插件。",
   "components.ProductionBlocker.header": "这个插件只在开发环境中可用。",
   "components.Search.placeholder": "搜索...",
-  "components.TableHeader.sort": "按 {label} 排序",
+  "components.TableHeader.sort": "按{label}排序",
   "components.Wysiwyg.ToggleMode.markdown-mode": "Markdown 模式",
   "components.Wysiwyg.ToggleMode.preview-mode": "预览模式",
   "components.Wysiwyg.collapse": "收起",
@@ -395,6 +406,8 @@
   "components.popUpWarning.button.confirm": "是, 确认",
   "components.popUpWarning.message": "你确定要删除这个吗？",
   "components.popUpWarning.title": "请确认",
+  "containers.SettingPage.add.relational-field": "插入另一个关系字段",
+  "containers.SettingPage.editSettings.description": "拖放字段来构建布局",
   "content-manager.App.schemas.data-loaded": "模式已经成功加载",
   "content-manager.DynamicTable.relation-loaded": "关联已经成功加载",
   "content-manager.EditRelations.title": "关联数据",
@@ -407,7 +420,7 @@
   "content-manager.components.DraggableCard.delete.field": "删除 {item}",
   "content-manager.components.DraggableCard.edit.field": "编辑 {item}",
   "content-manager.components.DraggableCard.move.field": "移动 {item}",
-  "content-manager.components.DynamicTable.row-line": "项 行 {number}",
+  "content-manager.components.DynamicTable.row-line": "第 {number} 条记录",
   "content-manager.components.DynamicZone.ComponentPicker-label": "选择一个组件",
   "content-manager.components.DynamicZone.add-component": "添加组件 {componentName}",
   "content-manager.components.DynamicZone.delete-label": "删除 {name}",
@@ -463,11 +476,11 @@
   "content-manager.containers.Edit.delete-entry": "删除该条目",
   "content-manager.containers.Edit.editing": "编辑中...",
   "content-manager.containers.Edit.information": "信息",
-  "content-manager.containers.Edit.information.by": "由",
-  "content-manager.containers.Edit.information.created": "已创建",
+  "content-manager.containers.Edit.information.by": "操作人",
+  "content-manager.containers.Edit.information.created": "创建于",
   "content-manager.containers.Edit.information.draftVersion": "草稿版本",
   "content-manager.containers.Edit.information.editing": "编辑中",
-  "content-manager.containers.Edit.information.lastUpdate": "最后更新",
+  "content-manager.containers.Edit.information.lastUpdate": "更新于",
   "content-manager.containers.Edit.information.publishedVersion": "已发布版本",
   "content-manager.containers.Edit.pluginHeader.title.new": "创建新条目",
   "content-manager.containers.Edit.reset": "重置",
@@ -583,13 +596,74 @@
   "content-manager.popUpwarning.warning.has-draft-relations.button-confirm": "是, 发布",
   "content-manager.popUpwarning.warning.has-draft-relations.message": "<b>{count, plural, =0 { 个关联的内容} one { 个关联的内容} other { 个关联的内容}}</b> 尚未发布。<br></br>它可能会在你的项目上产生关联失效和错误。",
   "content-manager.popover.display-relations.label": "显示关联",
+  "content-manager.select.currently.selected": "已选中 {count} 项",
   "content-manager.success.record.delete": "已删除",
   "content-manager.success.record.publish": "已发布",
   "content-manager.success.record.save": "已保存",
   "content-manager.success.record.unpublish": "已取消发布",
   "content-manager.utils.data-loaded": "这个 {number, plural, =1 {条目} other {条目}} 已成功加载",
+  "content-type-builder.button.component.create": "创建一个新的组件",
+  "content-type-builder.button.model.create": "创建一个新的集合类型",
+  "content-type-builder.button.single-types.create": "创新一个新的单一类型",
+  "content-type-builder.form.button.add.field.to.collectionType": "为这个集合类型添加另一个字段",
+  "content-type-builder.form.button.add.field.to.singleType": "为这个单一类型添加另一个字段",
+  "content-type-builder.listView.headerLayout.description": "定义内容的数据结构",
+  "content-type-builder.menu.section.components.name": "组件",
+  "content-type-builder.menu.section.models.name": "集合类型",
+  "content-type-builder.menu.section.single-types.name": "单一类型",
+  "content-type-builder.plugin.name": "模型构建器",
   "form.button.done": "完成",
+  "global.search": "搜索",
+  "global.active": "已激活",
+  "global.inactive": "未激活",
+  "global.back": "返回",
+  "global.cancel": "取消",
+  "global.change-password": "修改密码",
+  "global.content-manager": "内容管理",
+  "global.delete": "删除",
+  "global.delete-target": "删除 {target}",
+  "global.description": "描述",
+  "global.details": "详情",
+  "global.documentation": "文档",
+  "global.finish": "完成",
+  "global.marketplace": "市场",
+  "global.name": "名称",
+  "global.password": "密码",
+  "global.plugins": "插件",
+  "global.plugins.content-manager": "内容管理",
+  "global.plugins.content-manager.description": "在你的数据库里，快速的查看、编辑和删除数据。",
+  "global.plugins.content-type-builder": "模型构建器",
+  "global.plugins.content-type-builder.description": "对你的 API 数据结构进行建模。在短短的一分钟内创建新的字段和关系。这些文件会在你的项目中自动创建和更新。",
+  "global.plugins.email": "电子邮件",
+  "global.plugins.email.description": "配置你的应用程序来发送电子邮件。",
+  "global.plugins.upload": "媒体库",
+  "global.plugins.upload.description": "媒体文件管理。",
+  "global.plugins.graphql": "GraphQL",
+  "global.plugins.graphql.description": "添加具有默认 API 方法的 GraphQL 端点",
+  "global.plugins.documentation": "文档",
+  "global.plugins.documentation.description": "创建一个 OpenAPI 文档，用 SWAGGER UI 来可视化你的 API。",
+  "global.plugins.i18n": "国际化",
+  "global.plugins.i18n.description": "这个插件可以从管理面板和 API 中创建、阅读和更新不同语言的内容。",
+  "global.plugins.sentry": "Sentry",
+  "global.plugins.sentry.description": "将 Strapi 错误事件发送给 Sentry。",
+  "global.plugins.users-permissions": "角色和权限",
+  "global.plugins.users-permissions.description": "用一个基于 JWT 的完整认证过程来保护你的 API。这个插件还带有一个 ACL 策略，允许你管理用户组之间的权限。",
+  "global.profile": "个人资料",
   "global.prompt.unsaved": "您确定要离开这个页面吗？您所有的未保存的修改都将丢失",
+  "global.roles": "角色列表",
+  "global.save": "保存",
+  "global.settings": "设置",
+  "global.strapi-super-admin": "超级管理员",
+  "global.strapi-editor": "编辑",
+  "global.strapi-author": "作者",
+  "global.table.header.email": "电子邮件",
+  "global.table.header.firstname": "名字",
+  "global.table.header.isActive": "是否激活",
+  "global.table.header.lastname": "姓氏",
+  "global.table.header.roles": "用户角色",
+  "global.table.header.username": "用户名",
+  "global.users": "用户列表",
+  "global.type": "类型",
   "notification.contentType.relations.conflict": "内容类型有关联冲突",
   "notification.default.title": "通知：",
   "notification.error": "发生错误",
@@ -607,4 +681,4 @@
   "request.error.model.unknown": "模型不存在",
   "skipToContent": "跳至内容",
   "submit": "提交"
-}
+}

package/ee/admin/pages/SettingsPage/pages/Roles/CreatePage/index.js

@@ -1,5 +1,5 @@
 import React, { useRef, useState } from 'react';
-import moment from 'moment';
+import { format } from 'date-fns';
 import {
   CheckPagePermissions,
   Form,
@@ -40,7 +40,7 @@ const UsersRoleNumber = styled.div`
   color: ${({ theme }) => theme.colors.primary600};
   border-radius: ${({ theme }) => theme.borderRadius};
   font-size: ${12 / 16}rem;
-  font-width: bold;
+  font-weight: bold;
 `;
 
 const CreatePage = () => {
@@ -114,7 +114,7 @@ const CreatePage = () => {
   const defaultDescription = `${formatMessage({
     id: 'Settings.roles.form.created',
     defaultMessage: 'Created',
-  })} ${moment().format('LL')}`;
+  })} ${format(new Date(), 'PPP')}`;
 
   return (
     <Main>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.3.0-beta.1",
+  "version": "4.3.1",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -41,33 +41,34 @@
     "@babel/plugin-transform-runtime": "7.16.7",
     "@babel/polyfill": "7.12.1",
     "@babel/preset-env": "7.16.7",
-    "@babel/preset-react": "7.16.7",
+    "@babel/preset-react": "7.18.6",
     "@babel/runtime": "7.16.7",
     "@casl/ability": "^5.4.3",
-    "@fingerprintjs/fingerprintjs": "3.3.2",
+    "@fingerprintjs/fingerprintjs": "3.3.3",
     "@fortawesome/fontawesome-free": "^5.15.3",
     "@fortawesome/fontawesome-svg-core": "^1.2.35",
     "@fortawesome/free-brands-svg-icons": "^5.15.3",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
-    "@fortawesome/react-fontawesome": "^0.1.14",
-    "@strapi/babel-plugin-switch-ee-ce": "4.3.0-beta.1",
-    "@strapi/design-system": "1.1.1",
-    "@strapi/helper-plugin": "4.3.0-beta.1",
-    "@strapi/icons": "1.1.1",
-    "@strapi/typescript-utils": "4.3.0-beta.1",
-    "@strapi/utils": "4.3.0-beta.1",
+    "@fortawesome/react-fontawesome": "^0.2.0",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.7",
+    "@strapi/babel-plugin-switch-ee-ce": "4.3.1",
+    "@strapi/design-system": "1.2.0",
+    "@strapi/helper-plugin": "4.3.1",
+    "@strapi/icons": "1.2.0",
+    "@strapi/typescript-utils": "4.3.1",
+    "@strapi/utils": "4.3.1",
     "axios": "0.24.0",
-    "babel-loader": "8.2.3",
+    "babel-loader": "8.2.5",
     "babel-plugin-styled-components": "2.0.2",
     "bcryptjs": "2.4.3",
     "chalk": "^4.1.1",
     "chokidar": "^3.5.1",
-    "codemirror": "^5.61.0",
+    "codemirror": "^5.65.6",
     "cross-env": "^7.0.3",
-    "css-loader": "6.5.1",
-    "date-fns": "2.22.1",
+    "css-loader": "6.7.1",
+    "date-fns": "2.28.0",
     "dotenv": "8.5.1",
-    "esbuild-loader": "2.18.0",
+    "esbuild-loader": "^2.19.0",
     "execa": "^1.0.0",
     "fast-deep-equal": "3.1.3",
     "font-awesome": "^4.7.0",
@@ -77,14 +78,14 @@
     "highlight.js": "^10.4.1",
     "history": "^4.9.0",
     "hoist-non-react-statics": "^3.3.0",
-    "html-loader": "3.0.1",
+    "html-loader": "3.1.2",
     "html-webpack-plugin": "5.5.0",
-    "immer": "9.0.6",
+    "immer": "9.0.15",
     "invariant": "^2.2.4",
     "js-cookie": "2.2.1",
     "jsonwebtoken": "8.5.1",
     "koa-compose": "4.1.0",
-    "koa-passport": "4.1.4",
+    "koa-passport": "5.0.0",
     "koa-static": "5.0.0",
     "lodash": "4.17.21",
     "markdown-it": "^12.3.2",
@@ -99,14 +100,13 @@
     "markdown-it-sup": "1.0.0",
     "match-sorter": "^4.0.2",
     "mini-css-extract-plugin": "2.4.4",
-    "moment": "^2.29.1",
     "node-polyfill-webpack-plugin": "1.1.4",
     "p-map": "4.0.0",
     "passport-local": "1.0.0",
     "prop-types": "^15.7.2",
     "qs": "6.10.1",
     "react": "^17.0.2",
-    "react-copy-to-clipboard": "^5.0.3",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-dnd": "^14.0.2",
     "react-dnd-html5-backend": "^14.0.0",
     "react-dom": "^17.0.2",
@@ -115,35 +115,44 @@
     "react-helmet": "^6.1.0",
     "react-intl": "5.20.2",
     "react-query": "3.24.3",
-    "react-redux": "7.2.3",
+    "react-redux": "7.2.8",
+    "react-refresh": "0.11.0",
     "react-router": "5.2.0",
     "react-router-dom": "5.2.0",
-    "react-select": "^4.0.2",
-    "react-virtualized": "^9.22.3",
+    "react-window": "1.8.7",
     "redux": "^4.0.1",
     "redux-saga": "^0.16.0",
     "reselect": "^4.0.0",
     "rimraf": "3.0.2",
-    "sanitize-html": "2.4.0",
-    "semver": "7.3.5",
-    "sift": "13.5.0",
+    "sanitize-html": "2.7.0",
+    "semver": "7.3.7",
+    "sift": "13.5.4",
     "style-loader": "3.3.1",
     "styled-components": "5.3.3",
-    "webpack": "5.65.0",
-    "webpack-cli": "4.9.1",
-    "webpack-dev-server": "4.7.3",
-    "webpackbar": "5.0.0-3",
+    "webpack": "^5.73.0",
+    "webpack-cli": "^4.10.0",
+    "webpack-dev-server": "^4.9.3",
+    "webpackbar": "^5.0.2",
     "yup": "^0.32.9"
   },
   "devDependencies": {
-    "duplicate-dependencies-webpack-plugin": "0.2.0",
+    "duplicate-dependencies-webpack-plugin": "^1.0.2",
     "glob": "8.0.3",
     "speed-measure-webpack-plugin": "1.5.0",
-    "webpack-bundle-analyzer": "4.4.1"
+    "webpack-bundle-analyzer": "^4.5.0"
   },
   "engines": {
     "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "9d6555398960c39159d66bb4eea3bcb0362e37e3"
+  "nx": {
+    "targets": {
+      "build": {
+        "outputs": [
+          "./build"
+        ]
+      }
+    }
+  },
+  "gitHead": "1eab2fb08c7a4d3d40a5a7ff3b2f137ce0afcf8a"
 }

package/server/controllers/admin.js

@@ -106,6 +106,7 @@ module.exports = {
     const currentEnvironment = strapi.config.get('environment');
     const autoReload = strapi.config.get('autoReload', false);
     const strapiVersion = strapi.config.get('info.strapi', null);
+    const dependencies = strapi.config.get('info.dependencies', {});
     const nodeVersion = process.version;
     const communityEdition = !strapi.EE;
     const useYarn = await exists(path.join(process.cwd(), 'yarn.lock'));
@@ -115,6 +116,7 @@ module.exports = {
         currentEnvironment,
         autoReload,
         strapiVersion,
+        dependencies,
         nodeVersion,
         communityEdition,
         useYarn,

package/webpack.alias.js

@@ -2,18 +2,18 @@
 
 const path = require('path');
 
-const alias = [
-  'object-assign',
-  'whatwg-fetch',
+const aliasExactMatch = [
+  '@strapi/design-system',
+  '@strapi/helper-plugin',
+  '@strapi/icons',
   '@fortawesome/fontawesome-svg-core',
   '@fortawesome/free-solid-svg-icons',
+  'date-fns',
+  'formik',
   'history',
-  'hoist-non-react-statics',
   'immer',
-  'invariant',
-  'lodash',
-  'moment',
   'qs',
+  'lodash',
   'react',
   'react-copy-to-clipboard',
   'react-dnd',
@@ -24,28 +24,38 @@ const alias = [
   'react-helmet',
   'react-is',
   'react-intl',
+  'react-query',
   'react-redux',
   'react-router',
   'react-router-dom',
-  'react-virtualized',
+  'react-window',
   'react-select',
   'redux',
   'reselect',
   'styled-components',
+  'whatwg-fetch',
   'yup',
 ];
 
-module.exports = alias.reduce(
-  (acc, curr) => {
-    acc[`${curr}$`] = require.resolve(curr);
+const alias = [
+  'react-select/animated',
+  'react-select/async',
+  'react-select/async-creatable',
+  'react-select/base',
+  'react-select/creatable',
+];
+
+// See https://webpack.js.org/configuration/resolve/
+module.exports = {
+  ...alias.reduce((acc, name) => {
+    acc[name] = require.resolve(name);
     return acc;
-  },
-  {
-    'react-select/animated': require.resolve('react-select/animated'),
-    'react-select/async': require.resolve('react-select/async'),
-    'react-select/async-creatable': require.resolve('react-select/async-creatable'),
-    'react-select/base': require.resolve('react-select/base'),
-    'react-select/creatable': require.resolve('react-select/creatable'),
-    ee_else_ce: path.resolve(__dirname),
-  }
-);
+  }, {}),
+
+  ...aliasExactMatch.reduce((acc, name) => {
+    acc[`${name}$`] = require.resolve(name);
+    return acc;
+  }, {}),
+
+  ee_else_ce: path.resolve(__dirname),
+};

package/webpack.config.js

@@ -9,6 +9,8 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { ESBuildMinifyPlugin } = require('esbuild-loader');
 const WebpackBar = require('webpackbar');
 const NodePolyfillPlugin = require('node-polyfill-webpack-plugin');
+const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
+
 const alias = require('./webpack.alias');
 const getClientEnvironment = require('./env');
 
@@ -38,10 +40,6 @@ module.exports = ({
 
   const webpackPlugins = isProduction
     ? [
-        new webpack.IgnorePlugin({
-          resourceRegExp: /^\.\/locale$/,
-          contextRegExp: /moment$/,
-        }),
         new MiniCssExtractPlugin({
           filename: '[name].[chunkhash].css',
           chunkFilename: '[name].[chunkhash].chunkhash.css',
@@ -59,7 +57,7 @@ module.exports = ({
   return {
     mode: isProduction ? 'production' : 'development',
     bail: isProduction ? true : false,
-    devtool: false,
+    devtool: isProduction ? false : 'eval-source-map',
     experiments: {
       topLevelAwait: true,
     },
@@ -80,6 +78,7 @@ module.exports = ({
           css: true, // Apply minification to CSS assets
         }),
       ],
+      moduleIds: 'deterministic',
       runtimeChunk: true,
     },
     module: {
@@ -227,7 +226,10 @@ module.exports = ({
           configFile: tsConfigFilePath,
         },
       }),
+
+      !isProduction && process.env.REACT_REFRESH !== 'false' && new ReactRefreshWebpackPlugin(),
+
       ...webpackPlugins,
-    ],
+    ].filter(Boolean),
   };
 };

package/admin/src/pages/MarketplacePage/utils/api.js

@@ -1,9 +0,0 @@
-import { axiosInstance } from '../../../core/utils';
-
-const fetchAppInformation = async () => {
-  const { data } = await axiosInstance.get('/admin/information');
-
-  return data;
-};
-
-export { fetchAppInformation };