@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

@@ -1,10 +1,3 @@
 #!/usr/bin/env node
 
-// This file is used only for internal executions
+require('../cli')();
-
-require('ts-node').register({
-  project: `${__dirname}/../tsconfig.json`,
-  transpileOnly: true,
-});
-
-require('../src/cli/index.ts').default();

packages/grafana-e2e/cli.js

@@ -1,16 +1,15 @@
-import { resolve, sep } from 'path';
+const execa = require('execa');
-import execa, { Options } from 'execa';
+const program = require('commander');
-import program from 'commander';
+const { resolve, sep } = require('path');
 
-const cypress = (commandName: string) => {
+const cypress = commandName => {
   // Support running an unpublished dev build
-  const parentPath = resolve(`${__dirname}/../`);
+  const dirname = __dirname.split(sep).pop();
-  const parentDirname = parentPath.split(sep).pop();
+  const projectPath = resolve(`${__dirname}${dirname === 'dist' ? '/..' : ''}`);
-  const projectPath = resolve(`${parentPath}${parentDirname === '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"';
 

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"

packages/grafana-e2e/rollup.config.ts

@@ -20,8 +20,8 @@ const buildCjsPackage = ({ env }) => ({
     copy({
       flatten: false,
       targets: [
-        { src: 'compiled/bin/**/*.*', dest: 'dist/' },
+        { src: 'bin/**/*.*', dest: 'dist/bin/' },
-        { src: 'compiled/cli/**/*.*', dest: 'dist/' },
+        { src: 'cli.js', dest: 'dist/' },
         { src: 'cypress.json', dest: 'dist/' },
         { src: 'cypress/**/*.+(js|ts)', dest: 'dist/cypress/' },
       ],

packages/grafana-e2e/src/bin/grafana-e2e.ts

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import cli from '../cli/index';
-
-cli();

packages/grafana-e2e/tsconfig.json

@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
     "declarationDir": "dist",
-    "module": "commonjs",
     "outDir": "compiled",
     "rootDirs": ["."],
     "typeRoots": ["node_modules/@types"],