Schema: Re-introduce exports for the schema package (#116683)

* wip

* added fallback exports.#

* renamed files to new pattern to follow exports.

* added fallback exports.

* added more exports.

* wip

* wip

* wip.

* Updating rollup to output proper paths.

* wip

* wip

* reverted new export APIs, will be done in follow up PRs.

* fixed rollup config.

* replaced imports with new proper exports.

* fixed tests.

* renamed missing file.

* fixed error.

* Needed to make the file names shorter due to publint limitations.

* Fixed issue with generated index fiels.

* fixed preferences export as well.

* reverted import.

* fixed conflicts.

* fixed issue with type imports.

* fixed so we are backwards compatible with the node moduleresolution.

e2e/old-arch/utils/flows/userPreferences.ts

@@ -1,4 +1,4 @@
-import { Preferences as UserPreferencesDTO } from '@grafana/schema/src/raw/preferences/x/preferences_types.gen';
+import { Preferences as UserPreferencesDTO } from '@grafana/api-clients/rtkq/preferences/v1alpha1';
 
 import { e2e } from '..';
 import { fromBaseUrl } from '../support/url';

e2e/utils/flows/userPreferences.ts

@@ -1,4 +1,4 @@
-import { Preferences as UserPreferencesDTO } from '@grafana/schema/src/raw/preferences/x/preferences_types.gen';
+import { Preferences as UserPreferencesDTO } from '@grafana/api-clients/rtkq/preferences/v1alpha1';
 
 import { e2e } from '..';
 import { fromBaseUrl } from '../support/url';

jest.config.js

@@ -69,7 +69,6 @@ module.exports = {
     '@kusto/monaco-kusto': '@kusto/monaco-kusto/release/esm/monaco.contribution.js',
     // near-membrane-dom won't work in a nodejs environment.
     '@locker/near-membrane-dom': '<rootDir>/public/test/mocks/nearMembraneDom.ts',
-    '^@grafana/schema/dist/esm/(.*)$': '<rootDir>/packages/grafana-schema/src/$1',
     // prevent systemjs amd extra from breaking tests.
     'systemjs/dist/extras/amd': '<rootDir>/public/test/mocks/systemjsAMDExtra.ts',
     '@bsull/augurs': '<rootDir>/public/test/mocks/augurs.ts',

packages/grafana-schema/package.json

@@ -13,14 +13,250 @@
     "url": "http://github.com/grafana/grafana.git",
     "directory": "packages/grafana-schema"
   },
-  "main": "./src/index.ts",
-  "module": "./src/index.ts",
-  "types": "./src/index.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "@grafana-app/source": "./src/index.ts",
+      "types": "./dist/types/index.d.ts",
+      "import": "./dist/esm/index.mjs",
+      "require": "./dist/cjs/index.cjs"
+    },
+    "./apis/dashboard.grafana.app/*/examples": {
+      "@grafana-app/source": "./src/schema/dashboard/*/*_examples.ts",
+      "types": "./dist/types/schema/dashboard/*/*_examples.d.ts"
+    },
+    "./apis/dashboard.grafana.app/*": {
+      "@grafana-app/source": "./src/schema/dashboard/*/index.ts",
+      "types": "./dist/types/schema/dashboard/*/index.d.ts"
+    },
+    "./dist/esm/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/annotationslist/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/annotationslist/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/annotationslist/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/annotationslist/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/azuremonitor/dataquery/x/AzureMonitorDataQuery_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/azuremonitor/dataquery/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/azuremonitor/dataquery/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/azuremonitor/dataquery/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/azuremonitor/dataquery/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/barchart/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/barchart/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/barchart/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/barchart/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/bargauge/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/bargauge/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/bargauge/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/bargauge/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/candlestick/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/candlestick/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/candlestick/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/candlestick/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/canvas/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/canvas/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/canvas/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/canvas/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/cloudwatch/dataquery/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/cloudwatch/dataquery/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/cloudwatch/dataquery/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/cloudwatch/dataquery/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/dashboardlist/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/dashboardlist/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/dashboardlist/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/dashboardlist/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/datagrid/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/datagrid/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/datagrid/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/datagrid/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/debug/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/debug/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/debug/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/debug/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/elasticsearch/dataquery/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/elasticsearch/dataquery/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/elasticsearch/dataquery/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/elasticsearch/dataquery/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/gauge/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/gauge/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/gauge/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/gauge/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/geomap/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/geomap/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/geomap/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/geomap/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/googlecloudmonitoring/dataquery/x/GoogleCloudMonitoringDataQuery_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/googlecloudmonitoring/dataquery/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/googlecloudmonitoring/dataquery/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/googlecloudmonitoring/dataquery/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/googlecloudmonitoring/dataquery/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/grafanapyroscope/dataquery/x/GrafanaPyroscopeDataQuery_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/grafanapyroscope/dataquery/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/grafanapyroscope/dataquery/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/grafanapyroscope/dataquery/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/grafanapyroscope/dataquery/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/heatmap/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/heatmap/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/heatmap/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/heatmap/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/histogram/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/histogram/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/histogram/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/histogram/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/logs/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/logs/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/logs/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/logs/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/logsnew/panelcfg/x/LogsNewPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/logsnew/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/logsnew/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/logsnew/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/logsnew/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/logstable/panelcfg/x/LogsTablePanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/logstable/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/logstable/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/logstable/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/logstable/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/loki/dataquery/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/loki/dataquery/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/loki/dataquery/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/loki/dataquery/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/newgauge/panelcfg/x/NewGaugePanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/newgauge/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/newgauge/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/newgauge/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/newgauge/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/news/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/news/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/news/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/news/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/nodegraph/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/nodegraph/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/nodegraph/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/nodegraph/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/parca/dataquery/x/ParcaDataQuery_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/parca/dataquery/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/parca/dataquery/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/parca/dataquery/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/parca/dataquery/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/piechart/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/piechart/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/piechart/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/piechart/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/stat/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/stat/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/stat/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/stat/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/statetimeline/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/statetimeline/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/statetimeline/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/statetimeline/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/statushistory/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/statushistory/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/statushistory/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/statushistory/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/table/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/table/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/table/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/table/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/tempo/dataquery/x/TempoDataQuery_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/tempo/dataquery/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/tempo/dataquery/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/tempo/dataquery/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/tempo/dataquery/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/text/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/text/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/text/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/text/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/timeseries/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/timeseries/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/timeseries/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/timeseries/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/trend/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/trend/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/trend/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/trend/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/xychart/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/xychart/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/xychart/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/xychart/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/composable/xychart2/panelcfg/x/XYChart2PanelCfg_types.gen": {
+      "@grafana-app/source": "./src/raw/composable/xychart2/panelcfg/x/types.gen.ts",
+      "types": "./dist/types/raw/composable/xychart2/panelcfg/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/composable/xychart2/panelcfg/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/composable/xychart2/panelcfg/x/types.gen.cjs"
+    },
+    "./dist/esm/raw/dashboard/x/Dashboard_types.gen": {
+      "@grafana-app/source": "./src/raw/dashboard/x/types.gen.ts",
+      "types": "./dist/types/raw/dashboard/x/types.gen.d.ts",
+      "import": "./dist/esm/raw/dashboard/x/types.gen.mjs",
+      "require": "./dist/cjs/raw/dashboard/x/types.gen.cjs"
+    }
+  },
+  "main": "./dist/cjs/index.cjs",
+  "module": "./dist/esm/index.mjs",
+  "types": "./dist/types/index.d.ts",
   "publishConfig": {
-    "access": "public",
-    "main": "./dist/cjs/index.cjs",
-    "module": "./dist/esm/index.mjs",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "files": [
     "dist",

packages/grafana-schema/rollup.config.ts

@@ -8,22 +8,17 @@ import { cjsOutput, entryPoint, esmOutput, plugins } from '../rollup.config.part
 
 const rq = createRequire(import.meta.url);
 const pkg = rq('./package.json');
-
-const [_, noderesolve, esbuild] = plugins;
+const typePaths = backwardsCompatibilityTypeNames();
 
 export default [
   {
     input: entryPoint,
     plugins,
-    output: [
-      // Schema still uses publishConfig to define output directory.
-      // TODO: Migrate this package to use exports.
-      cjsOutput(pkg, 'grafana-schema', { dir: path.dirname(pkg.publishConfig.main) }),
-      esmOutput(pkg, 'grafana-schema', { dir: path.dirname(pkg.publishConfig.module) }),
-    ],
+    output: [cjsOutput(pkg, 'grafana-schema'), esmOutput(pkg, 'grafana-schema')],
     treeshake: false,
   },
   {
+    // Files that should be exported but not included in the `entryPoint`.
     input: Object.fromEntries(
       glob
         .sync('src/raw/composable/**/*.ts')
@@ -33,24 +28,44 @@ export default [
         ])
     ),
     plugins: [
-      noderesolve,
-      esbuild,
-      // Support @grafana/scenes that pulls in types from nested @grafana/schema files.
+      ...plugins,
       copy({
         targets: [
           {
             src: 'dist/types/raw/composable/**/*.d.ts',
             dest: 'dist/esm/raw/composable',
-            rename: (_name, _extension, fullpath) => fullpath.split(path.sep).slice(4).join('/'),
+            rename: (_name, _extension, fullpath) => {
+              const typePath = typePaths[fullpath] || fullpath;
+              return typePath.split(path.sep).slice(4).join('/');
+            },
           },
         ],
         hook: 'writeBundle',
       }),
     ],
-    output: {
-      format: 'esm',
-      dir: path.dirname(pkg.publishConfig.module),
-    },
+    output: [
+      {
+        format: 'esm',
+        dir: path.dirname(pkg.module),
+        entryFileNames: '[name].mjs',
+      },
+      {
+        format: 'cjs',
+        dir: path.dirname(pkg.main),
+        entryFileNames: '[name].cjs',
+      },
+    ],
     treeshake: false,
   },
 ];
+
+function backwardsCompatibilityTypeNames(): Record<string, string> {
+  return Object.keys(pkg.exports).reduce<Record<string, string>>((map, key) => {
+    const typesPath = pkg.exports[key].types;
+    if (!typesPath) {
+      return map;
+    }
+    map[path.normalize(typesPath)] = `${path.normalize(key)}.d.ts`;
+    return map;
+  }, {});
+}

packages/grafana-schema/src/index.gen.ts

@@ -37,7 +37,7 @@ export type {
   SpecialValueMap,
   ValueMappingResult,
   LibraryPanelRef
-} from './raw/dashboard/x/dashboard_types.gen';
+} from './raw/dashboard/x/types.gen';
 
 // Raw generated enums and default consts from dashboard kind.
 export {
@@ -57,7 +57,7 @@ export {
   SpecialValueMatch,
   DashboardCursorSync,
   defaultDashboardCursorSync
-} from './raw/dashboard/x/dashboard_types.gen';
+} from './raw/dashboard/x/types.gen';
 
 // The following exported declarations correspond to types in the dashboard@0.0 kind's
 // schema with attribute @grafana(TSVeneer="type").

