diff --git a/packages/desktop-gui/lib/.eslintrc.json b/packages/desktop-gui/lib/.eslintrc.json deleted file mode 100644 index 10d2238837..0000000000 --- a/packages/desktop-gui/lib/.eslintrc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "env": { - "node": true - } -} diff --git a/packages/desktop-gui/lib/gui.js b/packages/desktop-gui/lib/gui.js deleted file mode 100644 index 9175db3821..0000000000 --- a/packages/desktop-gui/lib/gui.js +++ /dev/null @@ -1,11 +0,0 @@ -const path = require('path') - -function file (name) { - return `file://${path.join(__dirname, '..', 'dist', name)}` -} - -module.exports = { - getPathToIndex () { - return file('index.html') - }, -} diff --git a/packages/desktop-gui/package.json b/packages/desktop-gui/package.json index 82830043f7..83a27dd462 100644 --- a/packages/desktop-gui/package.json +++ b/packages/desktop-gui/package.json @@ -57,7 +57,6 @@ }, "files": [ "dist", - "lib", "!lib/**/*_spec.jsx" ] } diff --git a/packages/driver/lib/resolve-dist.js b/packages/driver/lib/resolve-dist.js deleted file mode 100644 index 6e25f603a8..0000000000 --- a/packages/driver/lib/resolve-dist.js +++ /dev/null @@ -1,13 +0,0 @@ -const path = require('path') - -function dist (...args) { - const paths = [__dirname, '..', 'dist'].concat(args) - - return path.join(...paths) -} - -module.exports = { - getPathToDist (...args) { - return dist(...args) - }, -} diff --git a/packages/driver/package.json b/packages/driver/package.json index c254ef88cf..f06d71ff80 100644 --- a/packages/driver/package.json +++ b/packages/driver/package.json @@ -18,6 +18,7 @@ "@cypress/webpack-preprocessor": "0.0.0-development", "@cypress/what-is-circular": "1.0.1", "@packages/network": "0.0.0-development", + "@packages/resolve-dist": "0.0.0-development", "@packages/runner": "0.0.0-development", "@packages/server": "0.0.0-development", "@packages/ts": "0.0.0-development", @@ -78,7 +79,6 @@ "zone.js": "0.9.0" }, "files": [ - "lib", "patches" ], "workspaces": { diff --git a/packages/proxy/lib/http/util/inject.ts b/packages/proxy/lib/http/util/inject.ts index 837c6fcbe4..72bb703615 100644 --- a/packages/proxy/lib/http/util/inject.ts +++ b/packages/proxy/lib/http/util/inject.ts @@ -1,5 +1,5 @@ import { oneLine } from 'common-tags' -import runner from '@packages/runner/lib/resolve-dist' +import { getRunnerInjectionContents } from '@packages/resolve-dist' export function partial (domain) { return oneLine` @@ -10,7 +10,7 @@ export function partial (domain) { } export function full (domain) { - return runner.getInjectionContents().then((contents) => { + return getRunnerInjectionContents().then((contents) => { return oneLine`