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 #1063

Merged
merged 4 commits into from
Jun 12, 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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v4
- run: yarn install --frozen-lockfile
- run: yarn lint
- run: yarn test:ember
- uses: wyvox/action@v1
- run: pnpm lint
- run: pnpm test:ember
working-directory: addon

floating-dependencies:
name: 'Floating Dependencies'
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v4
- run: yarn install --no-lockfile
- run: yarn test:ember
- uses: wyvox/action@v1
with:
pnpm-args: '--no-lockfile'
- run: pnpm test:ember
working-directory: addon

try-scenarios:
name: 'Try: ${{ matrix.ember-try-scenario }}'
Expand All @@ -57,12 +57,10 @@ jobs:
- embroider-optimized

steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v4
- name: install dependencies
run: yarn install --frozen-lockfile
- uses: wyvox/action@v1
- name: test
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
working-directory: addon

types:
runs-on: ubuntu-latest
Expand All @@ -78,11 +76,10 @@ jobs:
- next

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v4
- name: install dependencies
run: yarn install --frozen-lockfile
- uses: wyvox/action@v1
- name: install TS version
run: yarn install --dev typescript@${{matrix.ts-version}}
run: pnpm install --save-dev typescript@${{matrix.ts-version}}
working-directory: addon
- name: test types
run: yarn test:types
run: pnpm test:types
working-directory: addon
5 changes: 2 additions & 3 deletions .github/workflows/push-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ jobs:
name: Push dist
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: volta-cli/action@v4
- run: yarn install --frozen-lockfile
- uses: wyvox/action@v1
- uses: kategengler/put-built-npm-package-contents-on-branch@v1.0.0
with:
branch: dist
token: ${{ secrets.GITHUB_TOKEN }}
working-directory: addon
44 changes: 22 additions & 22 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/.eslintcache
dist/
tmp/
.eslintcache

# dependencies
/bower_components/
/node_modules/
bower_components/
node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log
.env*
.pnp*
.sass-cache
.eslintcache
connect.lock
coverage/
libpeerconnection.log
npm-debug.log*
testem.log
yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
.node_modules.ember-try/
bower.json.ember-try
npm-shrinkwrap.json.ember-try
package.json.ember-try
package-lock.json.ember-try
yarn.lock.ember-try

# broccoli-debug
/DEBUG/
DEBUG/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion config/ember-try.js → addon/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');

module.exports = async function () {
return {
useYarn: true,
usePnpm: true,
scenarios: [
{
name: 'ember-lts-3.28',
MelSumner marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
132 changes: 132 additions & 0 deletions addon/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
{
"name": "ember-qunit",
"version": "7.0.0",
"description": "QUnit helpers for testing Ember.js applications",
"keywords": [
"ember-addon"
],
"repository": {
"type": "git",
"url": "https://github.com/emberjs/ember-qunit.git"
},
"license": "MIT",
"contributors": [
"Stefan Penner",
"Ryan Florence",
"Robert Jackson",
"Dan Gebhardt",
"Steve Calvert"
],
"directories": {
"doc": "doc",
"test": "tests"
},
"types": "types/index.d.ts",
"scripts": {
"build": "ember build --environment=production",
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
"test:types": "tsc --noEmit --project types",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"broccoli-funnel": "^3.0.8",
"broccoli-merge-trees": "^3.0.2",
"common-tags": "^1.8.0",
"ember-auto-import": "^2.6.1",
"ember-cli-babel": "^7.26.11",
"ember-cli-test-loader": "^3.0.0",
"resolve-package-path": "^4.0.3",
"silent-error": "^1.1.1",
"validate-peer-dependencies": "^2.2.0"
},
"devDependencies": {
"@babel/core": "^7.21.0",
"@babel/eslint-parser": "^7.19.1",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.0.3",
"@embroider/test-setup": "^2.1.1",
"@glimmer/component": "^1.1.2",
"@tsconfig/ember": "^2.0.0",
"@types/qunit": "^2.19.4",
"@types/rsvp": "^4.0.4",
"ember-angle-bracket-invocation-polyfill": "^3.0.2",
"ember-cli": "~4.10.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-htmlbars": "^6.2.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-terser": "^4.0.2",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-load-initializers": "^2.1.2",
"ember-resolver": "^9.0.1",
"ember-source": "~4.10.0",
"ember-source-channel-url": "^3.0.0",
"ember-try": "^2.0.0",
"eslint": "^8.35.0",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-disable-features": "^0.1.3",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.2.1",
"expect-type": "^0.15.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "2.8.4",
"qunit": "^2.19.4",
"release-it": "^15.7.0",
"release-it-lerna-changelog": "^5.0.0",
"typescript": "^4.9.5",
"webpack": "^5.75.0"
},
"peerDependencies": {
"@ember/test-helpers": ">=3.0.3",
"ember-source": ">=4.0.0",
"qunit": "^2.13.0"
},
"engines": {
"node": "16.* || >= 18"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
},
"changelog": {
"repo": "emberjs/ember-qunit",
"labels": {
"breaking": ":boom: Breaking Change",
"enhancement": ":rocket: Enhancement",
"bug": ":bug: Bug Fix",
"documentation": ":memo: Documentation",
"internal": ":house: Internal"
}
},
"ember": {
"edition": "octane"
},
"ember-addon": {
"configPath": "tests/dummy/config"
},
"release-it": {
"plugins": {
"release-it-lerna-changelog": {
"infile": "CHANGELOG.md",
"launchEditor": true
}
},
"git": {
"tagName": "v${version}"
},
"github": {
"release": true,
"tokenRef": "GITHUB_AUTH"
}
},
"volta": {
"node": "18.16.0",
"yarn": "1.22.19"
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading