Merge branch 'next' into copilot/add-mdx-support-manifest

Author: JReinhold

.circleci/config.yml

@@ -193,7 +193,7 @@ jobs:
                 template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task bench)
     build:
         executor:
-            class: large
+            class: xlarge
             name: sb_node_22_classic
         steps:
             - git-shallow-clone/checkout_advanced:
@@ -240,7 +240,7 @@ jobs:
                 root: /tmp
     check:
         executor:
-            class: large
+            class: xlarge
             name: sb_node_22_classic
         steps:
             - git-shallow-clone/checkout_advanced:
@@ -299,6 +299,10 @@ jobs:
             - checkout
             - attach_workspace:
                 at: /tmp
+            - run:
+                command: yarn storybook:ui:build
+                name: Build Storybook
+                working_directory: code
             - run:
                 command: yarn storybook:ui:chromatic
                 name: Running Chromatic

.circleci/src/jobs/build.yml

@@ -1,5 +1,5 @@
 executor:
-  class: large
+  class: xlarge
   name: sb_node_22_classic
 
 steps:

.circleci/src/jobs/check.yml

@@ -1,5 +1,5 @@
 executor:
-  class: large
+  class: xlarge
   name: sb_node_22_classic
 
 steps:

.circleci/src/jobs/chromatic-internal-storybook.yml

@@ -10,6 +10,10 @@ steps:
   - checkout
   - attach_workspace:
       at: /tmp
+  - run:
+      name: Build Storybook
+      command: yarn storybook:ui:build
+      working_directory: code
   - run:
       name: Running Chromatic
       command: yarn storybook:ui:chromatic

.vscode/settings.json

@@ -49,7 +49,7 @@
   "typescript.preferences.preferTypeOnlyAutoImports": true,
   "typescript.preferences.quoteStyle": "single",
   "typescript.preferGoToSourceDefinition": true,
-  "typescript.tsdk": "./code/node_modules/typescript/lib",
+  "typescript.tsdk": "./typescript/lib",
   "vitest.workspaceConfig": "./code/vitest.workspace.ts",
   "vitest.rootConfig": "./code/vitest.workspace.ts",
 }

code/.eslintrc.js

@@ -14,14 +14,14 @@ module.exports = {
     project: ['./tsconfig.json'],
   },
   rules: {
-    'import/no-extraneous-dependencies': 'off',
+    'import-x/no-extraneous-dependencies': 'off',
     'react/react-in-jsx-scope': 'off',
-    'import/no-unresolved': 'off', // covered by typescript
+    'import-x/no-unresolved': 'off', // covered by typescript
     'eslint-comments/disable-enable-pair': ['error', { allowWholeFile: true }],
     'eslint-comments/no-unused-disable': 'error',
     'react-hooks/rules-of-hooks': 'off',
     'jsx-a11y/no-autofocus': 'warn',
-    'import/extensions': 'off', // for mjs, we sometimes need extensions
+    'import-x/extensions': 'off', // for mjs, we sometimes need extensions
     'jsx-a11y/control-has-associated-label': 'off',
     '@typescript-eslint/dot-notation': [
       'error',
@@ -156,14 +156,14 @@ module.exports = {
         'no-dupe-class-members': 'off', // this is called overloads in typescript
         'react/no-unused-prop-types': 'off', // we should use types
         'react/default-props-match-prop-types': 'off', // we should use types
-        'import/no-named-as-default': 'warn',
-        'import/no-named-as-default-member': 'warn',
+        'import-x/no-named-as-default': 'warn',
+        'import-x/no-named-as-default-member': 'warn',
         'react/destructuring-assignment': 'warn',
 
         // This warns about importing interfaces and types in a normal import, it's arguably better to import with the `type` prefix separate from the runtime imports,
         // I leave this as a warning right now because we haven't really decided yet, and the codebase is riddled with errors if I set to 'error'.
         // It IS set to 'error' for JS files.
-        'import/named': 'warn',
+        'import-x/named': 'warn',
       },
     },
     {

code/.storybook/bench/bench.stories.tsx

@@ -5,7 +5,7 @@ import type { Meta } from '@storybook/react-vite';
 import { safeMetafileArg } from '../../../scripts/bench/safe-args';
 
 // @ts-expect-error - TS doesn't know about import.meta.glob from Vite
-const allMetafiles = import.meta.glob(['../../bench/esbuild-metafiles/**/*.json'], {
+const allMetafiles = import.meta.glob('../../bench/esbuild-metafiles/**/*.json', {
   import: 'default',
 });
 

code/.storybook/main.ts

@@ -12,6 +12,8 @@ const currentDirPath = dirname(currentFilePath);
 
 const componentsPath = join(currentDirPath, '../core/src/components/index.ts');
 const managerApiPath = join(currentDirPath, '../core/src/manager-api/index.mock.ts');
+const themingCreatePath = join(currentDirPath, '../core/src/theming/create.ts');
+const themingPath = join(currentDirPath, '../core/src/theming/index.ts');
 const imageContextPath = join(currentDirPath, '../frameworks/nextjs/src/image-context.ts');
 
 const config = defineMain({
@@ -154,6 +156,8 @@ const config = defineMain({
             ? {
                 'storybook/internal/components': componentsPath,
                 'storybook/manager-api': managerApiPath,
+                'storybook/theming/create': themingCreatePath,
+                'storybook/theming': themingPath,
                 'sb-original/image-context': imageContextPath,
               }
             : {

code/__mocks__/inject-decorator.ts.ugly-comments-stories.txt

@@ -1,4 +1,4 @@
-/* eslint-disable global-require, import/no-dynamic-require */
+/* eslint-disable global-require, import-x/no-dynamic-require */
 
 import React from 'react';
 

code/__mocks__/inject-decorator.ugly-comments-stories.txt

@@ -1,4 +1,4 @@
-/* eslint-disable global-require, import/no-dynamic-require */
+/* eslint-disable global-require, import-x/no-dynamic-require */
 
 import React from 'react';