Merge branch 'next' into tech/upgrades-4

# Conflicts:
#	yarn.lock

app/react/package.json

@@ -51,7 +51,6 @@
     "@storybook/core": "6.1.6",
     "@storybook/node-logger": "6.1.6",
     "@storybook/semver": "^7.3.2",
-    "@svgr/webpack": "^5.4.0",
     "@types/webpack-env": "^1.15.3",
     "babel-plugin-add-react-displayname": "^0.0.5",
     "babel-plugin-named-asset-import": "^0.3.1",

docs/workflows/faq.md

@@ -115,10 +115,6 @@ For now the addons you're using in a composed Storybook will not work.
 
 We're working on overcoming this limitation, soon you'll be able to use them  as if you working with a non composed Storybook.
 
-### Why i'm getting errors with react-popper and Storybook?
-
-If you're using the `react-popper` in your own project and you're experiencing issues with Storybook. You can solve them by adding the `--no-dll` command line flag. Take a look at the [cli options page](../api/cli-options.md) to see how you can use the flag in your project.
-
 ### Which community addons are compatible with the latest version of Storybook?
 
 Starting with Storybook version 6.0 we've introduced some great features aimed at streamlining your development workflow.

lib/core/src/server/build-dev.ts

@@ -153,8 +153,8 @@ function outputStartupInformation(options: {
   version: string;
   address: string;
   networkAddress: string;
-  managerTotalTime: [number, number];
-  previewTotalTime: [number, number];
+  managerTotalTime?: [number, number];
+  previewTotalTime?: [number, number];
 }) {
   const {
     updateInfo,
@@ -283,10 +283,9 @@ export async function buildDevStandalone(
 
     if (options.smokeTest) {
       await outputStats(previewStats, managerStats);
-      const managerWarnings = (managerStats as any).toJson().warnings.length > 0;
-      const previewWarnings =
-        !options.ignorePreview && (previewStats as any).toJson().warnings.length > 0;
-      process.exit(managerWarnings || previewWarnings ? 1 : 0);
+      const hasManagerWarnings = managerStats && managerStats.toJson().warnings.length > 0;
+      const hasPreviewWarnings = previewStats && previewStats.toJson().warnings.length > 0;
+      process.exit(hasManagerWarnings || (hasPreviewWarnings && !options.ignorePreview) ? 1 : 0);
       return;
     }
 

lib/core/src/server/dev-server.ts

@@ -258,7 +258,7 @@ const startManager = async ({
   }
 
   if (!managerConfig) {
-    return { managerStats: null, managerTotalTime: [0, 0] } as ManagerResult;
+    return {};
   }
 
   const compiler = webpack(managerConfig);
@@ -281,10 +281,11 @@ const startManager = async ({
     next();
   });
 
-  router.post('/runtime-error', (request, response) => {
+  // Used to report back any client-side (runtime) errors
+  router.post('/runtime-error', express.json(), (request, response) => {
     if (request.body?.error) {
       logger.error('Runtime error! Check your browser console.');
-      logger.error(request.body.error.stack || request.body.message);
+      logger.error(request.body.error.stack || request.body.message || request.body);
       if (request.body.origin === 'manager') clearManagerCache(options.cache);
     }
     response.sendStatus(200);
@@ -311,7 +312,7 @@ const startPreview = async ({
   outputDir,
 }: any): Promise<PreviewResult> => {
   if (options.ignorePreview) {
-    return { previewStats: null, previewTotalTime: [0, 0] } as PreviewResult;
+    return {};
   }
 
   const previewConfig = await loadConfig({
@@ -373,9 +374,6 @@ export async function storybookDevServer(options: any) {
     options.extendServer(server);
   }
 
-  // Used to report back any client-side (runtime) errors
-  app.use(express.json());
-
   app.use((req, res, next) => {
     res.header('Access-Control-Allow-Origin', '*');
     res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');

lib/core/src/server/types.ts

@@ -94,13 +94,13 @@ export interface ReleaseNotesData {
 }
 
 export interface PreviewResult {
-  previewStats: Stats;
-  previewTotalTime: [number, number];
+  previewStats?: Stats;
+  previewTotalTime?: [number, number];
 }
 
 export interface ManagerResult {
-  managerStats: Stats;
-  managerTotalTime: [number, number];
+  managerStats?: Stats;
+  managerTotalTime?: [number, number];
 }
 
 // TODO: this is a generic interface that we can share across multiple SB packages (like @storybook/cli)