@grafana/create-plugin 6.2.0-canary.2283.19173715977.0 → 6.2.0-canary.2283.19225164741.0

package/dist/migrations/migrations.js

@@ -24,7 +24,7 @@ var defaultMigrations = {
     },
     "005-react-18-3": {
       version: "6.1.7-beta.1",
-      description: "Update React 18.0.0 to 18.3.1.",
+      description: "Update React and ReactDOM 18.x versions to ^18.3.0 to surface React 19 compatibility issues.",
       migrationScript: "./scripts/005-react-18-3.js"
     }
   }

package/dist/migrations/scripts/005-react-18-3.js

@@ -5,12 +5,12 @@ function migrate(context) {
     const packageJson = JSON.parse(context.getFile("package.json") || "{}");
     if (packageJson.dependencies?.react) {
       if (isVersionGreater(packageJson.dependencies.react, "18.0.0", true)) {
-        addDependenciesToPackageJson(context, { react: "^18.3.1" }, { "@types/react": "^18.3.1" });
+        addDependenciesToPackageJson(context, { react: "^18.3.0" }, { "@types/react": "^18.3.0" });
       }
     }
     if (packageJson.dependencies?.["react-dom"]) {
       if (isVersionGreater(packageJson.dependencies["react-dom"], "18.0.0", true)) {
-        addDependenciesToPackageJson(context, { "react-dom": "^18.3.1" }, { "@types/react-dom": "^18.3.1" });
+        addDependenciesToPackageJson(context, { "react-dom": "^18.3.0" }, { "@types/react-dom": "^18.3.0" });
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/create-plugin",
-  "version": "6.2.0-canary.2283.19173715977.0",
+  "version": "6.2.0-canary.2283.19225164741.0",
   "repository": {
     "directory": "packages/create-plugin",
     "url": "https://github.com/grafana/plugin-tools"
@@ -59,5 +59,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "d05bd68a9727b078ce0c15029a1dbc86644714d3"
+  "gitHead": "2771e041152fce899b6ecbbf3a37dce085a4a563"
 }

package/src/migrations/manager.test.ts

@@ -117,14 +117,14 @@ describe('Migrations', () => {
       const mockContext = new Context('/virtual');
       const migrationFn = vi.fn().mockResolvedValue(mockContext);
 
-      vi.doMock('./test-migration.js', () => ({
+      vi.doMock('virtual-test-migration.js', () => ({
         default: migrationFn,
       }));
 
       const migration: MigrationMeta = {
         version: '1.0.0',
         description: 'test migration',
-        migrationScript: './test-migration.js',
+        migrationScript: 'virtual-test-migration.js',
       };
 
       const result = await runMigration(migration, mockContext);
@@ -139,10 +139,10 @@ describe('Migrations', () => {
     const migrationTwoFn = vi.fn();
     const consoleMock = vi.spyOn(console, 'log').mockImplementation(() => undefined);
 
-    vi.doMock('./migration-one.js', () => ({
+    vi.doMock('virtual-test-migration.js', async () => ({
       default: migrationOneFn,
     }));
-    vi.doMock('./migration-two.js', () => ({
+    vi.doMock('virtual-test-migration2.js', async () => ({
       default: migrationTwoFn,
     }));
 
@@ -150,12 +150,12 @@ describe('Migrations', () => {
       'migration-one': {
         version: '1.0.0',
         description: '...',
-        migrationScript: './migration-one.js',
+        migrationScript: 'virtual-test-migration.js',
       },
       'migration-two': {
         version: '1.2.0',
         description: '...',
-        migrationScript: './migration-two.js',
+        migrationScript: 'virtual-test-migration2.js',
       },
     };
 
@@ -203,7 +203,7 @@ describe('Migrations', () => {
     it('should commit the changes for each migration if the CLI arg is present', async () => {
       await runMigrations(migrations, { commitEachMigration: true });
 
-      expect(gitCommitNoVerify).toHaveBeenCalledTimes(3);
+      expect(gitCommitNoVerify).toHaveBeenCalledTimes(2);
     });
 
     it('should not create a commit for a migration that has no changes', async () => {
@@ -211,7 +211,7 @@ describe('Migrations', () => {
 
       await runMigrations(migrations, { commitEachMigration: true });
 
-      expect(gitCommitNoVerify).toHaveBeenCalledTimes(2);
+      expect(gitCommitNoVerify).toHaveBeenCalledTimes(1);
     });
 
     it('should update version in ".config/.cprc.json" on a successful update', async () => {

package/src/migrations/migrations.test.ts

@@ -1,12 +1,16 @@
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
 import defaultMigrations from './migrations.js';
 
 describe('migrations json', () => {
   // As migration scripts are imported dynamically when update is run we assert the path is valid
+  // Vitest 4 reimplemented it's workers which caused the previous dynamic import tests to fail.
+  // This test now only asserts that the source file exists.
   Object.entries(defaultMigrations.migrations).forEach(([key, migration]) => {
     it(`should have a valid migration script path for ${key}`, () => {
-      expect(async () => {
-        await import(migration.migrationScript);
-      }).not.toThrow();
+      const migrationPathString = migration.migrationScript.replace('.js', '.ts');
+      const path = join(__dirname, migrationPathString);
+      expect(existsSync(path)).toBe(true);
     });
   });
 });

package/src/migrations/migrations.ts

@@ -37,7 +37,7 @@ export default {
     },
     '005-react-18-3': {
       version: '6.1.7-beta.1',
-      description: 'Update React 18.0.0 to 18.3.1.',
+      description: 'Update React and ReactDOM 18.x versions to ^18.3.0 to surface React 19 compatibility issues.',
       migrationScript: './scripts/005-react-18-3.js',
     },
   },

package/src/migrations/scripts/005-react-18-3.test.ts

@@ -44,30 +44,7 @@ describe('005-react-18-3', () => {
     expect(context.getFile('./package.json')).toBe(initialPackageJson);
   });
 
-  it('should not downgrade React 19.0.0 to 18.3.1', async () => {
-    const context = new Context('/virtual');
-    const packageJson = {
-      dependencies: {
-        react: '^19.0.0',
-        'react-dom': '^19.0.0',
-      },
-      devDependencies: {
-        '@types/react': '^19.0.0',
-        '@types/react-dom': '^19.0.0',
-      },
-    };
-    context.addFile('./package.json', JSON.stringify(packageJson, null, 2));
-
-    await migrate(context);
-
-    const updatedPackageJson = JSON.parse(context.getFile('./package.json') || '{}');
-    expect(updatedPackageJson.dependencies.react).toBe('^19.0.0');
-    expect(updatedPackageJson.dependencies['react-dom']).toBe('^19.0.0');
-    expect(updatedPackageJson.devDependencies['@types/react']).toBe('^19.0.0');
-    expect(updatedPackageJson.devDependencies['@types/react-dom']).toBe('^19.0.0');
-  });
-
-  it('should update React 18.0.0 to 18.3.1', async () => {
+  it('should update React 18.0.0 to ^18.3.0', async () => {
     const context = new Context('/virtual');
     context.addFile(
       './package.json',
@@ -81,31 +58,52 @@ describe('005-react-18-3', () => {
     await migrate(context);
 
     const updatedPackageJson = JSON.parse(context.getFile('./package.json') || '{}');
-    expect(updatedPackageJson.dependencies.react).toBe('^18.3.1');
-    expect(updatedPackageJson.devDependencies?.['@types/react']).toBe('^18.3.1');
+    expect(updatedPackageJson.dependencies.react).toBe('^18.3.0');
+    expect(updatedPackageJson.devDependencies?.['@types/react']).toBe('^18.3.0');
   });
 
-  it('should not update React if version is already 18.3.1 or higher', async () => {
+  it('should not update React if version is already 18.3.0 or higher', async () => {
     const context = new Context('/virtual');
     const packageJson = {
       dependencies: {
-        react: '^18.3.1',
-        'react-dom': '^18.3.1',
+        react: '^18.3.0',
+        'react-dom': '^18.3.0',
       },
       devDependencies: {
-        '@types/react': '^18.3.1',
-        '@types/react-dom': '^18.3.1',
+        '@types/react': '^18.3.0',
+        '@types/react-dom': '^18.3.0',
       },
     };
     context.addFile('./package.json', JSON.stringify(packageJson, null, 2));
 
     await migrate(context);
 
-    // Since the versions are already 18.3.1, the migration should still run
-    // but the versions should remain 18.3.1
     const updatedPackageJson = JSON.parse(context.getFile('./package.json') || '{}');
-    expect(updatedPackageJson.dependencies.react).toBe('^18.3.1');
-    expect(updatedPackageJson.dependencies['react-dom']).toBe('^18.3.1');
+    expect(updatedPackageJson.dependencies.react).toBe('^18.3.0');
+    expect(updatedPackageJson.dependencies['react-dom']).toBe('^18.3.0');
+  });
+
+  it('should not downgrade React 19.0.0 to 18.3.0', async () => {
+    const context = new Context('/virtual');
+    const packageJson = {
+      dependencies: {
+        react: '^19.0.0',
+        'react-dom': '^19.0.0',
+      },
+      devDependencies: {
+        '@types/react': '^19.0.0',
+        '@types/react-dom': '^19.0.0',
+      },
+    };
+    context.addFile('./package.json', JSON.stringify(packageJson, null, 2));
+
+    await migrate(context);
+
+    const updatedPackageJson = JSON.parse(context.getFile('./package.json') || '{}');
+    expect(updatedPackageJson.dependencies.react).toBe('^19.0.0');
+    expect(updatedPackageJson.dependencies['react-dom']).toBe('^19.0.0');
+    expect(updatedPackageJson.devDependencies['@types/react']).toBe('^19.0.0');
+    expect(updatedPackageJson.devDependencies['@types/react-dom']).toBe('^19.0.0');
   });
 
   it('should handle version ranges correctly', async () => {
@@ -123,8 +121,8 @@ describe('005-react-18-3', () => {
     await migrate(context);
 
     const updatedPackageJson = JSON.parse(context.getFile('./package.json') || '{}');
-    expect(updatedPackageJson.dependencies.react).toBe('^18.3.1');
-    expect(updatedPackageJson.dependencies['react-dom']).toBe('^18.3.1');
+    expect(updatedPackageJson.dependencies.react).toBe('^18.3.0');
+    expect(updatedPackageJson.dependencies['react-dom']).toBe('^18.3.0');
   });
 
   it('should be idempotent', async () => {

package/src/migrations/scripts/005-react-18-3.ts

@@ -6,12 +6,12 @@ export default function migrate(context: Context) {
     const packageJson = JSON.parse(context.getFile('package.json') || '{}');
     if (packageJson.dependencies?.react) {
       if (isVersionGreater(packageJson.dependencies.react, '18.0.0', true)) {
-        addDependenciesToPackageJson(context, { react: '^18.3.1' }, { '@types/react': '^18.3.1' });
+        addDependenciesToPackageJson(context, { react: '^18.3.0' }, { '@types/react': '^18.3.0' });
       }
     }
     if (packageJson.dependencies?.['react-dom']) {
       if (isVersionGreater(packageJson.dependencies['react-dom'], '18.0.0', true)) {
-        addDependenciesToPackageJson(context, { 'react-dom': '^18.3.1' }, { '@types/react-dom': '^18.3.1' });
+        addDependenciesToPackageJson(context, { 'react-dom': '^18.3.0' }, { '@types/react-dom': '^18.3.0' });
       }
     }
   }

package/vitest.config.ts

@@ -9,5 +9,17 @@ export default mergeConfig(
       root: resolve(__dirname),
       setupFiles: ['./vitest.setup.ts'],
     },
+    plugins: [
+      // This plugin is used to convince Vitest the mocked virtual migrations exist.
+      // https://vitest.dev/guide/mocking/modules.html#mocking-non-existing-module
+      {
+        name: 'virtual-migrations',
+        resolveId(id) {
+          if (id === 'virtual-test-migration.js' || id === 'virtual-test-migration2.js') {
+            return id;
+          }
+        },
+      },
+    ],
   })
 );