From aa4f81641b5974bf839cd5ba446bc742df2fa7fd Mon Sep 17 00:00:00 2001 From: Brian Mann Date: Thu, 22 Jun 2017 18:29:18 -0400 Subject: [PATCH] deploy: specify files to include when copying packages for dist --- packages/driver/package.json | 4 ++++ packages/electron/package.json | 4 ++++ packages/example/package.json | 4 ++++ packages/https-proxy/package.json | 3 +++ packages/launcher/package.json | 3 +++ packages/reporter/package.json | 6 +++++- packages/runner/package.json | 2 +- packages/server/package.json | 4 ++++ packages/socket/package.json | 3 +++ packages/static/package.json | 4 ++++ scripts/deploy/build.coffee | 10 +++++----- scripts/deploy/util/packages.coffee | 2 +- 12 files changed, 41 insertions(+), 8 deletions(-) diff --git a/packages/driver/package.json b/packages/driver/package.json index b70e3c2fcf..51feec04a3 100644 --- a/packages/driver/package.json +++ b/packages/driver/package.json @@ -9,6 +9,10 @@ "clean-deps": "rm -rf node_modules", "test": "gulp test" }, + "files": [ + "dist", + "lib" + ], "devDependencies": { "@cypress/bower-kendo-ui": "0.0.2", "angular": "^1.3.1", diff --git a/packages/electron/package.json b/packages/electron/package.json index 066b078c70..9e8bebe6c8 100644 --- a/packages/electron/package.json +++ b/packages/electron/package.json @@ -14,6 +14,10 @@ "bin": { "cypress-electron": "./bin/cypress-electron" }, + "files": [ + "dist", + "lib" + ], "devDependencies": { "@cypress/releaser": "0.1.12", "chai": "^3.5.0", diff --git a/packages/example/package.json b/packages/example/package.json index b62a2da67a..1dcae8f7b8 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -16,6 +16,10 @@ "lint": "$(bin-up eslint) --fix *.js bin/*.js lib/*.js test/*.js", "pretest": "npm run lint" }, + "files": [ + "cypress", + "lib" + ], "devDependencies": { "@cypress/releaser": "0.1.12", "bin-up": "^1.0.1", diff --git a/packages/https-proxy/package.json b/packages/https-proxy/package.json index bca9e3867c..a45957a91e 100644 --- a/packages/https-proxy/package.json +++ b/packages/https-proxy/package.json @@ -11,6 +11,9 @@ "https": "node https.js", "release": "releaser" }, + "files": [ + "lib" + ], "devDependencies": { "@cypress/releaser": "0.1.12", "chai": "^3.5.0", diff --git a/packages/launcher/package.json b/packages/launcher/package.json index 2a5b83b5ac..831d1ea3e4 100644 --- a/packages/launcher/package.json +++ b/packages/launcher/package.json @@ -14,6 +14,9 @@ "lint-coffee": "../coffee/node_modules/.bin/coffeelint test/*.coffee test/**/*.coffee", "format-ts": "prettier --no-semi --single-quote --write lib/*.ts lib/**/*.ts" }, + "files": [ + "lib" + ], "devDependencies": { "@cypress/releaser": "0.1.12", "@types/bluebird": "^3.5.3", diff --git a/packages/reporter/package.json b/packages/reporter/package.json index 27bb521791..6bb95bff31 100644 --- a/packages/reporter/package.json +++ b/packages/reporter/package.json @@ -2,7 +2,7 @@ "name": "@packages/reporter", "version": "0.0.0", "private": true, - "main": "lib/reporter", + "main": "lib/reporter.js", "browser": "src/main", "scripts": { "postinstall": "echo '@packages/reporter needs: npm run build'", @@ -14,6 +14,10 @@ "test": "node ./scripts/test.js", "lint": "$(bin-up eslint) --fix lib/*.js scripts/*.js src/*.js* src/**/*.js*" }, + "files": [ + "lib", + "dist" + ], "browserify": { "transform": [ [ diff --git a/packages/runner/package.json b/packages/runner/package.json index ca2810e199..89d279d276 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -15,7 +15,7 @@ }, "files": [ "dist", - "lib/runner.js" + "lib" ], "devDependencies": { "@cypress/react-tooltip": "^0.2.4", diff --git a/packages/server/package.json b/packages/server/package.json index 6f320934e7..e837e687f4 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -23,6 +23,10 @@ "coveralls": "cat ./coverage/lcov.info | coveralls", "lint": "../coffee/node_modules/.bin/coffeelint test/*.coffee test/unit/*.coffee test/integration/*.coffee" }, + "files": [ + "config", + "lib" + ], "devDependencies": { "body-parser": "1.12.4", "chokidar-cli": "^1.2.0", diff --git a/packages/socket/package.json b/packages/socket/package.json index a571a9edf2..efef150e5c 100644 --- a/packages/socket/package.json +++ b/packages/socket/package.json @@ -8,6 +8,9 @@ "test-watch": "NODE_ENV=test mocha --watch", "clean-deps": "rm -rf node_modules" }, + "files": [ + "lib" + ], "dependencies": { "socket.io": "1.4.5", "socket.io-client": "1.4.5" diff --git a/packages/static/package.json b/packages/static/package.json index 8b20fb8873..41c331a4ee 100644 --- a/packages/static/package.json +++ b/packages/static/package.json @@ -8,6 +8,10 @@ "build": "gulp build", "test": "echo 'Nothing to test yet'" }, + "files": [ + "dist", + "lib" + ], "devDependencies": { "@cypress/icons": "0.5.4", "gulp": "^3.9.1" diff --git a/scripts/deploy/build.coffee b/scripts/deploy/build.coffee index f18ff87984..984d68ac6d 100644 --- a/scripts/deploy/build.coffee +++ b/scripts/deploy/build.coffee @@ -60,12 +60,12 @@ module.exports = (platform, version) -> Promise .bind(@) - .then(cleanupPlatform) - .then(buildPackages) + # .then(cleanupPlatform) + # .then(buildPackages) .then(copyPackages) - .then(npmInstallPackages) - .then(createRootPackage) - .then(symlinkPackages) + # .then(npmInstallPackages) + # .then(createRootPackage) + # .then(symlinkPackages) # .then(@convertCoffeeToJs) # .then(@obfuscate) # .then(@cleanupSrc) diff --git a/scripts/deploy/util/packages.coffee b/scripts/deploy/util/packages.coffee index 9fbfd0d01d..5dcd86be8c 100644 --- a/scripts/deploy/util/packages.coffee +++ b/scripts/deploy/util/packages.coffee @@ -47,6 +47,7 @@ copyAllToDist = (distDir) -> ## and convert to relative paths DEFAULT_PATHS .concat(json.files or []) + .concat(json.main or []) .map (file) -> path.join(pkg, file) .map(copyRelativePathToDist, {concurrency: 1}) @@ -70,7 +71,6 @@ copyAllToDist = (distDir) -> .map(copyPackage, {concurrency: 1}) .then -> console.log("Finished Copying", new Date() - started) - .delay(10000) npmInstallAll = (pathToPackages) -> ## 1,060,495,784 bytes (1.54 GB on disk) for 179,156 items