From aa7e6cf55f0264a3c7a52f28e15e339655e77f26 Mon Sep 17 00:00:00 2001
From: Steven Vachon <contact@svachon.com>
Date: Fri, 6 Mar 2020 12:25:55 -0500
Subject: [PATCH] @grafana/e2e: fix empty bundle files (#22607)

* Minor changes

* Revert CLI to JavaScript

... as Rollup is only accepts ESM modules and TypeScript would need to use the new incremental builds feature which causes weird Redux module errors.
---
 packages/grafana-e2e/bin/grafana-e2e.js         |  9 +--------
 .../grafana-e2e/{src/cli/index.ts => cli.js}    | 17 ++++++++---------
 packages/grafana-e2e/package.json               |  1 +
 packages/grafana-e2e/rollup.config.ts           |  4 ++--
 packages/grafana-e2e/src/bin/grafana-e2e.ts     |  5 -----
 packages/grafana-e2e/tsconfig.json              |  1 -
 6 files changed, 12 insertions(+), 25 deletions(-)
 rename packages/grafana-e2e/{src/cli/index.ts => cli.js} (69%)
 delete mode 100644 packages/grafana-e2e/src/bin/grafana-e2e.ts

diff --git a/packages/grafana-e2e/bin/grafana-e2e.js b/packages/grafana-e2e/bin/grafana-e2e.js
index 1d4d474a768..e2aefb16e00 100755
--- a/packages/grafana-e2e/bin/grafana-e2e.js
+++ b/packages/grafana-e2e/bin/grafana-e2e.js
@@ -1,10 +1,3 @@
 #!/usr/bin/env node
 
-// This file is used only for internal executions
-
-require('ts-node').register({
-  project: `${__dirname}/../tsconfig.json`,
-  transpileOnly: true,
-});
-
-require('../src/cli/index.ts').default();
+require('../cli')();
diff --git a/packages/grafana-e2e/src/cli/index.ts b/packages/grafana-e2e/cli.js
similarity index 69%
rename from packages/grafana-e2e/src/cli/index.ts
rename to packages/grafana-e2e/cli.js
index 1d7c38fcc5f..0230cdac716 100644
--- a/packages/grafana-e2e/src/cli/index.ts
+++ b/packages/grafana-e2e/cli.js
@@ -1,16 +1,15 @@
-import { resolve, sep } from 'path';
-import execa, { Options } from 'execa';
-import program from 'commander';
+const execa = require('execa');
+const program = require('commander');
+const { resolve, sep } = require('path');
 
-const cypress = (commandName: string) => {
+const cypress = commandName => {
   // Support running an unpublished dev build
-  const parentPath = resolve(`${__dirname}/../`);
-  const parentDirname = parentPath.split(sep).pop();
-  const projectPath = resolve(`${parentPath}${parentDirname === 'dist' ? '/..' : ''}`);
+  const dirname = __dirname.split(sep).pop();
+  const projectPath = resolve(`${__dirname}${dirname === 'dist' ? '/..' : ''}`);
 
   const cypressOptions = [commandName, '--env', `CWD=${process.cwd()}`, `--project=${projectPath}`];
 
-  const execaOptions: Options = {
+  const execaOptions = {
     cwd: __dirname,
     stdio: 'inherit',
   };
@@ -20,7 +19,7 @@ const cypress = (commandName: string) => {
     .catch(error => console.error(error.message));
 };
 
-export default () => {
+module.exports = () => {
   const configOption = '-c, --config <path>';
   const configDescription = 'path to JSON file where configuration values are set; defaults to "cypress.json"';
 
diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json
index 65e79e9b579..b587f584d62 100644
--- a/packages/grafana-e2e/package.json
+++ b/packages/grafana-e2e/package.json
@@ -5,6 +5,7 @@
   "version": "6.7.0-pre",
   "description": "Grafana End-to-End Test Library",
   "keywords": [
+    "cli",
     "grafana",
     "e2e",
     "typescript"
diff --git a/packages/grafana-e2e/rollup.config.ts b/packages/grafana-e2e/rollup.config.ts
index d18f81e37f7..d8219f2c60a 100644
--- a/packages/grafana-e2e/rollup.config.ts
+++ b/packages/grafana-e2e/rollup.config.ts
@@ -20,8 +20,8 @@ const buildCjsPackage = ({ env }) => ({
     copy({
       flatten: false,
       targets: [
-        { src: 'compiled/bin/**/*.*', dest: 'dist/' },
-        { src: 'compiled/cli/**/*.*', dest: 'dist/' },
+        { src: 'bin/**/*.*', dest: 'dist/bin/' },
+        { src: 'cli.js', dest: 'dist/' },
         { src: 'cypress.json', dest: 'dist/' },
         { src: 'cypress/**/*.+(js|ts)', dest: 'dist/cypress/' },
       ],
diff --git a/packages/grafana-e2e/src/bin/grafana-e2e.ts b/packages/grafana-e2e/src/bin/grafana-e2e.ts
deleted file mode 100644
index 6542c3ba318..00000000000
--- a/packages/grafana-e2e/src/bin/grafana-e2e.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import cli from '../cli/index';
-
-cli();
diff --git a/packages/grafana-e2e/tsconfig.json b/packages/grafana-e2e/tsconfig.json
index 997a3817e55..7e51e9fbda7 100644
--- a/packages/grafana-e2e/tsconfig.json
+++ b/packages/grafana-e2e/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
     "declarationDir": "dist",
-    "module": "commonjs",
     "outDir": "compiled",
     "rootDirs": ["."],
     "typeRoots": ["node_modules/@types"],