packages/grafana-schema/src/schema/dashboard/v2.ts

@@ -1,3 +0,0 @@
-export * from './v2beta1/types.spec.gen';
-export * from './v2beta1/types.status.gen';
-export * from './v2beta1/types.metadata.gen';

packages/grafana-schema/src/schema/dashboard/v2/index.ts

@@ -0,0 +1 @@
+export * from '../v2beta1';

packages/grafana-schema/src/schema/dashboard/v2/v2_examples.ts

@@ -1,4 +1,4 @@
-import { defaultDataQueryKind, Spec } from './v2';
+import { defaultDataQueryKind, Spec } from './index';
 
 export const handyTestingSchema: Spec = {
   title: 'Default Dashboard',

packages/grafana-schema/src/schema/dashboard/v2beta1/index.ts

@@ -0,0 +1,4 @@
+// TODO: Should be generated by code-gen
+export * from '../v2beta1/types.spec.gen';
+export * from '../v2beta1/types.status.gen';
+export * from '../v2beta1/types.metadata.gen';

packages/grafana-schema/src/veneer/dashboard.types.ts

@@ -1,5 +1,5 @@
 import { DataSourceRef as CommonDataSourceRef, DataSourceRef, DataTopic } from '../common/common.gen';
-import * as raw from '../raw/dashboard/x/dashboard_types.gen';
+import * as raw from '../raw/dashboard/x/types.gen';
 
 import { DataQuery } from './common.types';
 

packages/grafana-schema/tsconfig.json

@@ -7,7 +7,7 @@
     "declarationDir": "./dist/types",
     "emitDeclarationOnly": true,
     "isolatedModules": true,
-    "rootDirs": ["."],
+    "rootDir": "./src",
     "moduleResolution": "bundler"
   },
   "exclude": ["dist/**/*"],

