Merge branch 'master' into develop

scripts/build/build-all.sh

@@ -35,6 +35,8 @@ go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build
 go run build.go -goos darwin -cc ${CCOSX64} ${OPT} build
 
 go run build.go -goos windows -cc ${CCWIN64} ${OPT} build
+
+# Do not remove CC from the linux build, its there for compatibility with Centos6
 CC=${CCX64} go run build.go ${OPT} build
 
 yarn install --pure-lockfile --no-progress

scripts/build/publish_test.go

@@ -105,6 +105,6 @@ func TestFileWalker(t *testing.T) {
 	incorrectPackageName := "grafana_5.2.0-474pre1_armfoo.deb"
 	_, err := mapPackage(incorrectPackageName, incorrectPackageName, []byte{})
 	if err == nil {
-		t.Errorf("Testing (%v), expected to fail due to an unrecognized arch, but signalled no error.", incorrectPackageName)
+		t.Errorf("Testing (%v), expected to fail due to an unrecognized arch, but signaled no error.", incorrectPackageName)
 	}
 }

scripts/build/release_publisher/main.go

@@ -41,12 +41,12 @@ func main() {
 	var builder releaseBuilder
 	var product string
 
-	archiveProviderRoot := "https://s3-us-west-2.amazonaws.com"
+	archiveProviderRoot := "https://dl.grafana.com"
 	buildArtifacts := completeBuildArtifactConfigurations
 
 	if enterprise {
 		product = "grafana-enterprise"
-		baseUrl = createBaseUrl(archiveProviderRoot, "grafana-enterprise-releases", product, nightly)
+		baseUrl = createBaseUrl(archiveProviderRoot, "enterprise", product, nightly)
 		var err error
 		buildArtifacts, err = filterBuildArtifacts([]artifactFilter{
 			{os: "deb", arch: "amd64"},
@@ -61,7 +61,7 @@ func main() {
 
 	} else {
 		product = "grafana"
-		baseUrl = createBaseUrl(archiveProviderRoot, "grafana-releases", product, nightly)
+		baseUrl = createBaseUrl(archiveProviderRoot, "oss", product, nightly)
 	}
 
 	if fromLocal {

scripts/webpack/webpack.hot.js

@@ -52,14 +52,23 @@ module.exports = merge(common, {
             options: {
               cacheDirectory: true,
               babelrc: false,
-              plugins: ['syntax-dynamic-import', 'react-hot-loader/babel'],
-            },
-          },
-          {
-            loader: 'ts-loader',
-            options: {
-              transpileOnly: true,
-              experimentalWatchApi: true,
+              plugins: [
+                [require('@rtsao/plugin-proposal-class-properties'), { loose: true }],
+                'angularjs-annotate',
+                'syntax-dynamic-import', // needed for `() => import()` in routes.ts
+                'react-hot-loader/babel',
+              ],
+              presets: [
+                [
+                  '@babel/preset-env',
+                  {
+                    targets: { browsers: 'last 3 versions' },
+                    useBuiltIns: 'entry',
+                  },
+                ],
+                '@babel/preset-typescript',
+                '@babel/preset-react',
+              ],
             },
           },
         ],