From 6825fc602868713b2af1e1c9b67bc5dc9d445922 Mon Sep 17 00:00:00 2001 From: "grafana-plugins-platform-bot[bot]" <144369747+grafana-plugins-platform-bot[bot]@users.noreply.github.com> Date: Fri, 16 May 2025 08:10:29 +0000 Subject: [PATCH] chore: update configuration to latest version --- examples/app-basic/.config/.cprc.json | 2 +- .../.config/webpack/BuildModeWebpackPlugin.ts | 2 +- examples/app-basic/.config/webpack/utils.ts | 15 ++++++++++----- .../app-basic/.config/webpack/webpack.config.ts | 13 +++++++------ examples/app-basic/package-lock.json | 16 ++++++++-------- examples/app-basic/package.json | 2 +- examples/datasource-basic/.config/.cprc.json | 2 +- .../.config/webpack/BuildModeWebpackPlugin.ts | 2 +- .../datasource-basic/.config/webpack/utils.ts | 15 ++++++++++----- .../.config/webpack/webpack.config.ts | 13 +++++++------ examples/datasource-basic/package-lock.json | 16 ++++++++-------- examples/datasource-basic/package.json | 2 +- examples/panel-basic/.config/.cprc.json | 2 +- .../.config/webpack/BuildModeWebpackPlugin.ts | 2 +- examples/panel-basic/.config/webpack/utils.ts | 15 ++++++++++----- .../.config/webpack/webpack.config.ts | 13 +++++++------ examples/panel-basic/package-lock.json | 16 ++++++++-------- examples/panel-basic/package.json | 2 +- examples/panel-datalinks/.config/.cprc.json | 2 +- .../.config/webpack/BuildModeWebpackPlugin.ts | 2 +- .../panel-datalinks/.config/webpack/utils.ts | 15 ++++++++++----- .../.config/webpack/webpack.config.ts | 13 +++++++------ examples/panel-datalinks/package-lock.json | 16 ++++++++-------- examples/panel-datalinks/package.json | 2 +- 24 files changed, 112 insertions(+), 88 deletions(-) diff --git a/examples/app-basic/.config/.cprc.json b/examples/app-basic/.config/.cprc.json index ff4ac8097..6afa53617 100644 --- a/examples/app-basic/.config/.cprc.json +++ b/examples/app-basic/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.20.1" + "version": "5.22.0" } diff --git a/examples/app-basic/.config/webpack/BuildModeWebpackPlugin.ts b/examples/app-basic/.config/webpack/BuildModeWebpackPlugin.ts index 004e07575..883611517 100644 --- a/examples/app-basic/.config/webpack/BuildModeWebpackPlugin.ts +++ b/examples/app-basic/.config/webpack/BuildModeWebpackPlugin.ts @@ -1,4 +1,4 @@ -import * as webpack from 'webpack'; +import webpack, { type Compiler } from 'webpack'; const PLUGIN_NAME = 'BuildModeWebpack'; diff --git a/examples/app-basic/.config/webpack/utils.ts b/examples/app-basic/.config/webpack/utils.ts index a42f5b28d..3b13b1937 100644 --- a/examples/app-basic/.config/webpack/utils.ts +++ b/examples/app-basic/.config/webpack/utils.ts @@ -3,7 +3,7 @@ import process from 'process'; import os from 'os'; import path from 'path'; import { glob } from 'glob'; -import { SOURCE_DIR } from './constants'; +import { SOURCE_DIR } from './constants.ts'; export function isWSL() { if (process.platform !== 'linux') { @@ -21,17 +21,22 @@ export function isWSL() { } } +function loadJson(path: string) { + const rawJson = fs.readFileSync(path, 'utf8'); + return JSON.parse(rawJson); +} + export function getPackageJson() { - return require(path.resolve(process.cwd(), 'package.json')); + return loadJson(path.resolve(process.cwd(), 'package.json')); } export function getPluginJson() { - return require(path.resolve(process.cwd(), `${SOURCE_DIR}/plugin.json`)); + return loadJson(path.resolve(process.cwd(), `${SOURCE_DIR}/plugin.json`)); } export function getCPConfigVersion() { - const cprcJson = path.resolve(__dirname, '../', '.cprc.json'); - return fs.existsSync(cprcJson) ? require(cprcJson).version : { version: 'unknown' }; + const cprcJson = path.resolve(process.cwd(), './.config', '.cprc.json'); + return fs.existsSync(cprcJson) ? loadJson(cprcJson).version : { version: 'unknown' }; } export function hasReadme() { diff --git a/examples/app-basic/.config/webpack/webpack.config.ts b/examples/app-basic/.config/webpack/webpack.config.ts index 537783ec6..99a8ad19c 100644 --- a/examples/app-basic/.config/webpack/webpack.config.ts +++ b/examples/app-basic/.config/webpack/webpack.config.ts @@ -12,13 +12,13 @@ import path from 'path'; import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin'; import TerserPlugin from 'terser-webpack-plugin'; import { SubresourceIntegrityPlugin } from 'webpack-subresource-integrity'; -import { type Configuration, BannerPlugin } from 'webpack'; +import webpack, { type Configuration } from 'webpack'; import LiveReloadPlugin from 'webpack-livereload-plugin'; import VirtualModulesPlugin from 'webpack-virtual-modules'; -import { BuildModeWebpackPlugin } from './BuildModeWebpackPlugin'; -import { DIST_DIR, SOURCE_DIR } from './constants'; -import { getCPConfigVersion, getEntries, getPackageJson, getPluginJson, hasReadme, isWSL } from './utils'; +import { BuildModeWebpackPlugin } from './BuildModeWebpackPlugin.ts'; +import { DIST_DIR, SOURCE_DIR } from './constants.ts'; +import { getCPConfigVersion, getEntries, getPackageJson, getPluginJson, hasReadme, isWSL } from './utils.ts'; const pluginJson = getPluginJson(); const cpVersion = getCPConfigVersion(); @@ -43,7 +43,8 @@ const config = async (env: Env): Promise => { cache: { type: 'filesystem', buildDependencies: { - config: [__filename], + // __filename doesnt work in Node 24 + config: [path.resolve(process.cwd(), '.config', 'webpack', 'webpack.config.ts')], }, }, @@ -193,7 +194,7 @@ const config = async (env: Env): Promise => { new BuildModeWebpackPlugin(), virtualPublicPath, // Insert create plugin version information into the bundle - new BannerPlugin({ + new webpack.BannerPlugin({ banner: '/* [create-plugin] version: ' + cpVersion + ' */', raw: true, entryOnly: true, diff --git a/examples/app-basic/package-lock.json b/examples/app-basic/package-lock.json index 6ddd02139..ccc050687 100644 --- a/examples/app-basic/package-lock.json +++ b/examples/app-basic/package-lock.json @@ -26,7 +26,7 @@ "@grafana/e2e-selectors": "11.2.2", "@grafana/eslint-config": "^8.0.0", "@grafana/eslint-plugin-plugins": "^0.1.0", - "@grafana/plugin-e2e": "^2.0.1", + "@grafana/plugin-e2e": "^2.0.2", "@grafana/plugin-meta-extractor": "^0.0.2", "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.52.0", @@ -1546,13 +1546,13 @@ "license": "MIT" }, "node_modules/@grafana/plugin-e2e": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-2.0.1.tgz", - "integrity": "sha512-NR/yQ92NiYWY1d7lBNkIKQDfRxOtXeq2deD4MS0S0mg/B88f6Gko4mxkw7p/wYPOdBESUArU+iDkz0QSJqrlBQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-2.0.2.tgz", + "integrity": "sha512-aLVs4VgZgi5pq2YynirrZQ8p8W7XZsliw5Dyk9Hdb7DfcIMYU7g1/rERYuwzsdtH1BVvEp5JwmEE16EPcbf80w==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@grafana/e2e-selectors": "^12.1.0-241536", + "@grafana/e2e-selectors": "^12.1.0-242212", "semver": "^7.5.4", "uuid": "^11.0.2", "yaml": "^2.3.4" @@ -1565,9 +1565,9 @@ } }, "node_modules/@grafana/plugin-e2e/node_modules/@grafana/e2e-selectors": { - "version": "12.1.0-242149", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-12.1.0-242149.tgz", - "integrity": "sha512-2pW9nntBfHxHSHudUBXHh9Sxl2/yDSTfn8cRmZkOOrUH3q6VnoxQJ8i8avnTw8uBGQq7xK7WjiTbWIKZ98MR0Q==", + "version": "12.1.0-243857", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-12.1.0-243857.tgz", + "integrity": "sha512-iC99rVZWSYbnowzzrYHiLppnMLD+GHVgFkyybh5CN/OzE6L0LaMGRJOcK39FvDxeNo7SbExskANLJEwyPLYXWw==", "dev": true, "license": "Apache-2.0", "dependencies": { diff --git a/examples/app-basic/package.json b/examples/app-basic/package.json index 22211e790..585885584 100644 --- a/examples/app-basic/package.json +++ b/examples/app-basic/package.json @@ -21,7 +21,7 @@ "@grafana/e2e-selectors": "11.2.2", "@grafana/eslint-config": "^8.0.0", "@grafana/eslint-plugin-plugins": "^0.1.0", - "@grafana/plugin-e2e": "^2.0.1", + "@grafana/plugin-e2e": "^2.0.2", "@grafana/plugin-meta-extractor": "^0.0.2", "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.52.0", diff --git a/examples/datasource-basic/.config/.cprc.json b/examples/datasource-basic/.config/.cprc.json index ff4ac8097..6afa53617 100644 --- a/examples/datasource-basic/.config/.cprc.json +++ b/examples/datasource-basic/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.20.1" + "version": "5.22.0" } diff --git a/examples/datasource-basic/.config/webpack/BuildModeWebpackPlugin.ts b/examples/datasource-basic/.config/webpack/BuildModeWebpackPlugin.ts index 004e07575..883611517 100644 --- a/examples/datasource-basic/.config/webpack/BuildModeWebpackPlugin.ts +++ b/examples/datasource-basic/.config/webpack/BuildModeWebpackPlugin.ts @@ -1,4 +1,4 @@ -import * as webpack from 'webpack'; +import webpack, { type Compiler } from 'webpack'; const PLUGIN_NAME = 'BuildModeWebpack'; diff --git a/examples/datasource-basic/.config/webpack/utils.ts b/examples/datasource-basic/.config/webpack/utils.ts index a42f5b28d..3b13b1937 100644 --- a/examples/datasource-basic/.config/webpack/utils.ts +++ b/examples/datasource-basic/.config/webpack/utils.ts @@ -3,7 +3,7 @@ import process from 'process'; import os from 'os'; import path from 'path'; import { glob } from 'glob'; -import { SOURCE_DIR } from './constants'; +import { SOURCE_DIR } from './constants.ts'; export function isWSL() { if (process.platform !== 'linux') { @@ -21,17 +21,22 @@ export function isWSL() { } } +function loadJson(path: string) { + const rawJson = fs.readFileSync(path, 'utf8'); + return JSON.parse(rawJson); +} + export function getPackageJson() { - return require(path.resolve(process.cwd(), 'package.json')); + return loadJson(path.resolve(process.cwd(), 'package.json')); } export function getPluginJson() { - return require(path.resolve(process.cwd(), `${SOURCE_DIR}/plugin.json`)); + return loadJson(path.resolve(process.cwd(), `${SOURCE_DIR}/plugin.json`)); } export function getCPConfigVersion() { - const cprcJson = path.resolve(__dirname, '../', '.cprc.json'); - return fs.existsSync(cprcJson) ? require(cprcJson).version : { version: 'unknown' }; + const cprcJson = path.resolve(process.cwd(), './.config', '.cprc.json'); + return fs.existsSync(cprcJson) ? loadJson(cprcJson).version : { version: 'unknown' }; } export function hasReadme() { diff --git a/examples/datasource-basic/.config/webpack/webpack.config.ts b/examples/datasource-basic/.config/webpack/webpack.config.ts index 0dc6fd196..e97b2e17f 100644 --- a/examples/datasource-basic/.config/webpack/webpack.config.ts +++ b/examples/datasource-basic/.config/webpack/webpack.config.ts @@ -12,13 +12,13 @@ import path from 'path'; import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin'; import TerserPlugin from 'terser-webpack-plugin'; import { SubresourceIntegrityPlugin } from 'webpack-subresource-integrity'; -import { type Configuration, BannerPlugin } from 'webpack'; +import webpack, { type Configuration } from 'webpack'; import LiveReloadPlugin from 'webpack-livereload-plugin'; import VirtualModulesPlugin from 'webpack-virtual-modules'; -import { BuildModeWebpackPlugin } from './BuildModeWebpackPlugin'; -import { DIST_DIR, SOURCE_DIR } from './constants'; -import { getCPConfigVersion, getEntries, getPackageJson, getPluginJson, hasReadme, isWSL } from './utils'; +import { BuildModeWebpackPlugin } from './BuildModeWebpackPlugin.ts'; +import { DIST_DIR, SOURCE_DIR } from './constants.ts'; +import { getCPConfigVersion, getEntries, getPackageJson, getPluginJson, hasReadme, isWSL } from './utils.ts'; const pluginJson = getPluginJson(); const cpVersion = getCPConfigVersion(); @@ -43,7 +43,8 @@ const config = async (env: Env): Promise => { cache: { type: 'filesystem', buildDependencies: { - config: [__filename], + // __filename doesnt work in Node 24 + config: [path.resolve(process.cwd(), '.config', 'webpack', 'webpack.config.ts')], }, }, @@ -194,7 +195,7 @@ const config = async (env: Env): Promise => { new BuildModeWebpackPlugin(), virtualPublicPath, // Insert create plugin version information into the bundle - new BannerPlugin({ + new webpack.BannerPlugin({ banner: '/* [create-plugin] version: ' + cpVersion + ' */', raw: true, entryOnly: true, diff --git a/examples/datasource-basic/package-lock.json b/examples/datasource-basic/package-lock.json index c182fe969..cd07f1491 100644 --- a/examples/datasource-basic/package-lock.json +++ b/examples/datasource-basic/package-lock.json @@ -25,7 +25,7 @@ "@grafana/e2e-selectors": "11.2.2", "@grafana/eslint-config": "^8.0.0", "@grafana/eslint-plugin-plugins": "^0.1.0", - "@grafana/plugin-e2e": "^2.0.1", + "@grafana/plugin-e2e": "^2.0.2", "@grafana/plugin-meta-extractor": "^0.0.2", "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.52.0", @@ -1582,13 +1582,13 @@ "license": "MIT" }, "node_modules/@grafana/plugin-e2e": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-2.0.1.tgz", - "integrity": "sha512-NR/yQ92NiYWY1d7lBNkIKQDfRxOtXeq2deD4MS0S0mg/B88f6Gko4mxkw7p/wYPOdBESUArU+iDkz0QSJqrlBQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-2.0.2.tgz", + "integrity": "sha512-aLVs4VgZgi5pq2YynirrZQ8p8W7XZsliw5Dyk9Hdb7DfcIMYU7g1/rERYuwzsdtH1BVvEp5JwmEE16EPcbf80w==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@grafana/e2e-selectors": "^12.1.0-241536", + "@grafana/e2e-selectors": "^12.1.0-242212", "semver": "^7.5.4", "uuid": "^11.0.2", "yaml": "^2.3.4" @@ -1601,9 +1601,9 @@ } }, "node_modules/@grafana/plugin-e2e/node_modules/@grafana/e2e-selectors": { - "version": "12.1.0-242149", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-12.1.0-242149.tgz", - "integrity": "sha512-2pW9nntBfHxHSHudUBXHh9Sxl2/yDSTfn8cRmZkOOrUH3q6VnoxQJ8i8avnTw8uBGQq7xK7WjiTbWIKZ98MR0Q==", + "version": "12.1.0-243857", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-12.1.0-243857.tgz", + "integrity": "sha512-iC99rVZWSYbnowzzrYHiLppnMLD+GHVgFkyybh5CN/OzE6L0LaMGRJOcK39FvDxeNo7SbExskANLJEwyPLYXWw==", "dev": true, "license": "Apache-2.0", "dependencies": { diff --git a/examples/datasource-basic/package.json b/examples/datasource-basic/package.json index eff4b2a0b..83036076e 100644 --- a/examples/datasource-basic/package.json +++ b/examples/datasource-basic/package.json @@ -21,7 +21,7 @@ "@grafana/e2e-selectors": "11.2.2", "@grafana/eslint-config": "^8.0.0", "@grafana/eslint-plugin-plugins": "^0.1.0", - "@grafana/plugin-e2e": "^2.0.1", + "@grafana/plugin-e2e": "^2.0.2", "@grafana/plugin-meta-extractor": "^0.0.2", "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.52.0", diff --git a/examples/panel-basic/.config/.cprc.json b/examples/panel-basic/.config/.cprc.json index ff4ac8097..6afa53617 100644 --- a/examples/panel-basic/.config/.cprc.json +++ b/examples/panel-basic/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.20.1" + "version": "5.22.0" } diff --git a/examples/panel-basic/.config/webpack/BuildModeWebpackPlugin.ts b/examples/panel-basic/.config/webpack/BuildModeWebpackPlugin.ts index 004e07575..883611517 100644 --- a/examples/panel-basic/.config/webpack/BuildModeWebpackPlugin.ts +++ b/examples/panel-basic/.config/webpack/BuildModeWebpackPlugin.ts @@ -1,4 +1,4 @@ -import * as webpack from 'webpack'; +import webpack, { type Compiler } from 'webpack'; const PLUGIN_NAME = 'BuildModeWebpack'; diff --git a/examples/panel-basic/.config/webpack/utils.ts b/examples/panel-basic/.config/webpack/utils.ts index a42f5b28d..3b13b1937 100644 --- a/examples/panel-basic/.config/webpack/utils.ts +++ b/examples/panel-basic/.config/webpack/utils.ts @@ -3,7 +3,7 @@ import process from 'process'; import os from 'os'; import path from 'path'; import { glob } from 'glob'; -import { SOURCE_DIR } from './constants'; +import { SOURCE_DIR } from './constants.ts'; export function isWSL() { if (process.platform !== 'linux') { @@ -21,17 +21,22 @@ export function isWSL() { } } +function loadJson(path: string) { + const rawJson = fs.readFileSync(path, 'utf8'); + return JSON.parse(rawJson); +} + export function getPackageJson() { - return require(path.resolve(process.cwd(), 'package.json')); + return loadJson(path.resolve(process.cwd(), 'package.json')); } export function getPluginJson() { - return require(path.resolve(process.cwd(), `${SOURCE_DIR}/plugin.json`)); + return loadJson(path.resolve(process.cwd(), `${SOURCE_DIR}/plugin.json`)); } export function getCPConfigVersion() { - const cprcJson = path.resolve(__dirname, '../', '.cprc.json'); - return fs.existsSync(cprcJson) ? require(cprcJson).version : { version: 'unknown' }; + const cprcJson = path.resolve(process.cwd(), './.config', '.cprc.json'); + return fs.existsSync(cprcJson) ? loadJson(cprcJson).version : { version: 'unknown' }; } export function hasReadme() { diff --git a/examples/panel-basic/.config/webpack/webpack.config.ts b/examples/panel-basic/.config/webpack/webpack.config.ts index 0dc6fd196..e97b2e17f 100644 --- a/examples/panel-basic/.config/webpack/webpack.config.ts +++ b/examples/panel-basic/.config/webpack/webpack.config.ts @@ -12,13 +12,13 @@ import path from 'path'; import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin'; import TerserPlugin from 'terser-webpack-plugin'; import { SubresourceIntegrityPlugin } from 'webpack-subresource-integrity'; -import { type Configuration, BannerPlugin } from 'webpack'; +import webpack, { type Configuration } from 'webpack'; import LiveReloadPlugin from 'webpack-livereload-plugin'; import VirtualModulesPlugin from 'webpack-virtual-modules'; -import { BuildModeWebpackPlugin } from './BuildModeWebpackPlugin'; -import { DIST_DIR, SOURCE_DIR } from './constants'; -import { getCPConfigVersion, getEntries, getPackageJson, getPluginJson, hasReadme, isWSL } from './utils'; +import { BuildModeWebpackPlugin } from './BuildModeWebpackPlugin.ts'; +import { DIST_DIR, SOURCE_DIR } from './constants.ts'; +import { getCPConfigVersion, getEntries, getPackageJson, getPluginJson, hasReadme, isWSL } from './utils.ts'; const pluginJson = getPluginJson(); const cpVersion = getCPConfigVersion(); @@ -43,7 +43,8 @@ const config = async (env: Env): Promise => { cache: { type: 'filesystem', buildDependencies: { - config: [__filename], + // __filename doesnt work in Node 24 + config: [path.resolve(process.cwd(), '.config', 'webpack', 'webpack.config.ts')], }, }, @@ -194,7 +195,7 @@ const config = async (env: Env): Promise => { new BuildModeWebpackPlugin(), virtualPublicPath, // Insert create plugin version information into the bundle - new BannerPlugin({ + new webpack.BannerPlugin({ banner: '/* [create-plugin] version: ' + cpVersion + ' */', raw: true, entryOnly: true, diff --git a/examples/panel-basic/package-lock.json b/examples/panel-basic/package-lock.json index fba2eb619..38488f3d2 100644 --- a/examples/panel-basic/package-lock.json +++ b/examples/panel-basic/package-lock.json @@ -22,7 +22,7 @@ "@babel/core": "^7.21.4", "@grafana/eslint-config": "^8.0.0", "@grafana/eslint-plugin-plugins": "^0.1.0", - "@grafana/plugin-e2e": "^2.0.1", + "@grafana/plugin-e2e": "^2.0.2", "@grafana/plugin-meta-extractor": "^0.0.2", "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.52.0", @@ -1566,13 +1566,13 @@ "license": "MIT" }, "node_modules/@grafana/plugin-e2e": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-2.0.1.tgz", - "integrity": "sha512-NR/yQ92NiYWY1d7lBNkIKQDfRxOtXeq2deD4MS0S0mg/B88f6Gko4mxkw7p/wYPOdBESUArU+iDkz0QSJqrlBQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-2.0.2.tgz", + "integrity": "sha512-aLVs4VgZgi5pq2YynirrZQ8p8W7XZsliw5Dyk9Hdb7DfcIMYU7g1/rERYuwzsdtH1BVvEp5JwmEE16EPcbf80w==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@grafana/e2e-selectors": "^12.1.0-241536", + "@grafana/e2e-selectors": "^12.1.0-242212", "semver": "^7.5.4", "uuid": "^11.0.2", "yaml": "^2.3.4" @@ -1585,9 +1585,9 @@ } }, "node_modules/@grafana/plugin-e2e/node_modules/@grafana/e2e-selectors": { - "version": "12.1.0-242149", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-12.1.0-242149.tgz", - "integrity": "sha512-2pW9nntBfHxHSHudUBXHh9Sxl2/yDSTfn8cRmZkOOrUH3q6VnoxQJ8i8avnTw8uBGQq7xK7WjiTbWIKZ98MR0Q==", + "version": "12.1.0-243857", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-12.1.0-243857.tgz", + "integrity": "sha512-iC99rVZWSYbnowzzrYHiLppnMLD+GHVgFkyybh5CN/OzE6L0LaMGRJOcK39FvDxeNo7SbExskANLJEwyPLYXWw==", "dev": true, "license": "Apache-2.0", "dependencies": { diff --git a/examples/panel-basic/package.json b/examples/panel-basic/package.json index a8d0c26f4..2e95f95de 100644 --- a/examples/panel-basic/package.json +++ b/examples/panel-basic/package.json @@ -20,7 +20,7 @@ "@babel/core": "^7.21.4", "@grafana/eslint-config": "^8.0.0", "@grafana/eslint-plugin-plugins": "^0.1.0", - "@grafana/plugin-e2e": "^2.0.1", + "@grafana/plugin-e2e": "^2.0.2", "@grafana/plugin-meta-extractor": "^0.0.2", "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.52.0", diff --git a/examples/panel-datalinks/.config/.cprc.json b/examples/panel-datalinks/.config/.cprc.json index ff4ac8097..6afa53617 100644 --- a/examples/panel-datalinks/.config/.cprc.json +++ b/examples/panel-datalinks/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.20.1" + "version": "5.22.0" } diff --git a/examples/panel-datalinks/.config/webpack/BuildModeWebpackPlugin.ts b/examples/panel-datalinks/.config/webpack/BuildModeWebpackPlugin.ts index 004e07575..883611517 100644 --- a/examples/panel-datalinks/.config/webpack/BuildModeWebpackPlugin.ts +++ b/examples/panel-datalinks/.config/webpack/BuildModeWebpackPlugin.ts @@ -1,4 +1,4 @@ -import * as webpack from 'webpack'; +import webpack, { type Compiler } from 'webpack'; const PLUGIN_NAME = 'BuildModeWebpack'; diff --git a/examples/panel-datalinks/.config/webpack/utils.ts b/examples/panel-datalinks/.config/webpack/utils.ts index a42f5b28d..3b13b1937 100644 --- a/examples/panel-datalinks/.config/webpack/utils.ts +++ b/examples/panel-datalinks/.config/webpack/utils.ts @@ -3,7 +3,7 @@ import process from 'process'; import os from 'os'; import path from 'path'; import { glob } from 'glob'; -import { SOURCE_DIR } from './constants'; +import { SOURCE_DIR } from './constants.ts'; export function isWSL() { if (process.platform !== 'linux') { @@ -21,17 +21,22 @@ export function isWSL() { } } +function loadJson(path: string) { + const rawJson = fs.readFileSync(path, 'utf8'); + return JSON.parse(rawJson); +} + export function getPackageJson() { - return require(path.resolve(process.cwd(), 'package.json')); + return loadJson(path.resolve(process.cwd(), 'package.json')); } export function getPluginJson() { - return require(path.resolve(process.cwd(), `${SOURCE_DIR}/plugin.json`)); + return loadJson(path.resolve(process.cwd(), `${SOURCE_DIR}/plugin.json`)); } export function getCPConfigVersion() { - const cprcJson = path.resolve(__dirname, '../', '.cprc.json'); - return fs.existsSync(cprcJson) ? require(cprcJson).version : { version: 'unknown' }; + const cprcJson = path.resolve(process.cwd(), './.config', '.cprc.json'); + return fs.existsSync(cprcJson) ? loadJson(cprcJson).version : { version: 'unknown' }; } export function hasReadme() { diff --git a/examples/panel-datalinks/.config/webpack/webpack.config.ts b/examples/panel-datalinks/.config/webpack/webpack.config.ts index 0dc6fd196..e97b2e17f 100644 --- a/examples/panel-datalinks/.config/webpack/webpack.config.ts +++ b/examples/panel-datalinks/.config/webpack/webpack.config.ts @@ -12,13 +12,13 @@ import path from 'path'; import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin'; import TerserPlugin from 'terser-webpack-plugin'; import { SubresourceIntegrityPlugin } from 'webpack-subresource-integrity'; -import { type Configuration, BannerPlugin } from 'webpack'; +import webpack, { type Configuration } from 'webpack'; import LiveReloadPlugin from 'webpack-livereload-plugin'; import VirtualModulesPlugin from 'webpack-virtual-modules'; -import { BuildModeWebpackPlugin } from './BuildModeWebpackPlugin'; -import { DIST_DIR, SOURCE_DIR } from './constants'; -import { getCPConfigVersion, getEntries, getPackageJson, getPluginJson, hasReadme, isWSL } from './utils'; +import { BuildModeWebpackPlugin } from './BuildModeWebpackPlugin.ts'; +import { DIST_DIR, SOURCE_DIR } from './constants.ts'; +import { getCPConfigVersion, getEntries, getPackageJson, getPluginJson, hasReadme, isWSL } from './utils.ts'; const pluginJson = getPluginJson(); const cpVersion = getCPConfigVersion(); @@ -43,7 +43,8 @@ const config = async (env: Env): Promise => { cache: { type: 'filesystem', buildDependencies: { - config: [__filename], + // __filename doesnt work in Node 24 + config: [path.resolve(process.cwd(), '.config', 'webpack', 'webpack.config.ts')], }, }, @@ -194,7 +195,7 @@ const config = async (env: Env): Promise => { new BuildModeWebpackPlugin(), virtualPublicPath, // Insert create plugin version information into the bundle - new BannerPlugin({ + new webpack.BannerPlugin({ banner: '/* [create-plugin] version: ' + cpVersion + ' */', raw: true, entryOnly: true, diff --git a/examples/panel-datalinks/package-lock.json b/examples/panel-datalinks/package-lock.json index 5275d6c88..2a300dc8d 100644 --- a/examples/panel-datalinks/package-lock.json +++ b/examples/panel-datalinks/package-lock.json @@ -23,7 +23,7 @@ "@babel/core": "^7.21.4", "@grafana/eslint-config": "^8.0.0", "@grafana/eslint-plugin-plugins": "^0.1.0", - "@grafana/plugin-e2e": "^2.0.1", + "@grafana/plugin-e2e": "^2.0.2", "@grafana/plugin-meta-extractor": "^0.0.2", "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.52.0", @@ -1589,13 +1589,13 @@ "license": "MIT" }, "node_modules/@grafana/plugin-e2e": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-2.0.1.tgz", - "integrity": "sha512-NR/yQ92NiYWY1d7lBNkIKQDfRxOtXeq2deD4MS0S0mg/B88f6Gko4mxkw7p/wYPOdBESUArU+iDkz0QSJqrlBQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-2.0.2.tgz", + "integrity": "sha512-aLVs4VgZgi5pq2YynirrZQ8p8W7XZsliw5Dyk9Hdb7DfcIMYU7g1/rERYuwzsdtH1BVvEp5JwmEE16EPcbf80w==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@grafana/e2e-selectors": "^12.1.0-241536", + "@grafana/e2e-selectors": "^12.1.0-242212", "semver": "^7.5.4", "uuid": "^11.0.2", "yaml": "^2.3.4" @@ -1608,9 +1608,9 @@ } }, "node_modules/@grafana/plugin-e2e/node_modules/@grafana/e2e-selectors": { - "version": "12.1.0-242149", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-12.1.0-242149.tgz", - "integrity": "sha512-2pW9nntBfHxHSHudUBXHh9Sxl2/yDSTfn8cRmZkOOrUH3q6VnoxQJ8i8avnTw8uBGQq7xK7WjiTbWIKZ98MR0Q==", + "version": "12.1.0-243857", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-12.1.0-243857.tgz", + "integrity": "sha512-iC99rVZWSYbnowzzrYHiLppnMLD+GHVgFkyybh5CN/OzE6L0LaMGRJOcK39FvDxeNo7SbExskANLJEwyPLYXWw==", "dev": true, "license": "Apache-2.0", "dependencies": { diff --git a/examples/panel-datalinks/package.json b/examples/panel-datalinks/package.json index b12649b4b..b646b8d42 100644 --- a/examples/panel-datalinks/package.json +++ b/examples/panel-datalinks/package.json @@ -20,7 +20,7 @@ "@babel/core": "^7.21.4", "@grafana/eslint-config": "^8.0.0", "@grafana/eslint-plugin-plugins": "^0.1.0", - "@grafana/plugin-e2e": "^2.0.1", + "@grafana/plugin-e2e": "^2.0.2", "@grafana/plugin-meta-extractor": "^0.0.2", "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.52.0",