diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index 3bab0817d6e..82a8a8c46f9 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -39,6 +39,7 @@ "@grafana/schema": "12.0.0-pre", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", + "@types/systemjs": "6.15.1", "d3-interpolate": "3.0.1", "date-fns": "4.1.0", "dompurify": "3.2.4", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 0f47def9b0a..3b0544d9ae5 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -42,6 +42,7 @@ "@grafana/faro-web-sdk": "^1.13.2", "@grafana/schema": "12.0.0-pre", "@grafana/ui": "12.0.0-pre", + "@types/systemjs": "6.15.1", "history": "4.10.1", "lodash": "4.17.21", "react-loading-skeleton": "3.5.0", @@ -62,7 +63,6 @@ "@types/lodash": "4.17.15", "@types/react": "18.3.18", "@types/react-dom": "18.3.5", - "@types/systemjs": "6.15.1", "esbuild": "0.25.0", "lodash": "4.17.21", "react": "18.3.1", diff --git a/scripts/webpack/webpack.dev.js b/scripts/webpack/webpack.dev.js index 32caaa5fb9e..7d322fbf65b 100644 --- a/scripts/webpack/webpack.dev.js +++ b/scripts/webpack/webpack.dev.js @@ -52,11 +52,6 @@ module.exports = (env = {}) => { // Packages linked for development need react to be resolved from the same location react: path.resolve('./node_modules/react'), - // Also Grafana packages need to be resolved from the same location so they share - // the same singletons - '@grafana/runtime': path.resolve(__dirname, '../../packages/grafana-runtime'), - '@grafana/data': path.resolve(__dirname, '../../packages/grafana-data'), - // This is required to correctly resolve react-router-dom when linking with // local version of @grafana/scenes 'react-router-dom': path.resolve('./node_modules/react-router-dom'), diff --git a/yarn.lock b/yarn.lock index fe969bf0465..5e294290c31 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2962,6 +2962,7 @@ __metadata: "@types/react": "npm:18.3.18" "@types/react-dom": "npm:18.3.5" "@types/string-hash": "npm:1.1.3" + "@types/systemjs": "npm:6.15.1" "@types/tinycolor2": "npm:1.4.6" d3-interpolate: "npm:3.0.1" date-fns: "npm:4.1.0"