@strapi/admin 4.0.0 → 4.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -26,8 +26,14 @@
     "create:plugin-file": "node ./scripts/create-dev-plugins-file.js",
     "develop": "yarn create:plugin-file && yarn develop:webpack",
     "develop:webpack": "cross-env NODE_ENV=development webpack serve --config webpack.config.dev.js --progress profile",
-    "prepublishOnly": "rimraf build && node ./scripts/build.js",
-    "test": "echo \"no tests yet\""
+    "prepublishOnly": "yarn build",
+    "build": "rimraf build && node ./scripts/build.js",
+    "test": "echo \"no tests yet\"",
+    "test:unit": "jest --verbose",
+    "test:front": "cross-env IS_EE=true jest --config ./jest.config.front.js",
+    "test:front:watch": "cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll",
+    "test:front:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js",
+    "test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll"
   },
   "dependencies": {
     "@babel/core": "7.14.0",
@@ -46,11 +52,11 @@
     "@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.0.0",
+    "@strapi/babel-plugin-switch-ee-ce": "4.0.1",
     "@strapi/design-system": "0.0.1-alpha.70",
-    "@strapi/helper-plugin": "4.0.0",
+    "@strapi/helper-plugin": "4.0.1",
     "@strapi/icons": "0.0.1-alpha.70",
-    "@strapi/utils": "4.0.0",
+    "@strapi/utils": "4.0.1",
     "axios": "0.24.0",
     "babel-loader": "8.2.2",
     "babel-plugin-styled-components": "1.12.0",
@@ -65,7 +71,6 @@
     "dotenv": "8.5.1",
     "execa": "^1.0.0",
     "fast-deep-equal": "3.1.3",
-    "file-loader": "6.2.0",
     "font-awesome": "^4.7.0",
     "formik": "^2.2.6",
     "fs-extra": "^9.1.0",
@@ -82,6 +87,7 @@
     "jsonwebtoken": "8.5.1",
     "koa-compose": "4.1.0",
     "koa-passport": "4.1.4",
+    "koa-static": "5.0.0",
     "lodash": "4.17.21",
     "markdown-it": "^12.0.6",
     "markdown-it-abbr": "^1.0.4",
@@ -131,10 +137,9 @@
     "style-loader": "2.0.0",
     "styled-components": "^5.2.3",
     "terser-webpack-plugin": "4.2.3",
-    "url-loader": "4.1.1",
     "webpack": "5.36.2",
-    "webpack-cli": "4.6.0",
-    "webpack-dev-server": "4.4.0",
+    "webpack-cli": "4.9.1",
+    "webpack-dev-server": "4.5.0",
     "webpackbar": "5.0.0-3",
     "yup": "^0.32.9"
   },
@@ -146,5 +151,5 @@
     "node": ">=12.x.x <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "b181702f0202b2c6d645d42b195a831f25cd0b03"
+  "gitHead": "e2cd01e8c6cbfeba15ad7787e38b6eebcbb92221"
 }

package/server/register.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const registerAdminPanelRoute = require('./routes/serve-admin-panel');
 const adminAuthStrategy = require('./strategies/admin');
 const apiTokenAuthStrategy = require('./strategies/api-token');
 
@@ -9,4 +10,8 @@ module.exports = ({ strapi }) => {
   strapi.server.api('admin').use(passportMiddleware);
   strapi.container.get('auth').register('admin', adminAuthStrategy);
   strapi.container.get('auth').register('content-api', apiTokenAuthStrategy);
+
+  if (strapi.config.serveAdminPanel) {
+    registerAdminPanelRoute({ strapi });
+  }
 };

package/server/routes/serve-admin-panel.js

@@ -0,0 +1,59 @@
+'use strict';
+
+const path = require('path');
+const fse = require('fs-extra');
+const koaStatic = require('koa-static');
+
+const registerAdminPanelRoute = ({ strapi }) => {
+  let buildDir = path.resolve(strapi.dirs.root, 'build');
+
+  if (!fse.pathExistsSync(buildDir)) {
+    buildDir = path.resolve(__dirname, '../../build');
+  }
+
+  const serveAdminMiddleware = async (ctx, next) => {
+    await next();
+
+    if (ctx.method !== 'HEAD' && ctx.method !== 'GET') {
+      return;
+    }
+
+    if (ctx.body != null || ctx.status !== 404) {
+      return;
+    }
+
+    ctx.type = 'html';
+    ctx.body = fse.createReadStream(path.join(buildDir + '/index.html'));
+  };
+
+  strapi.server.routes([
+    {
+      method: 'GET',
+      path: `${strapi.config.admin.path}/:path*`,
+      handler: [
+        serveAdminMiddleware,
+        serveStatic(buildDir, { maxage: 60000, defer: false, index: 'index.html' }),
+      ],
+      config: { auth: false },
+    },
+  ]);
+};
+
+// serveStatic is not supposed to be used to serve a folder that have sub-folders
+const serveStatic = (filesDir, koaStaticOptions = {}) => {
+  const serve = koaStatic(filesDir, koaStaticOptions);
+
+  return async (ctx, next) => {
+    const prev = ctx.path;
+    const newPath = path.basename(ctx.path);
+    ctx.path = newPath;
+    await serve(ctx, async () => {
+      ctx.path = prev;
+      await next();
+      ctx.path = newPath;
+    });
+    ctx.path = prev;
+  };
+};
+
+module.exports = registerAdminPanelRoute;

package/server/strategies/api-token.js

@@ -60,7 +60,8 @@ const verify = (auth, config) => {
    * scopes. If the route has no scope, then you can't get access to it.
    */
 
-  if (config.scope && config.scope.every(isReadScope)) {
+  const scopes = Array.isArray(config.scope) ? config.scope : [config.scope];
+  if (config.scope && scopes.every(isReadScope)) {
     return;
   }
 

package/webpack.config.js

@@ -144,13 +144,15 @@ module.exports = ({
         },
         {
           test: /\.(svg|eot|otf|ttf|woff|woff2)$/,
-          use: 'file-loader',
+          type: 'asset/resource',
         },
         {
           test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/, /\.ico$/],
-          loader: require.resolve('url-loader'),
-          options: {
-            limit: 1000,
+          type: 'asset',
+          parser: {
+            dataUrlCondition: {
+              maxSize: 1000,
+            },
           },
         },
         {
@@ -160,9 +162,11 @@ module.exports = ({
         },
         {
           test: /\.(mp4|webm)$/,
-          loader: require.resolve('url-loader'),
-          options: {
-            limit: 10000,
+          type: 'asset',
+          parser: {
+            dataUrlCondition: {
+              maxSize: 10000,
+            },
           },
         },
       ],