Merge pull request #110 from cypress-io/link-packages

Link packages
2026-05-23 08:50:20 -05:00 · 2017-05-31 13:55:58 -04:00
parent e75a2ebb5f 8e3a173476
commit 2faeb3fdf4
65 changed files with 108 additions and 91 deletions
@@ -46,8 +46,6 @@ jobs:
          key: v5-{{ .Branch }}-deps-extension
      - restore_cache:
          key: v5-{{ .Branch }}-deps-https-proxy
-      - restore_cache:
-          key: v5-{{ .Branch }}-deps-icons
      - restore_cache:
          key: v5-{{ .Branch }}-deps-launcher
      - restore_cache:
@@ -107,10 +105,6 @@ jobs:
          key: v5-{{ .Branch }}-deps-https-proxy-{{ checksum "packages/https-proxy/package.json" }}
          paths:
            - packages/https-proxy/node_modules
-      - save_cache:
-          key: v5-{{ .Branch }}-deps-icons-{{ checksum "packages/icons/package.json" }}
-          paths:
-            - packages/icons/node_modules
      - save_cache:
          key: v5-{{ .Branch }}-deps-launcher-{{ checksum "packages/launcher/package.json" }}
          paths:
@@ -0,0 +1,23 @@
+/* eslint-disable no-console */
+
+const fse = require('fs-extra')
+const path = require('path')
+const globber = require('glob')
+const Promise = require('bluebird')
+
+const fs = Promise.promisifyAll(fse)
+const glob = Promise.promisify(globber)
+
+const pathToPackages = path.join('node_modules', '@')
+
+// glob all of the names of packages
+glob('./packages/*')
+.map((folder) => {
+  // strip off the initial './'
+  // ./packages/foo -> node_modules/@packages/foo
+  const dest = pathToPackages + folder.slice(2)
+
+  console.log('symlinking', folder, '->', dest)
+
+  return fs.ensureSymlinkAsync(folder, dest)
+})
@@ -13,7 +13,8 @@
    "test": "echo 'This runs just the CLI tests' && mocha",
    "test-watch": "mocha --watch",
    "test-e2e": "blah",
-    "postinstall": "npm run all install && npm run build",
+    "link": "node ./dev/link-packages.js",
+    "postinstall": "npm run link && npm run all install && npm run build",
    "clean-deps": "npm run all clean-deps"
  },
  "author": "",
