Merge pull request #27474 from storybookjs/version-non-patch-from-8.2…

….0-alpha.4

Release: Prerelease 8.2.0-alpha.5

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 8.1.5
+
+- CSF-Tools: Fix export specifier bug - [#27418](https://github.com/storybookjs/storybook/pull/27418), thanks @valentinpalkovic!
+- Dependency: Upgrade tempy - [#27366](https://github.com/storybookjs/storybook/pull/27366), thanks @mnigh!
+- Tags: Refine composition behavior - [#27379](https://github.com/storybookjs/storybook/pull/27379), thanks @shilman!
+- Theming: Fix self-referencing type - [#27155](https://github.com/storybookjs/storybook/pull/27155), thanks @SimenB!
+
 ## 8.1.4
 
 - Angular: Revert style adjustments - [#27361](https://github.com/storybookjs/storybook/pull/27361), thanks @valentinpalkovic!

CHANGELOG.prerelease.md

@@ -1,3 +1,9 @@
+## 8.2.0-alpha.5
+
+- Angular: Fix wrong detection of standalone components - [#27353](https://github.com/storybookjs/storybook/pull/27353), thanks @dario-baumberger!
+- Dependency: Bump Express.js - [#26680](https://github.com/storybookjs/storybook/pull/26680), thanks @valentinpalkovic!
+- Tags: Fix unsafe project-level tags lookup - [#27511](https://github.com/storybookjs/storybook/pull/27511), thanks @shilman!
+
 ## 8.2.0-alpha.4
 
 - CSF-Tools: Fix export specifier bug - [#27418](https://github.com/storybookjs/storybook/pull/27418), thanks @valentinpalkovic!

code/builders/builder-manager/package.json

@@ -54,7 +54,7 @@
     "ejs": "^3.1.10",
     "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0",
     "esbuild-plugin-alias": "^0.2.1",
-    "express": "^4.17.3",
+    "express": "^4.19.2",
     "fs-extra": "^11.1.0",
     "process": "^0.11.10",
     "util": "^0.12.4"

code/builders/builder-vite/package.json

@@ -55,14 +55,14 @@
     "@types/find-cache-dir": "^3.2.1",
     "browser-assert": "^1.2.1",
     "es-module-lexer": "^1.5.0",
-    "express": "^4.17.3",
+    "express": "^4.19.2",
     "find-cache-dir": "^3.0.0",
     "fs-extra": "^11.1.0",
     "magic-string": "^0.30.0",
     "ts-dedent": "^2.0.0"
   },
   "devDependencies": {
-    "@types/express": "^4.17.13",
+    "@types/express": "^4.17.21",
     "@types/node": "^18.0.0",
     "glob": "^10.0.0",
     "slash": "^5.0.0",

code/builders/builder-webpack5/package.json

@@ -79,7 +79,7 @@
     "constants-browserify": "^1.0.0",
     "css-loader": "^6.7.1",
     "es-module-lexer": "^1.5.0",
-    "express": "^4.17.3",
+    "express": "^4.19.2",
     "fork-ts-checker-webpack-plugin": "^8.0.0",
     "fs-extra": "^11.1.0",
     "html-webpack-plugin": "^5.5.0",

code/frameworks/angular/src/client/angular-beta/utils/PropertyExtractor.test.ts

@@ -19,6 +19,11 @@ const TestComponent1 = Component({})(class {});
 const TestComponent2 = Component({})(class {});
 const StandaloneTestComponent = Component({ standalone: true })(class {});
 const StandaloneTestDirective = Directive({ standalone: true })(class {});
+const MixedTestComponent1 = Component({ standalone: true })(
+  class extends StandaloneTestComponent {}
+);
+const MixedTestComponent2 = Component({})(class extends MixedTestComponent1 {});
+const MixedTestComponent3 = Component({ standalone: true })(class extends MixedTestComponent2 {});
 const TestModuleWithDeclarations = NgModule({ declarations: [TestComponent1] })(class {});
 const TestModuleWithImportsAndProviders = NgModule({
   imports: [TestModuleWithDeclarations],
@@ -152,6 +157,21 @@ describe('PropertyExtractor', () => {
       const { isStandalone } = PropertyExtractor.analyzeDecorators(StandaloneTestComponent);
       expect(isStandalone).toBe(true);
     });
+
+    it('isStandalone should be true', () => {
+      const { isStandalone } = PropertyExtractor.analyzeDecorators(MixedTestComponent1);
+      expect(isStandalone).toBe(true);
+    });
+
+    it('isStandalone should be false', () => {
+      const { isStandalone } = PropertyExtractor.analyzeDecorators(MixedTestComponent2);
+      expect(isStandalone).toBe(false);
+    });
+
+    it('isStandalone should be true', () => {
+      const { isStandalone } = PropertyExtractor.analyzeDecorators(MixedTestComponent3);
+      expect(isStandalone).toBe(true);
+    });
   });
 
   describe('extractProviders', () => {

code/frameworks/angular/src/client/angular-beta/utils/PropertyExtractor.ts

@@ -175,7 +175,17 @@ export class PropertyExtractor implements NgModuleMetadata {
     const isPipe = decorators.some((d) => this.isDecoratorInstanceOf(d, 'Pipe'));
 
     const isDeclarable = isComponent || isDirective || isPipe;
-    const isStandalone = (isComponent || isDirective) && decorators.some((d) => d.standalone);
+
+    // Check if the hierarchically lowest Component or Directive decorator (the only relevant for importing dependencies) is standalone.
+    const isStandalone = !!(
+      (isComponent || isDirective) &&
+      [...decorators]
+        .reverse() // reflectionCapabilities returns decorators in a hierarchically top-down order
+        .find(
+          (d) =>
+            this.isDecoratorInstanceOf(d, 'Component') || this.isDecoratorInstanceOf(d, 'Directive')
+        )?.standalone
+    );
 
     return { isDeclarable, isStandalone };
   };

code/lib/core-server/package.json

@@ -84,7 +84,7 @@
     "compression": "^1.7.4",
     "detect-port": "^1.3.0",
     "diff": "^5.2.0",
-    "express": "^4.17.3",
+    "express": "^4.19.2",
     "fs-extra": "^11.1.0",
     "globby": "^14.0.1",
     "ip": "^2.0.1",

code/lib/core-server/src/utils/StoryIndexGenerator.ts

@@ -672,8 +672,24 @@ export class StoryIndexGenerator {
     const defaultTags = ['dev', 'test'];
     const extraTags = this.options.docs.autodocs === true ? [AUTODOCS_TAG] : [];
     if (previewCode) {
-      const projectAnnotations = loadConfig(previewCode).parse();
-      projectTags = projectAnnotations.getFieldValue(['tags']) ?? [];
+      try {
+        const projectAnnotations = loadConfig(previewCode).parse();
+        projectTags = projectAnnotations.getFieldValue(['tags']) ?? [];
+      } catch (err) {
+        once.warn(dedent`
+          Unable to parse tags from project configuration. If defined, tags should be specified inline, e.g.
+      
+          export default {
+            tags: ['foo'],
+          }
+      
+          ---
+      
+          Received:
+      
+          ${previewCode}
+        `);
+      }
     }
     return [...defaultTags, ...projectTags, ...extraTags];
   }

code/lib/types/package.json

@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@storybook/channels": "workspace:*",
-    "@types/express": "^4.7.0",
+    "@types/express": "^4.17.21",
     "file-system-cache": "2.3.0"
   },
   "devDependencies": {

code/package.json

@@ -178,7 +178,7 @@
     "@testing-library/jest-dom": "6.1.4",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
-    "@types/express": "^4.17.11",
+    "@types/express": "^4.17.21",
     "@types/fs-extra": "^11.0.1",
     "@types/lodash": "^4.14.167",
     "@types/mock-require": "^2.0.3",
@@ -298,5 +298,6 @@
         "Dependency Upgrades"
       ]
     ]
-  }
+  },
+  "deferredNextVersion": "8.2.0-alpha.5"
 }