pkg/codegen/jenny_ts_types.go

@@ -38,10 +38,5 @@ func (j TSTypesJenny) Generate(sfg SchemaForGen) (*codejen.File, error) {
 		return nil, err
 	}
 
-	outputName := sfg.Name
-	if sfg.OutputName != "" {
-		outputName = sfg.OutputName
-	}
-
-	return codejen.NewFile(outputName+"_types.gen.ts", []byte(f.String()), j), nil
+	return codejen.NewFile("types.gen.ts", []byte(f.String()), j), nil
 }

pkg/codegen/jenny_tsveneerindex.go

@@ -152,7 +152,7 @@ func (gen *genTSVeneerIndex) extractTSIndexVeneerElements(def SchemaForGen, tf *
 			CommentList: []ast.Comment{ts.CommentFromString(fmt.Sprintf("Raw generated types from %s kind.", def.Name), 80, false)},
 			TypeOnly:    true,
 			Exports:     raw,
-			From:        ast.Str{Value: fmt.Sprintf("./raw/%s/%s/%s_types.gen", machineName, vpath, machineName)},
+			From:        ast.Str{Value: fmt.Sprintf("./raw/%s/%s/types.gen", machineName, vpath)},
 		})
 	}
 	if len(rawD) > 0 {
@@ -160,7 +160,7 @@ func (gen *genTSVeneerIndex) extractTSIndexVeneerElements(def SchemaForGen, tf *
 			CommentList: []ast.Comment{ts.CommentFromString(fmt.Sprintf("Raw generated enums and default consts from %s kind.", machineName), 80, false)},
 			TypeOnly:    false,
 			Exports:     rawD,
-			From:        ast.Str{Value: fmt.Sprintf("./raw/%s/%s/%s_types.gen", machineName, vpath, machineName)},
+			From:        ast.Str{Value: fmt.Sprintf("./raw/%s/%s/types.gen", machineName, vpath)},
 		})
 	}
 	vtfile := fmt.Sprintf("./veneer/%s.types", machineName)

