Merge pull request #11 from intergral/update_v11_0

Update v11 0

.betterer.ts

@@ -5,29 +5,43 @@ import path from 'path';
 import { glob } from 'glob';
 
 // Why are we ignoring these?
-// They're all deprecated/being removed soon so doesn't make sense to fix types
+// They're all deprecated/being removed so doesn't make sense to fix types
 const eslintPathsToIgnore = [
   'packages/grafana-e2e', // deprecated.
   'public/app/angular', // will be removed in Grafana 11
   'public/app/plugins/panel/graph', // will be removed alongside angular
+  'public/app/plugins/panel/table-old', // will be removed alongside angular
 ];
 
+// Avoid using functions that report the position of the issues, as this causes a lot of merge conflicts
 export default {
   'better eslint': () =>
     countEslintErrors()
       .include('**/*.{ts,tsx}')
       .exclude(new RegExp(eslintPathsToIgnore.join('|'))),
   'no undocumented stories': () => countUndocumentedStories().include('**/!(*.internal).story.tsx'),
+  'no gf-form usage': () =>
+    regexp(
+      /gf-form/gm,
+      'gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.'
+    ).include('**/*.{ts,tsx,html}'),
 };
 
 function countUndocumentedStories() {
   return new BettererFileTest(async (filePaths, fileTestResult) => {
     await Promise.all(
       filePaths.map(async (filePath) => {
         // look for .mdx import in the story file
-        const regex = new RegExp("^import.*.mdx';$", 'gm');
+        const mdxImportRegex = new RegExp("^import.*\\.mdx';$", 'gm');
+        // Looks for the "autodocs" string in the file
+        const autodocsStringRegex = /autodocs/;
+
         const fileText = await fs.readFile(filePath, 'utf8');
-        if (!regex.test(fileText)) {
+
+        const hasMdxImport = mdxImportRegex.test(fileText);
+        const hasAutodocsString = autodocsStringRegex.test(fileText);
+        // If both .mdx import and autodocs string are missing, add an issue
+        if (!hasMdxImport && !hasAutodocsString) {
           // In this case the file contents don't matter:
           const file = fileTestResult.addFile(filePath, '');
           // Add the issue to the first character of the file:
@@ -38,6 +52,28 @@ function countUndocumentedStories() {
   });
 }
 
+/**
+ *  Generic regexp pattern matcher, similar to @betterer/regexp.
+ *  The only difference is that the positions of the errors are not reported, as this may cause a lot of merge conflicts.
+ */
+function regexp(pattern: RegExp, issueMessage: string) {
+  return new BettererFileTest(async (filePaths, fileTestResult) => {
+    await Promise.all(
+      filePaths.map(async (filePath) => {
+        const fileText = await fs.readFile(filePath, 'utf8');
+        const matches = fileText.match(pattern);
+        if (matches) {
+          // File contents doesn't matter, since we're not reporting the position
+          const file = fileTestResult.addFile(filePath, '');
+          matches.forEach(() => {
+            file.addIssue(0, 0, issueMessage);
+          });
+        }
+      })
+    );
+  });
+}
+
 function countEslintErrors() {
   return new BettererFileTest(async (filePaths, fileTestResult, resolver) => {
     const { baseDirectory } = resolver;

.bingo/Variables.mk

@@ -2,12 +2,7 @@
 # All tools are designed to be build inside $GOBIN.
 BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 GOPATH ?= $(shell go env GOPATH)
-ifeq ($(OS),Windows_NT)
-	PATHSEP := $(if $(COMSPEC),;,:)
-	GOBIN  ?= $(firstword $(subst $(PATHSEP), ,$(subst \,/,${GOPATH})))/bin
-else
-	GOBIN  ?= $(firstword $(subst :, ,${GOPATH}))/bin
-endif
+GOBIN  ?= $(firstword $(subst :, ,${GOPATH}))/bin
 GO     ?= $(shell which go)
 
 # Below generated variables ensure that every time a tool under each variable is invoked, the correct version
@@ -40,11 +35,11 @@ $(DRONE): $(BINGO_DIR)/drone.mod
 	@echo "(re)installing $(GOBIN)/drone-v1.5.0"
 	@cd $(BINGO_DIR) && GOWORK=off CGO_ENABLED=0 $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone"
 
-GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.53.3
+GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.57.1
 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/golangci-lint-v1.53.3"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.53.3 "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	@echo "(re)installing $(GOBIN)/golangci-lint-v1.57.1"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.57.1 "github.com/golangci/golangci-lint/cmd/golangci-lint"
 
 JB := $(GOBIN)/jb-v0.5.1
 $(JB): $(BINGO_DIR)/jb.mod
@@ -64,9 +59,3 @@ $(SWAGGER): $(BINGO_DIR)/swagger.mod
 	@echo "(re)installing $(GOBIN)/swagger-v0.30.2"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=swagger.mod -o=$(GOBIN)/swagger-v0.30.2 "github.com/go-swagger/go-swagger/cmd/swagger"
 
-WIRE := $(GOBIN)/wire-v0.5.0
-$(WIRE): $(BINGO_DIR)/wire.mod
-	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/wire-v0.5.0"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=wire.mod -o=$(GOBIN)/wire-v0.5.0 "github.com/google/wire/cmd/wire"
-

.bingo/golangci-lint.mod

@@ -1,5 +1,7 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.20
+go 1.21
 
-require github.com/golangci/golangci-lint v1.53.3 // cmd/golangci-lint
+toolchain go1.21.6
+
+require github.com/golangci/golangci-lint v1.57.1 // cmd/golangci-lint