Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to pnpm for Workspace Management and Tests Refactoring. #398

Merged
merged 3 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 19 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,24 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
name: Install pnpm
with:
version: 8.10.3
run_install: false
- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- uses: volta-cli/action@v4
- run: yarn install --frozen-lockfile
- run: yarn lint:js
- run: pnpm install --frozen-lockfile
- run: pnpm lint:js
working-directory: packages/ember-cli-code-coverage
- run: yarn test
- run: pnpm test
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# dependencies
bower_components/
node_modules/
node_modules

# misc
npm-debug.log*
Expand All @@ -13,4 +12,7 @@ yarn-error.log
/bower.json.ember-try
/package.json.ember-try

.DS_Store
.DS_Store
coverage
dist
.build
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shared-workspace-lockfile=false
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Once the prep work is completed, the actual release is straight forward:
* First, ensure that you have installed your projects dependencies:

```sh
yarn install
pnpm install
```

* Second, ensure that you have obtained a
Expand Down
20 changes: 9 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,20 @@
"type": "git",
"url": "git@github.com:kategengler/ember-cli-code-coverage.git"
},
"workspaces": [
"packages/*",
"test-packages/*"
],
"scripts": {
"test": "jest --runInBand"
"test": "vitest"
},
"devDependencies": {
"chai-files": "^1.4.0",
"execa": "^4.0.3",
"fixturify-project": "^4.0.2",
"jest": "^26.4.2",
"@release-it-plugins/lerna-changelog": "^5.0.0",
"@release-it-plugins/workspaces": "^3.2.0",
"chai-files": "^1.4.0",
"execa": "8.0.1",
"fixturify-project": "~6.0.0",
"fs-extra": "~11.1.1",
"release-it": "^15.11.0",
"rimraf": "^2.6.2"
"rimraf": "^5.0.5",
"vite": "^4.5.0",
"vitest": "^1.0.0-beta.4"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand Down Expand Up @@ -69,6 +67,6 @@
"version": "2.0.1",
"volta": {
"node": "14.21.3",
"yarn": "1.22.19"
"pnpm": "8.10.2"
}
}
1 change: 1 addition & 0 deletions packages/ember-cli-code-coverage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ module.exports = {
if (opts.embroider === true) {
let {
stableWorkspaceDir,
// eslint-disable-next-line node/no-missing-require
} = require('@embroider/compat/src/default-pipeline');
cwd = stableWorkspaceDir(cwd, process.env.EMBER_ENV);
}
Expand Down
1 change: 1 addition & 0 deletions packages/ember-cli-code-coverage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"walk-sync": "^2.1.0"
},
"devDependencies": {
"@babel/core": "^7.23.2",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.4.2",
"@embroider/test-setup": "^0.43.5",
Expand Down