Skip to content

Commit 19b085b

Browse files
Automated update to latest version (#591)
Co-authored-by: academo <[email protected]>
1 parent b7705d4 commit 19b085b

File tree

30 files changed

+1515
-2345
lines changed

30 files changed

+1515
-2345
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "5.26.5"
2+
"version": "5.26.8"
33
}
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
import type { Configuration, ExternalItemFunctionData } from 'webpack';
2+
3+
type ExternalsType = Configuration['externals'];
4+
5+
export const externals: ExternalsType = [
6+
// Required for dynamic publicPath resolution
7+
{ 'amd-module': 'module' },
8+
'lodash',
9+
'jquery',
10+
'moment',
11+
'slate',
12+
'emotion',
13+
'@emotion/react',
14+
'@emotion/css',
15+
'prismjs',
16+
'slate-plain-serializer',
17+
'@grafana/slate-react',
18+
'react',
19+
'react-dom',
20+
'react-redux',
21+
'redux',
22+
'rxjs',
23+
'i18next',
24+
'react-router',
25+
'd3',
26+
'angular',
27+
/^@grafana\/ui/i,
28+
/^@grafana\/runtime/i,
29+
/^@grafana\/data/i,
30+
31+
// Mark legacy SDK imports as external if their name starts with the "grafana/" prefix
32+
({ request }: ExternalItemFunctionData, callback: (error?: Error, result?: string) => void) => {
33+
const prefix = 'grafana/';
34+
const hasPrefix = (request: string) => request.indexOf(prefix) === 0;
35+
const stripPrefix = (request: string) => request.slice(prefix.length);
36+
37+
if (request && hasPrefix(request)) {
38+
return callback(undefined, stripPrefix(request));
39+
}
40+
41+
callback();
42+
},
43+
];

examples/app-basic/.config/docker-compose-base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
context: .
88
args:
99
grafana_image: ${GRAFANA_IMAGE:-grafana-enterprise}
10-
grafana_version: ${GRAFANA_VERSION:-12.1.1}
10+
grafana_version: ${GRAFANA_VERSION:-12.2.0}
1111
development: ${DEVELOPMENT:-false}
1212
anonymous_auth_enabled: ${ANONYMOUS_AUTH_ENABLED:-true}
1313
ports:

examples/app-basic/.config/webpack/webpack.config.ts

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import VirtualModulesPlugin from 'webpack-virtual-modules';
1919
import { BuildModeWebpackPlugin } from './BuildModeWebpackPlugin.ts';
2020
import { DIST_DIR, SOURCE_DIR } from './constants.ts';
2121
import { getCPConfigVersion, getEntries, getPackageJson, getPluginJson, hasReadme, isWSL } from './utils.ts';
22+
import { externals } from '../bundler/externals.ts';
2223

2324
const pluginJson = getPluginJson();
2425
const cpVersion = getCPConfigVersion();
@@ -55,45 +56,7 @@ const config = async (env: Env): Promise<Configuration> => {
5556

5657
entry: await getEntries(),
5758

58-
externals: [
59-
// Required for dynamic publicPath resolution
60-
{ 'amd-module': 'module' },
61-
'lodash',
62-
'jquery',
63-
'moment',
64-
'slate',
65-
'emotion',
66-
'@emotion/react',
67-
'@emotion/css',
68-
'prismjs',
69-
'slate-plain-serializer',
70-
'@grafana/slate-react',
71-
'react',
72-
'react-dom',
73-
'react-redux',
74-
'redux',
75-
'rxjs',
76-
'i18next',
77-
'react-router',
78-
'd3',
79-
'angular',
80-
/^@grafana\/ui/i,
81-
/^@grafana\/runtime/i,
82-
/^@grafana\/data/i,
83-
84-
// Mark legacy SDK imports as external if their name starts with the "grafana/" prefix
85-
({ request }, callback) => {
86-
const prefix = 'grafana/';
87-
const hasPrefix = (request: string) => request.indexOf(prefix) === 0;
88-
const stripPrefix = (request: string) => request.substr(prefix.length);
89-
90-
if (request && hasPrefix(request)) {
91-
return callback(undefined, stripPrefix(request));
92-
}
93-
94-
callback();
95-
},
96-
],
59+
externals,
9760

9861
// Support WebAssembly according to latest spec - makes WebAssembly module async
9962
experiments: {

0 commit comments

Comments
 (0)