Merge branch 'next' into shilman/first-load-new-user

Author: shilman

code/core/src/common/utils/validate-config.test.ts

@@ -1,7 +1,12 @@
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
+import { resolveModulePath } from 'exsolve';
+
 import { validateFrameworkName } from './validate-config';
 
+// mock exsolve to spy
+vi.mock('exsolve', { spy: true });
+
 describe('validateFrameworkName', () => {
   afterEach(() => {
     vi.resetAllMocks();
@@ -20,15 +25,20 @@ describe('validateFrameworkName', () => {
   });
 
   it('should not throw if framework is unknown (community) but can be resolved', () => {
-    // mock require.resolve to return a value
-    vi.spyOn(require, 'resolve').mockReturnValue('some-community-framework');
-    expect(() => validateFrameworkName('some-community-framework')).toThrow();
+    vi.mocked(resolveModulePath).mockImplementation(() => {});
+
+    expect(() => validateFrameworkName('some-community-framework')).not.toThrow();
+  });
+
+  it('should not throw if scoped framework is unknown (community) but can be resolved', () => {
+    vi.mocked(resolveModulePath).mockImplementation(() => {});
+
+    expect(() => validateFrameworkName('@some-community/framework')).not.toThrow();
   });
 
   it('should throw if framework is unknown and cannot be resolved', () => {
-    // mock require.resolve to fail
-    vi.spyOn(require, 'resolve').mockImplementation(() => {
-      throw new Error('Cannot resolve');
+    vi.mocked(resolveModulePath).mockImplementation(() => {
+      throw new Error('cannot resolve');
     });
 
     expect(() => validateFrameworkName('foo')).toThrow();

code/core/src/common/utils/validate-config.ts

@@ -1,5 +1,3 @@
-import { join } from 'node:path';
-
 import {
   CouldNotEvaluateFrameworkError,
   InvalidFrameworkNameError,
@@ -35,7 +33,7 @@ export function validateFrameworkName(
 
   // If it's not a known framework, we need to validate that it's a valid package at least
   try {
-    resolveModulePath(join(frameworkName, 'preset'), {
+    resolveModulePath(`${frameworkName}/preset`, {
       extensions: ['.mjs', '.js', '.cjs'],
       conditions: ['node', 'import', 'require'],
     });

docs/addons/addon-migration-guide.mdx

@@ -220,17 +220,20 @@ Next, update the `exports` field in your `package.json` to remove mentions of CJ
   },
 ```
 
-Update `tsconfig.json` to use `esnext` modules.
+Update `tsconfig.json`.
 
 ```diff title="tsconfig.json"
 {
   "compilerOptions": {
     // ...
--    "module": "preserve",
-+    "module": "esnext",
+-    "target": "es2023",
++    "target": "esnext",
     // ...
 -    "lib": ["es2023", "dom", "dom.iterable"],
 +    "lib": ["esnext", "dom", "dom.iterable"],
+    // ...
+-    "rootDir": "./src",
++    "rootDir": ".",
   },
 -  "include": ["src/**/*"]
 +  "include": ["src/**/*", "tsup.config.ts"]