diff --git a/package.json b/package.json index 95107597..1b226c7f 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "lint:js": "eslint .", "node-test": "mocha test/**/*.js", "node-test-with-coverage": "nyc --reporter lcov npm run-script node-test && node_modules/.bin/codecov", - "smoke-test": "./run-smoke-test.sh smoke-test.sh", - "smoke-test-yarn": "./run-smoke-test.sh smoke-test-yarn.sh", + "smoke-test": "cd smoke-test-app && ./smoke-test.sh", + "smoke-test-yarn": "cd smoke-test-app && ./smoke-test-yarn.sh", "start": "ember serve", "test": "npm run-script lint && npm run-script node-test" }, diff --git a/run-smoke-test.sh b/run-smoke-test.sh deleted file mode 100755 index 99c0e515..00000000 --- a/run-smoke-test.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -ex -rm ember-try*.tgz || true -npm pack -now=$(date +%s) -mv ember-try*.tgz "ember-try-${now}.tgz" -if [[ $npm_execpath =~ ^.*yarn.*$ ]]; then - cd smoke-test-app && yarn upgrade "ember-try@file:../ember-try-${now}.tgz" && yarn install && "./${1}" -else - if [[ $(npm -v | cut -d '.' -f 1) -lt 5 ]]; then - cd smoke-test-app && json -I -f package.json -e "this.devDependencies['ember-try']='../ember-try-${now}.tgz'" && npm install && "./${1}" - else - cd smoke-test-app && npm install --save-dev "../ember-try-${now}.tgz" && npm install && "./${1}" - fi -fi diff --git a/smoke-test-app/package.json b/smoke-test-app/package.json index 75ca6141..f6a01d3c 100644 --- a/smoke-test-app/package.json +++ b/smoke-test-app/package.json @@ -40,7 +40,6 @@ "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.2", "ember-source": "~3.22.0", - "ember-try": "file:../", "eslint-plugin-ember": "^8.14.0", "loader.js": "^4.7.0", "qunit-dom": "^1.5.0" @@ -50,5 +49,11 @@ }, "engines": { "node": "6.* || 8.* || >= 10.*" + }, + "ember-addon": { + "#": "use ember-try as an 'in-repo' addon", + "paths": [ + "../" + ] } }