diff --git a/eslint.config.cjs b/eslint.config.cjs index 9250426012c..e7d7e3bba41 100644 --- a/eslint.config.cjs +++ b/eslint.config.cjs @@ -13,7 +13,7 @@ const unicornPlugin = require('eslint-plugin-unicorn'); const grafanaConfig = require('@grafana/eslint-config/flat'); const grafanaPlugin = require('@grafana/eslint-plugin'); -const bettererConfig = require('./.betterer.eslint.config.cjs'); +const bettererConfig = require('./scripts/betterer/.betterer.eslint.config.js'); const getEnvConfig = require('./scripts/webpack/env-util.cjs'); /** diff --git a/package.json b/package.json index 60dd82c163b..66fa9552146 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "plugin:build:dev": "nx run-many -t dev --projects='tag:scope:plugin' --maxParallel=100", "generate-icons": "nx run grafana-icons:generate", "process-specs": "node --experimental-strip-types scripts/process-specs.ts", - "generate-apis": "yarn process-specs && rtk-query-codegen-openapi ./scripts/generate-rtk-apis.ts" + "generate-apis": "yarn process-specs && rtk-query-codegen-openapi ./scripts/generate-rtk-apis.cts" }, "grafana": { "whatsNewUrl": "https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v%[1]s-%[2]s/", diff --git a/pkg/tests/testinfra/testinfra.go b/pkg/tests/testinfra/testinfra.go index 198a9a976b2..c4587144235 100644 --- a/pkg/tests/testinfra/testinfra.go +++ b/pkg/tests/testinfra/testinfra.go @@ -209,6 +209,19 @@ func CreateGrafDir(t *testing.T, opts GrafanaOpts) (string, string) { err = os.MkdirAll(manifestDir, 0750) require.NoError(t, err) err = os.WriteFile(filepath.Join(manifestDir, "manifest.json"), []byte(`{ + "app/core/trustedTypePolicies.ts": { + "file": "public/build/trustedTypePolicies-pOmZ7Wr2.js", + "name": "trustedTypePolicies", + "src": "app/core/trustedTypePolicies.ts", + "isEntry": true, + "imports": [ + "_braintree-CW7sY1ng.js" + ] + }, + "_braintree-CW7sY1ng.js": { + "file": "public/build/braintree-CW7sY1ng.js", + "name": "braintree" + }, "app/index.ts": { "file": "public/build/index-3exGqndc.js", "src": "app/index.ts", diff --git a/scripts/betterer/.betterer.eslint.config.js b/scripts/betterer/.betterer.eslint.config.cjs similarity index 100% rename from scripts/betterer/.betterer.eslint.config.js rename to scripts/betterer/.betterer.eslint.config.cjs diff --git a/scripts/betterer/.betterer.ts b/scripts/betterer/.betterer.ts index 61e6153b4dd..cdbf52b7b30 100644 --- a/scripts/betterer/.betterer.ts +++ b/scripts/betterer/.betterer.ts @@ -79,7 +79,7 @@ function countEslintErrors() { } const runner = new ESLint({ - overrideConfigFile: './.betterer.eslint.config.js', + overrideConfigFile: './.betterer.eslint.config.cjs', warnIgnored: false, }); diff --git a/scripts/generate-alerting-rtk-apis.ts b/scripts/generate-alerting-rtk-apis.cts similarity index 100% rename from scripts/generate-alerting-rtk-apis.ts rename to scripts/generate-alerting-rtk-apis.cts diff --git a/scripts/generate-rtk-apis.ts b/scripts/generate-rtk-apis.cts similarity index 100% rename from scripts/generate-rtk-apis.ts rename to scripts/generate-rtk-apis.cts