public/app/features/alerting/unified/components/rule-editor/DashboardPicker.tsx

@@ -7,7 +7,7 @@ import { FixedSizeList } from 'react-window';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Trans, t } from '@grafana/i18n';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import {
   Alert,
   Button,

public/app/features/alerting/unified/components/rule-editor/useDashboardQuery.ts

@@ -1,7 +1,7 @@
 import memoizeOne from 'memoize-one';
 import { useEffect, useState } from 'react';
 
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { getDashboardAPI } from 'app/features/dashboard/api/dashboard_api';
 import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types';
 import { isDashboardV2Resource } from 'app/features/dashboard/api/utils';

public/app/features/alerting/unified/components/rules/central-state-history/CentralAlertHistoryScene.tsx

@@ -24,7 +24,7 @@ import {
   sceneGraph,
   useUrlSync,
 } from '@grafana/scenes';
-import { GraphDrawStyle, VisibilityMode } from '@grafana/schema/dist/esm/index';
+import { GraphDrawStyle, VisibilityMode } from '@grafana/schema';
 import {
   Button,
   GraphGradientMode,

public/app/features/browse-dashboards/api/browseDashboardsAPI.test.ts

@@ -1,7 +1,7 @@
 import { configureStore } from '@reduxjs/toolkit';
 
 import { Dashboard } from '@grafana/schema';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { getDashboardAPI } from 'app/features/dashboard/api/dashboard_api';
 import { SaveDashboardCommand } from 'app/features/dashboard/components/SaveDashboard/types';
 

public/app/features/browse-dashboards/api/browseDashboardsAPI.ts

@@ -7,7 +7,7 @@ import { AppEvents, locationUtil } from '@grafana/data';
 import { t } from '@grafana/i18n';
 import { config, getBackendSrv, isFetchError, locationService } from '@grafana/runtime';
 import { Dashboard } from '@grafana/schema';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { isProvisionedFolderCheck } from 'app/api/clients/folder/v1beta1/utils';
 import { appEvents } from 'app/core/app_events';
 import { buildNotificationButton } from 'app/core/components/AppNotifications/NotificationButton';

public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingData.tsx

@@ -11,7 +11,7 @@ import {
   SceneObjectState,
   VizPanel,
 } from '@grafana/scenes';
-import { ConditionalRenderingDataKind } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { ConditionalRenderingDataKind } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { Combobox, ComboboxOption } from '@grafana/ui';
 
 import { dashboardEditActions } from '../../edit-pane/shared';

public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingTimeRangeSize.tsx

@@ -3,7 +3,7 @@ import { ReactElement, useCallback, useEffect, useMemo, useState } from 'react';
 import { rangeUtil, SelectableValue } from '@grafana/data';
 import { t } from '@grafana/i18n';
 import { SceneComponentProps, sceneGraph, SceneObjectBase, SceneObjectState } from '@grafana/scenes';
-import { ConditionalRenderingTimeRangeSizeKind } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { ConditionalRenderingTimeRangeSizeKind } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { Field, Select } from '@grafana/ui';
 
 import { dashboardEditActions } from '../../edit-pane/shared';

public/app/features/dashboard-scene/conditional-rendering/conditions/ConditionalRenderingVariable.tsx

@@ -12,7 +12,7 @@ import {
 import {
   ConditionalRenderingVariableKind,
   ConditionalRenderingVariableSpec,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { Box, Combobox, ComboboxOption, Field, Input, Stack } from '@grafana/ui';
 import { ALL_VARIABLE_TEXT } from 'app/features/variables/constants';
 

public/app/features/dashboard-scene/conditional-rendering/conditions/serializers.ts

@@ -3,7 +3,7 @@ import {
   ConditionalRenderingDataKind,
   ConditionalRenderingTimeRangeSizeKind,
   ConditionalRenderingVariableKind,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 import { ConditionalRenderingData } from './ConditionalRenderingData';
 import { ConditionalRenderingTimeRangeSize } from './ConditionalRenderingTimeRangeSize';

public/app/features/dashboard-scene/conditional-rendering/group/ConditionalRenderingGroup.tsx

@@ -10,7 +10,7 @@ import {
   SceneObjectRef,
   SceneObjectState,
 } from '@grafana/scenes';
-import { ConditionalRenderingGroupKind } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { ConditionalRenderingGroupKind } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { Stack } from '@grafana/ui';
 
 import { ConditionalRenderingChangedEvent, dashboardEditActions } from '../../edit-pane/shared';

public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.test.ts

@@ -9,7 +9,7 @@ import { BackendSrv, config, locationService, setBackendSrv } from '@grafana/run
 import {
   Spec as DashboardV2Spec,
   defaultSpec as defaultDashboardV2Spec,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { provisioningAPIv0alpha1 } from 'app/api/clients/provisioning/v0alpha1';
 import { getDashboardAPI } from 'app/features/dashboard/api/dashboard_api';
 import { DashboardVersionError, DashboardWithAccessInfo } from 'app/features/dashboard/api/types';

public/app/features/dashboard-scene/pages/DashboardScenePageStateManager.ts

@@ -3,7 +3,7 @@ import { t } from '@grafana/i18n';
 import { config, getBackendSrv, getDataSourceSrv, isFetchError, locationService } from '@grafana/runtime';
 import { UserStorage } from '@grafana/runtime/internal';
 import { sceneGraph } from '@grafana/scenes';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { GetRepositoryFilesWithPathApiResponse, provisioningAPIv0alpha1 } from 'app/api/clients/provisioning/v0alpha1';
 import { StateManagerBase } from 'app/core/services/StateManagerBase';
 import { contextSrv } from 'app/core/services/context_srv';

public/app/features/dashboard-scene/panel-edit/testfiles/testDashboard.ts

@@ -1,4 +1,4 @@
-import { Spec as DashboardV2Spec, defaultDataQueryKind } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec, defaultDataQueryKind } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types';
 
 export const panelWithQueriesOnly = {

public/app/features/dashboard-scene/saving/DashboardPrompt.test.tsx

@@ -1,6 +1,6 @@
 import { SceneQueryRunner, SceneTimeRange, VizPanel, behaviors } from '@grafana/scenes';
 import { Dashboard } from '@grafana/schema';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { ContextSrv, setContextSrv } from 'app/core/services/context_srv';
 import { ObjectMeta } from 'app/features/apiserver/types';
 

public/app/features/dashboard-scene/saving/DashboardPrompt.tsx

@@ -5,7 +5,7 @@ import { memo, useContext, useEffect, useMemo } from 'react';
 import { Trans, t } from '@grafana/i18n';
 import { locationService } from '@grafana/runtime';
 import { Dashboard } from '@grafana/schema';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { ModalsContext, Modal, Button, useStyles2 } from '@grafana/ui';
 import { Prompt } from 'app/core/components/FormPrompt/Prompt';
 import { contextSrv } from 'app/core/services/context_srv';

public/app/features/dashboard-scene/saving/DetectChangesWorker.ts

@@ -1,5 +1,5 @@
 import { Dashboard } from '@grafana/schema';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 import { jsonDiff } from '../settings/version-history/utils';
 

public/app/features/dashboard-scene/saving/getDashboardChanges.ts

@@ -8,7 +8,7 @@ import {
   Spec as DashboardV2Spec,
   TextVariableSpec,
   VariableKind,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { ResponseTransformers } from 'app/features/dashboard/api/ResponseTransformers';
 import { isDashboardV2Spec } from 'app/features/dashboard/api/utils';
 import { DashboardDataDTO, DashboardDTO } from 'app/types/dashboard';

public/app/features/dashboard-scene/saving/shared.tsx

@@ -4,7 +4,7 @@ import { selectors } from '@grafana/e2e-selectors';
 import { Trans, t } from '@grafana/i18n';
 import { config, isFetchError } from '@grafana/runtime';
 import { Dashboard } from '@grafana/schema';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { Alert, Box, Button, Stack } from '@grafana/ui';
 
 import { Diffs } from '../settings/version-history/utils';

public/app/features/dashboard-scene/saving/useSaveDashboard.ts

@@ -4,7 +4,7 @@ import { locationUtil } from '@grafana/data';
 import { t } from '@grafana/i18n';
 import { locationService } from '@grafana/runtime';
 import { Dashboard } from '@grafana/schema';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { appEvents } from 'app/core/app_events';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { updateDashboardName } from 'app/core/reducers/navBarTree';

public/app/features/dashboard-scene/scene/DashboardScene.test.tsx

@@ -22,7 +22,7 @@ import {
   LocalValueVariable,
 } from '@grafana/scenes';
 import { Dashboard, DashboardCursorSync, LibraryPanel } from '@grafana/schema';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { appEvents } from 'app/core/app_events';
 import { LS_PANEL_COPY_KEY, LS_STYLES_COPY_KEY } from 'app/core/constants';
 import { AnnoKeyManagerKind, ManagerKind } from 'app/features/apiserver/types';

public/app/features/dashboard-scene/scene/DashboardScene.tsx

@@ -16,7 +16,7 @@ import {
   VizPanel,
 } from '@grafana/scenes';
 import { Dashboard, DashboardLink, LibraryPanel } from '@grafana/schema';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { appEvents } from 'app/core/app_events';
 import { ScrollRefElement } from 'app/core/components/NativeScrollbar';
 import { LS_PANEL_COPY_KEY, LS_STYLES_COPY_KEY } from 'app/core/constants';

public/app/features/dashboard-scene/scene/export/exporters.test.ts

@@ -7,8 +7,8 @@ import {
   LibraryPanelKind,
   PanelKind,
   QueryVariableKind,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
-import { handyTestingSchema } from '@grafana/schema/dist/esm/schema/dashboard/v2_examples';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
+import { handyTestingSchema } from '@grafana/schema/apis/dashboard.grafana.app/v2/examples';
 import config from 'app/core/config';
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 import { createAdHocVariableAdapter } from 'app/features/variables/adhoc/adapter';

public/app/features/dashboard-scene/scene/export/exporters.ts

@@ -11,7 +11,7 @@ import {
   QueryVariableKind,
   LibraryPanelRef,
   LibraryPanelKind,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import config from 'app/core/config';
 import { createErrorNotification } from 'app/core/copy/appNotification';
 import { notifyApp } from 'app/core/reducers/appNotification';

public/app/features/dashboard-scene/scene/export/utils.ts

@@ -1,4 +1,4 @@
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 /**
  * Removes a panel reference from a layout.

public/app/features/dashboard-scene/scene/layout-auto-grid/AutoGridLayoutManager.tsx

@@ -8,7 +8,7 @@ import {
   VizPanel,
   SceneGridItemLike,
 } from '@grafana/scenes';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { GRID_CELL_VMARGIN } from 'app/core/constants';
 import { OptionsPaneItemDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor';
 

public/app/features/dashboard-scene/scene/layout-default/DefaultGridLayoutManager.tsx

@@ -18,7 +18,7 @@ import {
   SceneGridLayoutDragStartEvent,
   SceneObject,
 } from '@grafana/scenes';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { useStyles2 } from '@grafana/ui';
 import { GRID_COLUMN_COUNT } from 'app/core/constants';
 import DashboardEmpty from 'app/features/dashboard/dashgrid/DashboardEmpty/DashboardEmpty';

public/app/features/dashboard-scene/scene/layout-rows/RowItem.tsx

@@ -12,7 +12,7 @@ import {
   SceneGridItemLike,
   SceneGridLayout,
 } from '@grafana/scenes';
-import { RowsLayoutRowKind } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { RowsLayoutRowKind } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { appEvents } from 'app/core/app_events';
 import { LS_ROW_COPY_KEY } from 'app/core/constants';
 import kbn from 'app/core/utils/kbn';

public/app/features/dashboard-scene/scene/layout-rows/RowsLayoutManager.tsx

@@ -9,7 +9,7 @@ import {
   SceneObjectState,
   VizPanel,
 } from '@grafana/scenes';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 import { dashboardEditActions, ObjectsReorderedOnCanvasEvent } from '../../edit-pane/shared';
 import { serializeRowsLayout } from '../../serialization/layoutSerializers/RowsLayoutSerializer';

public/app/features/dashboard-scene/scene/layout-tabs/TabItem.tsx

@@ -12,7 +12,7 @@ import {
   SceneGridItemLike,
   SceneGridLayout,
 } from '@grafana/scenes';
-import { TabsLayoutTabKind } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { TabsLayoutTabKind } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { appEvents } from 'app/core/app_events';
 import { LS_TAB_COPY_KEY } from 'app/core/constants';
 import kbn from 'app/core/utils/kbn';

public/app/features/dashboard-scene/scene/layout-tabs/TabsLayoutManager.tsx

@@ -8,7 +8,7 @@ import {
   SceneObjectUrlValues,
   VizPanel,
 } from '@grafana/scenes';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 import { dashboardEditActions, ObjectsReorderedOnCanvasEvent } from '../../edit-pane/shared';
 import { serializeTabsLayout } from '../../serialization/layoutSerializers/TabsLayoutSerializer';

public/app/features/dashboard-scene/scene/layouts-shared/paste.ts

@@ -5,7 +5,7 @@ import {
   GridLayoutItemKind,
   RowsLayoutRowKind,
   TabsLayoutTabKind,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { LS_PANEL_COPY_KEY, LS_ROW_COPY_KEY, LS_STYLES_COPY_KEY, LS_TAB_COPY_KEY } from 'app/core/constants';
 
 import { deserializeAutoGridItem } from '../../serialization/layoutSerializers/AutoGridLayoutSerializer';

public/app/features/dashboard-scene/scene/types/DashboardLayoutManager.ts

@@ -1,5 +1,5 @@
 import { SceneObject, VizPanel } from '@grafana/scenes';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { OptionsPaneItemDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneItemDescriptor';
 
 import { LayoutRegistryItem } from './LayoutRegistryItem';

public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.test.ts

@@ -17,7 +17,7 @@ import {
   PanelKind,
   PanelSpec,
   QueryVariableKind,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { DEFAULT_ANNOTATION_COLOR } from '@grafana/ui';
 import { AnnoKeyDashboardSnapshotOriginalUrl } from 'app/features/apiserver/types';
 import { SaveDashboardAsOptions } from 'app/features/dashboard/components/SaveDashboard/types';

public/app/features/dashboard-scene/serialization/DashboardSceneSerializer.ts

@@ -1,6 +1,6 @@
 import { logWarning } from '@grafana/runtime';
 import { Dashboard } from '@grafana/schema';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { AnnoKeyDashboardSnapshotOriginalUrl, ObjectMeta } from 'app/features/apiserver/types';
 import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types';
 import { isDashboardV2Spec } from 'app/features/dashboard/api/utils';

public/app/features/dashboard-scene/serialization/annotations.test.ts

@@ -1,5 +1,5 @@
 import { AnnotationQuery, AnnotationEventFieldSource } from '@grafana/data';
-import { AnnotationQueryKind } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { AnnotationQueryKind } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 import { transformV1ToV2AnnotationQuery, transformV2ToV1AnnotationQuery } from './annotations';
 

public/app/features/dashboard-scene/serialization/annotations.ts

@@ -3,7 +3,7 @@ import {
   AnnotationQueryKind,
   defaultAnnotationQuerySpec,
   defaultDataQueryKind,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 import { getRuntimePanelDataSource } from './layoutSerializers/utils';
 

public/app/features/dashboard-scene/serialization/buildNewDashboardSaveModel.ts

@@ -9,7 +9,7 @@ import {
   defaultTimeSettingsSpec,
   GroupByVariableKind,
   Spec as DashboardV2Spec,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { AnnoKeyFolder } from 'app/features/apiserver/types';
 import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';

public/app/features/dashboard-scene/serialization/layoutSerializers/AutoGridLayoutSerializer.ts

@@ -2,7 +2,7 @@ import {
   Spec as DashboardV2Spec,
   defaultAutoGridLayoutSpec,
   AutoGridLayoutItemKind,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 import { AutoGridItem } from '../../scene/layout-auto-grid/AutoGridItem';
 import { AutoGridLayout } from '../../scene/layout-auto-grid/AutoGridLayout';

public/app/features/dashboard-scene/serialization/layoutSerializers/DefaultGridLayoutSerializer.ts

@@ -8,7 +8,7 @@ import {
   GridLayoutItemSpec,
   PanelKind,
   LibraryPanelKind,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 import { DashboardGridItem } from '../../scene/layout-default/DashboardGridItem';
 import { DefaultGridLayoutManager } from '../../scene/layout-default/DefaultGridLayoutManager';

public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.test.ts

@@ -1,5 +1,5 @@
 import { SceneGridLayout } from '@grafana/scenes';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 import { AutoGridLayout } from '../../scene/layout-auto-grid/AutoGridLayout';
 import { AutoGridLayoutManager } from '../../scene/layout-auto-grid/AutoGridLayoutManager';

public/app/features/dashboard-scene/serialization/layoutSerializers/RowsLayoutSerializer.ts

@@ -1,4 +1,4 @@
-import { Spec as DashboardV2Spec, RowsLayoutRowKind } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec, RowsLayoutRowKind } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 import { RowItem } from '../../scene/layout-rows/RowItem';
 import { RowsLayoutManager } from '../../scene/layout-rows/RowsLayoutManager';

public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.test.ts

@@ -1,4 +1,4 @@
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 import { AutoGridLayoutManager } from '../../scene/layout-auto-grid/AutoGridLayoutManager';
 import { DefaultGridLayoutManager } from '../../scene/layout-default/DefaultGridLayoutManager';

public/app/features/dashboard-scene/serialization/layoutSerializers/TabsLayoutSerializer.ts

@@ -1,4 +1,4 @@
-import { Spec as DashboardV2Spec, TabsLayoutTabKind } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec, TabsLayoutTabKind } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 import { TabItem } from '../../scene/layout-tabs/TabItem';
 import { TabsLayoutManager } from '../../scene/layout-tabs/TabsLayoutManager';

public/app/features/dashboard-scene/serialization/layoutSerializers/layoutSerializerRegistry.ts

@@ -1,5 +1,5 @@
 import { Registry, RegistryItem } from '@grafana/data';
-import { Spec as DashboardV2Spec } from '@grafana/schema/dist/esm/schema/dashboard/v2';
+import { Spec as DashboardV2Spec } from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 import { DashboardLayoutManager } from '../../scene/types/DashboardLayoutManager';
 

public/app/features/dashboard-scene/serialization/layoutSerializers/utils.test.ts

@@ -3,7 +3,7 @@ import {
   defaultPanelSpec,
   PanelKind,
   PanelQueryKind,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard/constants';
 import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
 

public/app/features/dashboard-scene/serialization/layoutSerializers/utils.ts

@@ -10,7 +10,7 @@ import {
   VizPanelMenu,
   VizPanelState,
 } from '@grafana/scenes';
-import { DataSourceRef } from '@grafana/schema/dist/esm/index.gen';
+import { DataSourceRef } from '@grafana/schema';
 import {
   Spec as DashboardV2Spec,
   AutoGridLayoutItemKind,
@@ -22,7 +22,7 @@ import {
   TabsLayoutTabKind,
   DataQueryKind,
   defaultPanelQueryKind,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard/constants';
 import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';
 

public/app/features/dashboard-scene/serialization/sceneVariablesSetToVariables.ts

@@ -28,7 +28,7 @@ import {
   AdHocFilterWithLabels,
   SwitchVariableKind,
   defaultIntervalVariableSpec,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 import { getDefaultDatasource } from 'app/features/dashboard/api/ResponseTransformers';
 
 import { getIntervalsQueryFromNewIntervalModel } from '../utils/utils';

public/app/features/dashboard-scene/serialization/serialization-test-utils.ts

@@ -5,7 +5,7 @@ import {
   Spec as DashboardV2Spec,
   GridLayoutItemKind,
   RowsLayoutRowKind,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
 
 /**
  * Recursively gets all JSON files from a directory.

public/app/features/dashboard-scene/serialization/transformSaveModelSchemaV2ToScene.test.ts

@@ -30,8 +30,8 @@ import {
   QueryVariableKind,
   SwitchVariableKind,
   TextVariableKind,
-} from '@grafana/schema/dist/esm/schema/dashboard/v2';
-import { handyTestingSchema } from '@grafana/schema/dist/esm/schema/dashboard/v2_examples';
+} from '@grafana/schema/apis/dashboard.grafana.app/v2';
+import { handyTestingSchema } from '@grafana/schema/apis/dashboard.grafana.app/v2/examples';
 import { AnnoKeyDashboardIsSnapshot } from 'app/features/apiserver/types';
 import { DashboardWithAccessInfo } from 'app/features/dashboard/api/types';
 import { MIXED_DATASOURCE_NAME } from 'app/plugins/datasource/mixed/MixedDataSource';