Skip to content

Commit

Permalink
Merge pull request #34 from embroider-build/fix-pnpm
Browse files Browse the repository at this point in the history
Fix pnpm package discovery
  • Loading branch information
mansona committed Dec 6, 2023
2 parents 5e02657 + 280d892 commit ea671ef
Show file tree
Hide file tree
Showing 11 changed files with 922 additions and 33 deletions.
9 changes: 8 additions & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@ module.exports = {
'plugin:prettier/recommended',
'plugin:n/recommended',
],
overrides: [],
overrides: [
{
files: 'src/*.test.ts',
rules: {
'n/no-unpublished-import': 0,
},
},
],
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 'latest',
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,19 @@ jobs:
version: 8
- run: pnpm install --frozen-lockfile
- run: pnpm lint

test:
name: "Test"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
- uses: pnpm/action-setup@v2
with:
version: 8
- run: pnpm install --frozen-lockfile
- run: pnpm test
12 changes: 12 additions & 0 deletions fixtures/pnpm/star-package/files/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "files",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC"
}
12 changes: 12 additions & 0 deletions fixtures/pnpm/star-package/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "star-package",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC"
}
6 changes: 6 additions & 0 deletions fixtures/pnpm/star-package/pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
packages:
# any directory (including the top level)
- '*'
# ignore everything in the files directory
- '!files'

13 changes: 13 additions & 0 deletions fixtures/pnpm/star-package/tests/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "tests",
"private": true,
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC"
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"build": "tsc",
"lint": "eslint .",
"prepare": "npm run build",
"test": "echo \"Error: no test specified\" && exit 1"
"test": "vitest"
},
"dependencies": {
"@ef4/lerna-changelog": "^2.0.0",
Expand All @@ -30,7 +30,6 @@
"cli-highlight": "^2.1.11",
"execa": "^4.0.3",
"fs-extra": "^10.0.0",
"globby": "^11.0.3",
"js-yaml": "^4.1.0",
"latest-version": "^5.0.0",
"parse-github-repo-url": "^1.4.1",
Expand All @@ -47,6 +46,7 @@
"eslint-plugin-n": "^16.3.1",
"eslint-plugin-prettier": "^5.0.1",
"prettier": "^3.1.0",
"typescript": "^5.2.2"
"typescript": "^5.2.2",
"vitest": "^1.0.1"
}
}

0 comments on commit ea671ef

Please sign in to comment.