ember-cli-code-coverage · rwjblue · Sep 21, 2020 · Sep 16, 2020 · Sep 16, 2020 · Sep 16, 2020
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,5 +21,8 @@ jobs:
           node-version: 10
 
       - run: yarn install --no-lockfile
+
       - run: yarn lint:js
-      - run: yarn node-test
+        working-directory: packages/ember-cli-code-coverage
+
+      - run: yarn test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,9 @@ jobs:
 
       - name: auto-dist-tag
         run: npx auto-dist-tag@1 --write
+        working-directory: packages/ember-cli-code-coverage
 
       - run: npm publish
+        working-directory: packages/ember-cli-code-coverage
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -1,25 +1,14 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
-# compiled output
-/dist/
-/tmp/
-
 # dependencies
-/bower_components/
-/node_modules/
+bower_components/
+node_modules/
 
 # misc
-/.env*
-/.pnp*
-/.sass-cache
-/connect.lock
-/coverage/
-/libpeerconnection.log
-/npm-debug.log*
-/testem.log
-/yarn-error.log
+npm-debug.log*
+yarn-error.log
 
 # ember-try
-/.node_modules.ember-try/
+.node_modules.ember-try/
 /bower.json.ember-try
 /package.json.ember-try
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,10 +1,9 @@
-# Release
+# Release Process
 
 Releases are mostly automated using
 [release-it](https://github.com/release-it/release-it/) and
 [lerna-changelog](https://github.com/lerna/lerna-changelog/).
 
-
 ## Preparation
 
 Since the majority of the actual release process is automated, the primary
@@ -25,39 +24,33 @@ When reviewing merged PR's the labels to be used are:
 * internal - Used for internal changes that still require a mention in the
   changelog/release notes.
 
-
 ## Release
 
 Once the prep work is completed, the actual release is straight forward:
 
-* First ensure that you have `release-it` installed globally, generally done by
-  using one of the following commands:
+* First, ensure that you have installed your projects dependencies:
 
+```sh
+yarn install
 ```
-# using https://volta.sh
-volta install release-it
 
-# using Yarn
-yarn global add release-it
+* Second, ensure that you have obtained a
+  [GitHub personal access token][generate-token] with the `repo` scope (no
+  other permissions are needed). Make sure the token is available as the
+  `GITHUB_AUTH` environment variable.
 
-# using npm
-npm install --global release-it
-```
+  For instance:
 
-* Second, ensure that you have installed your projects dependencies:
+  ```bash
+  export GITHUB_AUTH=abc123def456
+  ```
 
-```
-yarn install
-```
+[generate-token]: https://github.com/settings/tokens/new?scopes=repo&description=GITHUB_AUTH+env+variable
 
-* And last (but not least 😁) do your release. It requires a
-  [GitHub personal access token](https://github.com/settings/tokens) as
-  `$GITHUB_AUTH` environment variable. Only "repo" access is needed; no "admin"
-  or other scopes are required.
+* And last (but not least 😁) do your release.
 
-```
-export GITHUB_AUTH="f941e0..."
-release-it
+```sh
+npx release-it
 ```
 
 [release-it](https://github.com/release-it/release-it/) manages the actual

diff --git a/package.json b/package.json
@@ -1,86 +1,25 @@
 {
-  "name": "ember-cli-code-coverage",
-  "version": "1.0.0",
-  "description": "Code coverage for ember projects using Istanbul",
-  "keywords": [
-    "ember-addon"
-  ],
-  "repository": "https://github.com/kategengler/ember-cli-code-coverage",
-  "license": "MIT",
-  "author": "Katie Gengler",
-  "contributors": [
-    "Matthew Dahl (https://github.com/sandersky)",
-    "Robert Jackson (https://github.com/rwjblue)",
-    "Robert Wagner (https://github.com/rwwagner90)"
-  ],
-  "directories": {
-    "doc": "doc",
-    "test": "tests"
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:kategengler/ember-cli-code-coverage.git"
   },
+  "workspaces": [
+    "packages/*",
+    "test-packages/*"
+  ],
   "scripts": {
-    "browser-test": "COVERAGE=true ember test",
-    "lint:hbs": "ember-template-lint .",
-    "lint:js": "eslint .",
-    "node-test": "mocha ./test/{integration,unit}/**/*-test.js",
-    "test": "npm run-script lint:js && npm run-script node-test"
-  },
-  "dependencies": {
-    "babel-plugin-istanbul": "^6.0.0",
-    "body-parser": "^1.19.0",
-    "ember-cli-version-checker": "^5.1.1",
-    "fs-extra": "^9.0.0",
-    "istanbul-lib-coverage": "^3.0.0",
-    "istanbul-lib-report": "^3.0.0",
-    "istanbul-reports": "^3.0.2",
-    "node-dir": "^0.1.17",
-    "walk-sync": "^2.1.0"
+    "test": "mocha test-packages/*-test.js"
   },
   "devDependencies": {
-    "@ember/optional-features": "^1.3.0",
-    "@glimmer/component": "^1.0.0",
-    "@glimmer/tracking": "^1.0.0",
-    "babel-eslint": "^10.1.0",
-    "broccoli-asset-rev": "^3.0.0",
     "chai": "^4.2.0",
     "chai-files": "^1.4.0",
-    "ember-auto-import": "^1.5.3",
-    "ember-cli": "~3.16.2",
-    "ember-cli-addon-tests": "^0.11.0",
-    "ember-cli-babel": "^7.17.2",
-    "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-htmlbars": "^4.2.2",
-    "ember-cli-inject-live-reload": "^2.0.2",
-    "ember-cli-sri": "^2.1.1",
-    "ember-cli-uglify": "^3.0.0",
-    "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-exam": "1.0.0",
-    "ember-export-application-global": "^2.0.1",
-    "ember-load-initializers": "^2.1.1",
-    "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.6.0",
-    "ember-resolver": "^7.0.0",
-    "ember-source": "~3.16.0",
-    "ember-source-channel-url": "^2.0.1",
-    "ember-template-lint": "^2.8.0",
-    "ember-try": "^1.4.0",
-    "eslint": "^7.1.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-ember": "^8.5.2",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "fixturify": "^0.3.4",
-    "glob": "^7.1.3",
-    "loader.js": "^4.7.0",
+    "execa": "^4.0.3",
     "mocha": "^5.2.0",
-    "prettier": "^2.0.5",
-    "qunit-dom": "^1.0.0",
-    "release-it": "^13.6.0",
-    "release-it-lerna-changelog": "^2.3.0",
-    "rimraf": "^2.6.2",
-    "sinon": "^4.2.2"
-  },
-  "engines": {
-    "node": "10.* || >= 12"
+    "release-it": "^14.0.2",
+    "release-it-lerna-changelog": "^2.4.0",
+    "release-it-yarn-workspaces": "^1.5.0",
+    "rimraf": "^2.6.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -95,18 +34,22 @@
       "internal": ":house: Internal"
     }
   },
-  "ember": {
-    "edition": "octane"
-  },
-  "ember-addon": {
-    "configPath": "tests/dummy/config",
-    "before": "ember-cli-typescript"
-  },
   "release-it": {
     "plugins": {
       "release-it-lerna-changelog": {
         "infile": "CHANGELOG.md",
         "launchEditor": true
+      },
+      "release-it-yarn-workspaces": {
+        "additionalManifests": {
+          "dependencyUpdates": [
+            "test-packages/*/package.json"
+          ]
+        },
+        "publish": false,
+        "workspaces": [
+          "packages/*"
+        ]
       }
     },
     "git": {
@@ -116,8 +59,6 @@
       "release": true,
       "tokenRef": "GITHUB_AUTH"
     },
-    "npm": {
-      "publish": false
-    }
+    "npm": false
   }
 }
diff --git a/.editorconfig → ...ges/ember-cli-code-coverage/.editorconfig b/.editorconfig → ...ges/ember-cli-code-coverage/.editorconfig
diff --git a/.ember-cli → packages/ember-cli-code-coverage/.ember-cli b/.ember-cli → packages/ember-cli-code-coverage/.ember-cli
diff --git a/.eslintignore → ...ges/ember-cli-code-coverage/.eslintignore b/.eslintignore → ...ges/ember-cli-code-coverage/.eslintignore
diff --git a/.eslintrc.js → ...ages/ember-cli-code-coverage/.eslintrc.js b/.eslintrc.js → ...ages/ember-cli-code-coverage/.eslintrc.js
diff --git a/packages/ember-cli-code-coverage/.gitignore b/packages/ember-cli-code-coverage/.gitignore
@@ -0,0 +1,25 @@
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/.env*
+/.pnp*
+/.sass-cache
+/connect.lock
+/coverage/
+/libpeerconnection.log
+/npm-debug.log*
+/testem.log
+/yarn-error.log
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
diff --git a/.npmignore → packages/ember-cli-code-coverage/.npmignore b/.npmignore → packages/ember-cli-code-coverage/.npmignore
diff --git a/.npmrc → packages/ember-cli-code-coverage/.npmrc b/.npmrc → packages/ember-cli-code-coverage/.npmrc
diff --git a/.template-lintrc.js → ...ber-cli-code-coverage/.template-lintrc.js b/.template-lintrc.js → ...ber-cli-code-coverage/.template-lintrc.js
diff --git a/.watchmanconfig → ...s/ember-cli-code-coverage/.watchmanconfig b/.watchmanconfig → ...s/ember-cli-code-coverage/.watchmanconfig
diff --git a/LICENSE.md → packages/ember-cli-code-coverage/LICENSE.md b/LICENSE.md → packages/ember-cli-code-coverage/LICENSE.md
diff --git a/README.md → packages/ember-cli-code-coverage/README.md b/README.md → packages/ember-cli-code-coverage/README.md
diff --git a/config/ember-try.js → ...ber-cli-code-coverage/config/ember-try.js b/config/ember-try.js → ...ber-cli-code-coverage/config/ember-try.js
diff --git a/config/environment.js → ...r-cli-code-coverage/config/environment.js b/config/environment.js → ...r-cli-code-coverage/config/environment.js
diff --git a/ember-cli-build.js → ...mber-cli-code-coverage/ember-cli-build.js b/ember-cli-build.js → ...mber-cli-code-coverage/ember-cli-build.js
diff --git a/index.js → packages/ember-cli-code-coverage/index.js b/index.js → packages/ember-cli-code-coverage/index.js
diff --git a/lib/attach-middleware.js → ...li-code-coverage/lib/attach-middleware.js b/lib/attach-middleware.js → ...li-code-coverage/lib/attach-middleware.js
diff --git a/lib/config.js → ...ges/ember-cli-code-coverage/lib/config.js b/lib/config.js → ...ges/ember-cli-code-coverage/lib/config.js
diff --git a/lib/coverage-merge.js → ...r-cli-code-coverage/lib/coverage-merge.js b/lib/coverage-merge.js → ...r-cli-code-coverage/lib/coverage-merge.js
diff --git a/lib/templates/test-body-footer.html → ...erage/lib/templates/test-body-footer.html b/lib/templates/test-body-footer.html → ...erage/lib/templates/test-body-footer.html
diff --git a/packages/ember-cli-code-coverage/package.json b/packages/ember-cli-code-coverage/package.json
@@ -0,0 +1,93 @@
+{
+  "name": "ember-cli-code-coverage",
+  "version": "1.0.0",
+  "description": "Code coverage for ember projects using Istanbul",
+  "keywords": [
+    "ember-addon"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/kategengler/ember-cli-code-coverage",
+    "directory": "packages/ember-cli-code-coverage"
+  },
+  "license": "MIT",
+  "author": "Katie Gengler",
+  "contributors": [
+    "Matthew Dahl (https://github.com/sandersky)",
+    "Robert Jackson (https://github.com/rwjblue)",
+    "Robert Wagner (https://github.com/rwwagner90)"
+  ],
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
+  "scripts": {
+    "browser-test": "COVERAGE=true ember test",
+    "lint:hbs": "ember-template-lint .",
+    "lint:js": "eslint .",
+    "test": "npm run lint:js"
+  },
+  "dependencies": {
+    "babel-plugin-istanbul": "^6.0.0",
+    "body-parser": "^1.19.0",
+    "ember-cli-version-checker": "^5.1.1",
+    "fs-extra": "^9.0.0",
+    "istanbul-lib-coverage": "^3.0.0",
+    "istanbul-lib-report": "^3.0.0",
+    "istanbul-reports": "^3.0.2",
+    "node-dir": "^0.1.17",
+    "walk-sync": "^2.1.0"
+  },
+  "devDependencies": {
+    "@ember/optional-features": "^1.3.0",
+    "@glimmer/component": "^1.0.0",
+    "@glimmer/tracking": "^1.0.0",
+    "babel-eslint": "^10.1.0",
+    "broccoli-asset-rev": "^3.0.0",
+    "ember-auto-import": "^1.5.3",
+    "ember-cli": "~3.16.2",
+    "ember-cli-addon-tests": "^0.11.0",
+    "ember-cli-babel": "^7.17.2",
+    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-htmlbars": "^4.2.2",
+    "ember-cli-inject-live-reload": "^2.0.2",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-uglify": "^3.0.0",
+    "ember-disable-prototype-extensions": "^1.1.3",
+    "ember-exam": "1.0.0",
+    "ember-export-application-global": "^2.0.1",
+    "ember-load-initializers": "^2.1.1",
+    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^4.6.0",
+    "ember-resolver": "^7.0.0",
+    "ember-source": "~3.16.0",
+    "ember-source-channel-url": "^2.0.1",
+    "ember-template-lint": "^2.8.0",
+    "ember-try": "^1.4.0",
+    "eslint": "^7.1.0",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-ember": "^8.5.2",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.1.4",
+    "glob": "^7.1.3",
+    "loader.js": "^4.7.0",
+    "prettier": "^2.0.5",
+    "qunit-dom": "^1.0.0",
+    "release-it": "^13.6.0",
+    "release-it-lerna-changelog": "^2.3.0",
+    "sinon": "^4.2.2"
+  },
+  "engines": {
+    "node": "10.* || >= 12"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
+  "ember": {
+    "edition": "octane"
+  },
+  "ember-addon": {
+    "configPath": "tests/dummy/config",
+    "before": "ember-cli-typescript"
+  }
+}
diff --git a/testem.js → packages/ember-cli-code-coverage/testem.js b/testem.js → packages/ember-cli-code-coverage/testem.js
diff --git a/tests/.eslintrc.js → ...mber-cli-code-coverage/tests/.eslintrc.js b/tests/.eslintrc.js → ...mber-cli-code-coverage/tests/.eslintrc.js
diff --git a/tests/acceptance/smoke-test.js → ...e-coverage/tests/acceptance/smoke-test.js b/tests/acceptance/smoke-test.js → ...e-coverage/tests/acceptance/smoke-test.js
diff --git a/tests/dummy/app/app.js → ...-cli-code-coverage/tests/dummy/app/app.js b/tests/dummy/app/app.js → ...-cli-code-coverage/tests/dummy/app/app.js
diff --git a/...pp-with-in-repo-addon/tests/unit/.gitkeep → ...erage/tests/dummy/app/components/.gitkeep b/...pp-with-in-repo-addon/tests/unit/.gitkeep → ...erage/tests/dummy/app/components/.gitkeep
diff --git a/...p-with-in-repo-engine/tests/unit/.gitkeep → ...rage/tests/dummy/app/controllers/.gitkeep b/...p-with-in-repo-engine/tests/unit/.gitkeep → ...rage/tests/dummy/app/controllers/.gitkeep
diff --git a/test/fixtures/my-app/tests/unit/.gitkeep → ...coverage/tests/dummy/app/helpers/.gitkeep b/test/fixtures/my-app/tests/unit/.gitkeep → ...coverage/tests/dummy/app/helpers/.gitkeep
diff --git a/tests/dummy/app/index.html → ...-code-coverage/tests/dummy/app/index.html b/tests/dummy/app/index.html → ...-code-coverage/tests/dummy/app/index.html
diff --git a/tests/dummy/app/components/.gitkeep → ...-coverage/tests/dummy/app/models/.gitkeep b/tests/dummy/app/components/.gitkeep → ...-coverage/tests/dummy/app/models/.gitkeep
diff --git a/tests/dummy/app/router.js → ...i-code-coverage/tests/dummy/app/router.js b/tests/dummy/app/router.js → ...i-code-coverage/tests/dummy/app/router.js
diff --git a/tests/dummy/app/controllers/.gitkeep → ...-coverage/tests/dummy/app/routes/.gitkeep b/tests/dummy/app/controllers/.gitkeep → ...-coverage/tests/dummy/app/routes/.gitkeep
diff --git a/tests/dummy/app/styles/app.css → ...e-coverage/tests/dummy/app/styles/app.css b/tests/dummy/app/styles/app.css → ...e-coverage/tests/dummy/app/styles/app.css
diff --git a/tests/dummy/app/templates/application.hbs → ...tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs → ...tests/dummy/app/templates/application.hbs
diff --git a/...s/my-addon/addon/utils/my-covered-util.js → .../tests/dummy/app/utils/my-covered-util.js b/...s/my-addon/addon/utils/my-covered-util.js → .../tests/dummy/app/utils/my-covered-util.js
diff --git a/...my-addon/addon/utils/my-uncovered-util.js → ...ests/dummy/app/utils/my-uncovered-util.js b/...my-addon/addon/utils/my-uncovered-util.js → ...ests/dummy/app/utils/my-uncovered-util.js
diff --git a/tests/dummy/config/coverage-excludes.js → ...e/tests/dummy/config/coverage-excludes.js b/tests/dummy/config/coverage-excludes.js → ...e/tests/dummy/config/coverage-excludes.js
diff --git a/tests/dummy/config/coverage-nested-folder.js → ...ts/dummy/config/coverage-nested-folder.js b/tests/dummy/config/coverage-nested-folder.js → ...ts/dummy/config/coverage-nested-folder.js
diff --git a/tests/dummy/config/coverage-parallel.js → ...e/tests/dummy/config/coverage-parallel.js b/tests/dummy/config/coverage-parallel.js → ...e/tests/dummy/config/coverage-parallel.js
diff --git a/tests/dummy/config/environment.js → ...overage/tests/dummy/config/environment.js b/tests/dummy/config/environment.js → ...overage/tests/dummy/config/environment.js
diff --git a/tests/dummy/config/optional-features.json → ...tests/dummy/config/optional-features.json b/tests/dummy/config/optional-features.json → ...tests/dummy/config/optional-features.json
diff --git a/tests/dummy/config/targets.js → ...de-coverage/tests/dummy/config/targets.js b/tests/dummy/config/targets.js → ...de-coverage/tests/dummy/config/targets.js
diff --git a/tests/dummy/public/crossdomain.xml → ...verage/tests/dummy/public/crossdomain.xml b/tests/dummy/public/crossdomain.xml → ...verage/tests/dummy/public/crossdomain.xml
diff --git a/tests/dummy/public/robots.txt → ...de-coverage/tests/dummy/public/robots.txt b/tests/dummy/public/robots.txt → ...de-coverage/tests/dummy/public/robots.txt
diff --git a/tests/helpers/destroy-app.js → ...ode-coverage/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js → ...ode-coverage/tests/helpers/destroy-app.js
diff --git a/tests/helpers/module-for-acceptance.js → ...ge/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js → ...ge/tests/helpers/module-for-acceptance.js
diff --git a/tests/helpers/resolver.js → ...i-code-coverage/tests/helpers/resolver.js b/tests/helpers/resolver.js → ...i-code-coverage/tests/helpers/resolver.js
diff --git a/tests/helpers/start-app.js → ...-code-coverage/tests/helpers/start-app.js b/tests/helpers/start-app.js → ...-code-coverage/tests/helpers/start-app.js
diff --git a/tests/index.html → .../ember-cli-code-coverage/tests/index.html b/tests/index.html → .../ember-cli-code-coverage/tests/index.html
diff --git a/tests/dummy/app/helpers/.gitkeep → ...-code-coverage/tests/integration/.gitkeep b/tests/dummy/app/helpers/.gitkeep → ...-code-coverage/tests/integration/.gitkeep
diff --git a/tests/test-helper.js → ...er-cli-code-coverage/tests/test-helper.js b/tests/test-helper.js → ...er-cli-code-coverage/tests/test-helper.js
diff --git a/tests/dummy/app/models/.gitkeep → ...ber-cli-code-coverage/tests/unit/.gitkeep b/tests/dummy/app/models/.gitkeep → ...ber-cli-code-coverage/tests/unit/.gitkeep
diff --git a/tests/unit/utils/my-covered-util-test.js → .../tests/unit/utils/my-covered-util-test.js b/tests/unit/utils/my-covered-util-test.js → .../tests/unit/utils/my-covered-util-test.js
diff --git a/tests/dummy/app/routes/.gitkeep → ...s/ember-cli-code-coverage/vendor/.gitkeep b/tests/dummy/app/routes/.gitkeep → ...s/ember-cli-code-coverage/vendor/.gitkeep