@@ -1,5 +1,5 @@
 {
-  "name": "coffee",
+  "name": "@packages/coffee",
  "main": "index.js",
  "dependencies": {
    "coffee-script": "1.12.5"
@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-desktop-gui",
+  "name": "@packages/desktop-gui",
  "version": "0.4.9",
  "description": "Desktop GUI for managing Cypress projects.",
  "main": "lib/gui.js",
@@ -31,6 +31,7 @@
    "lib"
  ],
  "devDependencies": {
+    "@cypress/icons": "0.5.4",
    "@cypress/react-tooltip": "^0.2.2",
    "@cypress/releaser": "0.1.12",
    "babel-eslint": "^6.0.4",
@@ -1,4 +1,4 @@
-const cyIcons = require('../../icons')
+const cyIcons = require('@cypress/icons')

 module.exports = function (zunder) {
  const staticGlobs = {
@@ -1,5 +1,5 @@
 {
-  "name": "driver",
+  "name": "@packages/driver",
  "version": "1.0.0",
  "description": "",
  "scripts": {
@@ -1,7 +1,7 @@
 Promise = require("bluebird")
 fs = Promise.promisifyAll(require("fs-extra"))
 path = require("path")
-launcher = require("../../../../launcher")
+launcher = require("@packages/launcher")

 profileDir = path.join(__dirname, "../../../dist-test/browsers/chrome")
 themeDir = path.join(__dirname, "theme")
@@ -9,7 +9,7 @@ glob      = require("glob")
 coffee    = require("../../../../coffee")
 str       = require("string-to-stream")
 Promise   = require("bluebird")
-xhrs      = require("../../../../server/lib/controllers/xhrs")
+xhrs      = require("@packages/server/lib/controllers/xhrs")
 Runner    = require("./runner")

 args = require("minimist")(process.argv.slice(2))
@@ -1,3 +1,3 @@
-require("../coffee/register")
+require("@packages/coffee/register")

 module.exports = require("./lib/electron")
@@ -52,7 +52,7 @@ module.exports = {

  package: (options = {}) ->
    pkgr    = require("electron-packager")
-    icons   = require("../../icons")
+    icons   = require("@cypress/icons")

    pkgr    = Promise.promisify(pkgr)

@@ -1,14 +1,14 @@
 {
-  "name": "@cypress/core-electron",
+  "name": "@packages/electron",
  "version": "0.3.4",
  "electronVersion": "1.4.6",
  "description": "Cypress electron wrapper shell",
  "main": "index.js",
  "scripts": {
+    "postinstall": "echo '@packages/electron needs: npm run build'",
    "start": "./bin/cypress-electron",
-    "test": "mocha --compilers coffee:../coffee/register",
-    "preinstall": "cd ../icons; npm install",
-    "postinstall": "./bin/cypress-electron --install",
+    "test": "mocha --compilers coffee:@packages/coffee/register",
+    "build": "./bin/cypress-electron --install",
    "clean-deps": "rm -rf node_modules"
  },
  "bin": {
@@ -30,6 +30,7 @@
    "mocha": "^3.0.2"
  },
  "dependencies": {
+    "@cypress/icons": "^0.5.4",
    "bluebird": "^3.4.1",
    "electron-packager": "^7.2.0",
    "fs-extra": "^0.30.0",
@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-example",
+  "name": "@packages/example",
  "version": "0.8.0",
  "description": "Interal Cypress repo for managing https://example.cypress.io",
  "main": "index.js",
@@ -10,7 +10,7 @@ source     = require("vinyl-source-stream")
 Promise    = require("bluebird")
 coffeeify  = require("coffeeify")
 browserify = require("browserify")
-icons      = require("../icons")
+icons      = require("@cypress/icons")
 ext        = require("./")

 gulp.task "copy:socket:client", ->
@@ -1,3 +1,3 @@
-require("../coffee/register")
+require("@packages/coffee/register")

 module.exports = require("./lib/extension")
@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-extension",
+  "name": "@packages/extension",
  "version": "0.4.2",
  "description": "Cypress Chrome Extension",
  "main": "index.js",
@@ -46,6 +46,7 @@
    "vinyl-source-stream": "^1.1.0"
  },
  "dependencies": {
+    "@cypress/icons": "0.5.4",
    "bluebird": "^3.3.5",
    "lodash": "^4.11.2"
  }
@@ -2,7 +2,7 @@ require("../spec_helper")

 _          = require("lodash")
 http       = require("http")
-socket     = require("packages/socket")
+socket     = require("@packages/socket")
 Promise    = require("bluebird")
 background = require("../../app/background")

@@ -1,5 +1,5 @@
 test/unit
 test/integration
 --reporter spec
--compilers coffee:../coffee/register
+--compilers coffee:@packages/coffee/register
 --recursive
@@ -1,2 +1,2 @@
-require("../coffee/register")
+require("@packages/coffee/register")
 require("./test/helpers/https_server").start(8443)
@@ -1,3 +1,3 @@
-require("../coffee/register")
+require("@packages/coffee/register")

 module.exports = require("./lib/proxy")
@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-https-proxy",
+  "name": "@packages/https-proxy",
  "version": "0.1.5",
  "description": "",
  "main": "index.js",
@@ -1,5 +1,5 @@
 test/unit
 test/integration
 --reporter spec
--compilers coffee:../coffee/register
+--compilers coffee:@packages/coffee/register
 --recursive
@@ -1 +0,0 @@
-module.exports = require("@cypress/icons")
@@ -1,10 +0,0 @@
-{
-  "name": "icons",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo 'Nothing to test for the icons package'"
-  },
-  "dependencies": {
-    "@cypress/icons": "0.5.4"
-  }
-}
@@ -2,7 +2,7 @@

 // compile TypeScript files on the fly using
 // Node require hook project
-require('../ts/register')
+require('@packages/ts/register')
 const launcher = require("./lib/launcher")
 module.exports = launcher

@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-launcher",
+  "name": "@packages/launcher",
  "version": "0.1.1",
  "description": "Internal lib for spawning browser processes",
  "main": "index.js",
@@ -1,3 +1,3 @@
 test/unit
--compilers coffee:../coffee/register,ts:../ts/register
+--compilers coffee:@packages/coffee/register,ts:@packages/ts/register
 --recursive
@@ -1,10 +1,10 @@
 {
-  "name": "@cypress/core-reporter",
+  "name": "@packages/reporter",
  "version": "0.3.4",
  "main": "lib/reporter",
  "browser": "src/main",
  "scripts": {
-    "postinstall": "echo 'This project needs: npm run build'",
+    "postinstall": "echo '@packages/reporter needs: npm run build'",
    "build": "node ./scripts/build-dev.js",
    "build-prod": "node ./scripts/build-prod.js",
    "watch": "node ./scripts/watch.js",
@@ -12,6 +12,12 @@
    "clean-deps": "rm -rf node_modules",
    "test": "node ./scripts/test.js"
  },
+  "browserify": {
+    "transform": [["babelify", {
+      "presets": ["es2015", "react", "stage-1"],
+      "plugins": ["add-module-exports", "transform-decorators-legacy"] }
+    ]]
+  },
  "repository": {
    "type": "git",
    "url": "git+https://github.com/cypress-io/cypress-core-reporter.git"
@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-runner",
+  "name": "@packages/runner",
  "version": "0.3.11",
  "main": "lib/runner.js",
  "repository": {
@@ -12,7 +12,7 @@
  },
  "homepage": "https://github.com/cypress-io/cypress-core-runner#readme",
  "scripts": {
-    "postinstall": "echo 'This project needs: npm run build'",
+    "postinstall": "echo '@packages/runner needs: npm run build'",
    "build": "node ./scripts/build-dev.js",
    "build-prod": "node ./scripts/build-prod.js",
    "watch": "node ./scripts/watch.js",
@@ -6,7 +6,7 @@ import { observer } from 'mobx-react'
 import PropTypes from 'prop-types'
 import React, { Component } from 'react'
 import { findDOMNode } from 'react-dom'
-import { Reporter } from '../../../reporter'
+import { Reporter } from '@packages/reporter'

 import errorMessages from '../errors/error-messages'
 import windowUtil from '../lib/window-util'
@@ -2,7 +2,7 @@ import React from 'react'
 import { shallow } from 'enzyme'
 import sinon from 'sinon'

-import reporter from '../../../reporter'
+import reporter from '@packages/reporter'
 import Message from '../message/message'
 import State from '../lib/state'

@@ -12,7 +12,7 @@ expect       = require("chai").expect
 Promise      = require("bluebird")
 obfuscator   = require("obfuscator")
 runSequence  = require("run-sequence")
-cypressElectron = require("../../electron")
+cypressElectron = require("@packages/electron")
 log          = require("./log")
 meta         = require("./meta")
 pkg          = require("../package.json")
@@ -1,7 +1,7 @@
 process.env.UV_THREADPOOL_SIZE = 128
 require('graceful-fs').gracefulify(require('fs'))
-require("../ts/register")
-require("../coffee/register")
+require("@packages/ts/register")
+require("@packages/coffee/register")
 require && require.extensions && delete require.extensions[".litcoffee"]
 require && require.extensions && delete require.extensions[".coffee.md"]
 require("./lib/cypress").start(process.argv)
@@ -1,6 +1,6 @@
 _         = require("lodash")
 Promise   = require("bluebird")
-extension = require("../../../extension")
+extension = require("@packages/extension")

 ## match the w3c webdriver spec on return cookies
 ## https://w3c.github.io/webdriver/webdriver-spec.html#cookies
@@ -1,6 +1,6 @@
 fs       = require("fs-extra")
 Promise   = require("bluebird")
-extension = require("../../../extension")
+extension = require("@packages/extension")
 appData   = require("../util/app_data")
 utils     = require("./utils")

@@ -1,7 +1,7 @@
 fs       = require("fs-extra")
 path     = require("path")
 Promise  = require("bluebird")
-launcher = require("../../../launcher")
+launcher = require("@packages/launcher")
 appData  = require("../util/app_data")

 fs = Promise.promisifyAll(fs)
@@ -1,4 +1,4 @@
-socketIo = require("../../../socket")
+socketIo = require("@packages/socket")

 ## hold onto the client source + version in memory
 clientSource  = socketIo.getClientSource()
@@ -1,5 +1,5 @@
 send   = require("send")
-driver = require("../../../driver")
+driver = require("@packages/driver")

 module.exports = {
  handle: (req, res) ->
@@ -1,6 +1,6 @@
 _ = require("lodash")
 send = require("send")
-reporter = require("../../../reporter")
+reporter = require("@packages/reporter")

 module.exports = {
  handle: (req, res) ->
@@ -1,6 +1,6 @@
 _      = require("lodash")
 send   = require("send")
-runner = require("../../../runner")
+runner = require("@packages/runner")
 pkg    = require("../../package.json")

 module.exports = {
@@ -1,5 +1,5 @@
 send      = require("send")
-staticPkg = require("../../../static")
+staticPkg = require("@packages/static")

 module.exports = {
  handle: (req, res) ->
@@ -57,7 +57,7 @@ module.exports = {

        ## open the cypress electron wrapper shell app
        new Promise (resolve) ->
-          cypressElectron = require("../../electron")
+          cypressElectron = require("@packages/electron")
          fn = (code) ->
            ## juggle up the failures since our outer
            ## promise is expecting this object structure
@@ -1,8 +1,8 @@
 _             = require("lodash")
 uri           = require("url")
 Promise       = require("bluebird")
-cyDesktop     = require("../../../desktop-gui")
-extension     = require("../../../extension")
+cyDesktop     = require("@packages/desktop-gui")
+extension     = require("@packages/extension")
 contextMenu   = require("electron-context-menu")
 BrowserWindow = require("electron").BrowserWindow
 cwd           = require("../cwd")
@@ -5,7 +5,7 @@ app        = require("electron").app
 image      = require("electron").nativeImage
 Promise    = require("bluebird")
 Position   = require("electron-positioner")
-cyIcons    = require("../../../icons")
+cyIcons    = require("@cypress/icons")
 user       = require("../user")
 errors     = require("../errors")
 savedState = require("../saved_state")
@@ -2,7 +2,7 @@ _         = require("lodash")
 fs        = require("fs-extra")
 Promise   = require("bluebird")
 path      = require("path")
-cypressEx = require("../../example")
+cypressEx = require("@packages/example")
 glob      = require("glob")
 hbs       = require("hbs")
 cwd       = require("./cwd")
@@ -8,7 +8,7 @@ express      = require("express")
 Promise      = require("bluebird")
 evilDns      = require("evil-dns")
 httpProxy    = require("http-proxy")
-httpsProxy   = require("../../https-proxy")
+httpsProxy   = require("@packages/https-proxy")
 cors         = require("./util/cors")
 origin       = require("./util/origin")
 connect      = require("./util/connect")
@@ -3,7 +3,7 @@ fs            = require("fs-extra")
 path          = require("path")
 uuid          = require("node-uuid")
 Promise       = require("bluebird")
-socketIo      = require("../../socket")
+socketIo      = require("@packages/socket")
 open          = require("./util/open")
 pathHelpers   = require("./util/path_helpers")
 cwd           = require("./cwd")
@@ -1,5 +1,5 @@
 {
-  "name": "cypress",
+  "name": "@packages/server",
  "productName": "Cypress",
  "version": "0.19.2",
  "description": "Javascript Test Engine",
@@ -70,6 +70,7 @@
    "xvfb-maybe": "cypress-io/xvfb-maybe#c4a810c42d603949cd63b8cf245f6c239331d370"
  },
  "dependencies": {
+    "@cypress/icons": "0.5.4",
    "@ffmpeg-installer/ffmpeg": "1.0.3",
    "ansi_up": "^1.3.0",
    "babel-plugin-add-module-exports": "^0.2.1",
@@ -1,3 +1,3 @@
-require("../ts/register")
-require("../coffee/register")
+require("@packages/ts/register")
+require("@packages/coffee/register")
 require("./lib/repl")
@@ -40,7 +40,7 @@ describe "CLI Interface", ->
      done(err) if err

      pkg = JSON.parse(parse(stdout))
-      expect(pkg.name).to.eq("cypress")
+      expect(pkg.name).to.eq("@packages/server")
      expect(pkg.productName).to.eq("Cypress")
      done()

@@ -8,7 +8,7 @@ http       = require("http")
 Promise    = require("bluebird")
 electron   = require("electron")
 Fixtures   = require("../support/helpers/fixtures")
-extension  = require("#{root}../../packages/extension")
+extension  = require("@packages/extension")
 pkg        = require("#{root}package.json")
 git        = require("#{root}lib/util/git")
 bundle     = require("#{root}lib/util/bundle")
@@ -900,7 +900,7 @@ describe "lib/cypress", ->
    it "logs package.json and exits", ->
      cypress.start(["--return-pkg"])
      .then =>
-        expect(console.log).to.be.calledWithMatch('{"name":"cypress"')
+        expect(console.log).to.be.calledWithMatch('{"name":"@packages/server"')
        @expectExitWith(0)

  context "--version", ->
@@ -16,7 +16,7 @@ cjsxify       = require("cjsxify")
 streamToPromise = require("stream-to-promise")
 evilDns       = require("evil-dns")
 Promise       = require("bluebird")
-httpsServer   = require("#{root}../../packages/https-proxy/test/helpers/https_server")
+httpsServer   = require("@packages/https-proxy/test/helpers/https_server")
 pkg           = require("#{root}package.json")
 config        = require("#{root}lib/config")
 Server        = require("#{root}lib/server")
@@ -4,7 +4,7 @@ _             = require("lodash")
 rp            = require("request-promise")
 Promise       = require("bluebird")
 evilDns       = require("evil-dns")
-httpsServer   = require("#{root}../../packages/https-proxy/test/helpers/https_server")
+httpsServer   = require("@packages/https-proxy/test/helpers/https_server")
 buffers       = require("#{root}lib/util/buffers")
 config        = require("#{root}lib/config")
 Server        = require("#{root}lib/server")
@@ -6,8 +6,8 @@ ws          = require("ws")
 httpsAgent  = require("https-proxy-agent")
 evilDns     = require("evil-dns")
 Promise     = require("bluebird")
-socketIo    = require("#{root}../../packages/socket")
-httpsServer = require("#{root}../../packages/https-proxy/test/helpers/https_server")
+socketIo    = require("@packages/socket")
+httpsServer = require("@packages/https-proxy/test/helpers/https_server")
 config      = require("#{root}lib/config")
 Server      = require("#{root}lib/server")
 Automation  = require("#{root}lib/automation")
@@ -26,4 +26,4 @@ BROWSER=$BROWSER \
 xvfb-maybe --xvfb-run-args "-s \"-screen 0 1280x1024x8\"" mocha $SPEC \
 --fgrep "$FGREP" \
 --recursive \
--compilers ts:../ts/register,coffee:../coffee/register
+--compilers ts:@packages/ts/register,coffee:@packages/coffee/register
@@ -1,7 +1,7 @@
 require("../../spec_helper")

 _        = require("lodash")
-extension = require("#{root}../../../packages/extension")
+extension = require("@packages/extension")
 electron = require("electron")
 cache    = require("#{root}../lib/cache")
 logger   = require("#{root}../lib/logger")
@@ -1,6 +1,6 @@
 # require("../../spec_helper")
 #
-# extension = require("#{root}../../../packages/extension")
+# extension = require("@packages/extension")
 # Fixtures = require("../../support/helpers/fixtures")
 # project  = require("#{root}../lib/open_project")
 # Project  = require("#{root}../lib/project")
@@ -3,7 +3,7 @@ require("../spec_helper")
 path       = require("path")
 glob       = require("glob")
 Promise    = require("bluebird")
-cypressEx  = require("#{root}../../packages/example")
+cypressEx  = require("@packages/example")
 config     = require("#{root}lib/config")
 scaffold   = require("#{root}lib/scaffold")
 Fixtures   = require("#{root}/test/support/helpers/fixtures")
@@ -5,8 +5,8 @@
 # path         = require("path")
 # uuid         = require("node-uuid")
 # Promise      = require("bluebird")
-# socketIo     = require("#{root}../../packages/socket")
-# extension    = require("#{root}../../packages/extension")
+# socketIo     = require("@packages/socket")
+# extension    = require("@packages/extension")
 # httpsAgent   = require("https-proxy-agent")
 # open         = require("#{root}lib/util/open")
 # errors       = require("#{root}lib/errors")
@@ -1,5 +1,5 @@
 {
-  "name": "@cypress/core-socket",
+  "name": "@packages/socket",
  "version": "0.2.1",
  "description": "Cypress Shared Socket Libs",
  "main": "index.js",
@@ -1,5 +1,5 @@
 const gulp  = require("gulp")
-const icons = require("../icons")
+const icons = require("@cypress/icons")

 gulp.task("favicon", () => {
  return gulp.src(icons.getPathToFavicon("**/**"))
@@ -1,5 +1,5 @@
 {
-  "name": "static",
+  "name": "@packages/static",
  "main": "index.js",
  "scripts": {
    "postinstall": "echo 'This project needs: npm run build'",
@@ -7,7 +7,7 @@
    "test": "echo 'Nothing to test yet'"
  },
  "devDependencies": {
+    "@cypress/icons": "0.5.4",
    "gulp": "^3.9.1"
-  },
-  "dependencies": {}
+  }
 }
@@ -1,5 +1,5 @@
 {
-  "name": "ts",
+  "name": "@packages/ts",
  "version": "1.0.0",
  "description": "TypeScript runtime Node hook",
  "main": "index.js",
@@ -15,4 +15,4 @@ require('ts-node').register({
 })

 // do we need to prevent any other TypeScript hooks?
-// like ../coffee/register.js does?
+// like @packages/coffee/register.js does?
@@ -1 +1 @@
-require('./packages/server')
+require('@packages/server')