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

Prepare for V2 Addon conversion. #2027

Merged
merged 7 commits into from
Oct 6, 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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
test:
strategy:
matrix:
node: ['14', '16', '18']
node: ['14', '16', '18.17']

name: Tests (Node.js v${{ matrix.node }})
runs-on: ubuntu-latest
Expand All @@ -54,8 +54,8 @@ jobs:
cache: pnpm

- run: pnpm install
- run: pnpm lint
- run: pnpm build
- run: pnpm lint
- run: pnpm test:coverage --runInBand
- run: pnpm test:ember

Expand Down Expand Up @@ -83,6 +83,6 @@ jobs:

- run: pnpm install
- run: pnpm build
- run: pnpm ember try:one ${{ matrix.ember-try-scenario}} -- --config-path tests/dummy/config/ember-try.js
- run: pnpm --filter test-app try:one ${{ matrix.ember-try-scenario}} --skip-cleanup
env:
USE_EMBROIDER: "${{ matrix.embroider }}"
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ jobs:

- name: auto-dist-tag
run: npx auto-dist-tag@1 --write
BobrImperator marked this conversation as resolved.
Show resolved Hide resolved
working-directory: qunit-dom
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here the working-directory makes sense to me, so I'd not change that.

Note; Although on another note we should consider setting up scripts for that in the root package.json.


- run: npm publish
working-directory: qunit-dom
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
16 changes: 6 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
dist
tmp
*.tgz

# dependencies
/node_modules
/bower_components
node_modules

# misc
/.eslintcache
/.sass-cache
/connect.lock
/coverage/*
/libpeerconnection.log
.eslintcache
coverage/
.pnpm-debug.log
npm-debug.log*
yarn-error.log
Expand All @@ -26,4 +22,4 @@ bower.json.ember-try
package.json.ember-try

# rollup-plugin-typescript2
/.rpt2_cache
.rpt2_cache
121 changes: 18 additions & 103 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,113 +1,28 @@
{
"name": "qunit-dom",
"version": "2.0.0",
"description": "High Level DOM Assertions for QUnit",
"keywords": [
"browser",
"dom",
"ember-addon",
"html",
"qunit",
"qunit-plugin",
"testing"
],
"repository": "https://github.com/simplabs/qunit-dom",
"license": "MIT",
"author": "simplabs GmbH",
"types": "dist/qunit-dom.d.ts",
"directories": {
"doc": "doc",
"test": "tests"
},
"private": true,
"scripts": {
"build": "rollup -c",
"changelog": "lerna-changelog",
"docs": "npm run build && documentation build dist/qunit-dom.js --config documentation.yml -f md -o API.md",
"lint": "eslint . --cache",
"prepublish": "rollup -c",
"release": "release-it",
"test": "jest",
"test:coverage": "jest --coverage",
"test:ember": "ember test",
"test:watch": "jest --watchAll --notify"
},
"jest": {
"testEnvironment": "jsdom",
"preset": "ts-jest",
"testPathIgnorePatterns": [
"/node_modules/",
"/dist/"
]
},
"dependencies": {
"broccoli-funnel": "^3.0.8",
"ember-cli-babel": "^7.26.10"
"docs": "npm run build && npm exec documentation build qunit-dom/dist/qunit-dom.js --config documentation.yml -f md -o API.md",
"build": "cd qunit-dom && npm run build",
"prepare": "pnpm build",
"release": "cd qunit-dom && npm run release",
"lint": "pnpm --filter '*' lint",
BobrImperator marked this conversation as resolved.
Show resolved Hide resolved
"lint:fix": "pnpm --filter '*' lint:fix",
"test:coverage": "pnpm --filter '*' test:coverage",
"test:ember": "pnpm --filter '*' test:ember"
},
"devDependencies": {
"@ember/optional-features": "2.0.0",
"@ember/test-helpers": "2.9.4",
"@embroider/compat": "0.48.1",
"@embroider/core": "0.48.1",
"@embroider/macros": "0.48.1",
"@embroider/webpack": "0.48.1",
"@types/jest": "27.5.2",
"@types/qunit": "2.19.6",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"babel-plugin-transform-es2015-modules-commonjs": "6.26.2",
"babel-preset-env": "1.7.0",
"documentation": "14.0.2",
"ember-auto-import": "2.6.3",
"ember-cli": "4.12.2",
"ember-cli-dependency-checker": "3.3.2",
"ember-cli-htmlbars": "6.3.0",
"ember-cli-inject-live-reload": "2.1.0",
"ember-load-initializers": "2.1.2",
"ember-maybe-import-regenerator": "1.0.0",
"ember-qunit": "8.0.1",
"ember-resolver": "9.0.1",
"ember-source": "4.12.3",
"ember-try": "2.0.0",
"eslint": "8.50.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-jest": "27.4.2",
"eslint-plugin-prettier": "4.2.1",
"jest": "27.5.1",
"lerna-changelog": "2.2.0",
"loader.js": "4.7.0",
"prettier": "2.8.8",
"qunit": "2.20.0",
"release-it": "15.11.0",
"release-it-lerna-changelog": "5.0.0",
"rollup": "2.79.1",
"rollup-plugin-typescript2": "0.34.1",
"ts-jest": "27.1.5",
"typescript": "4.9.5",
"webpack": "5.88.2"
},
"packageManager": "pnpm@7.33.6",
"changelog": {
"repo": "simplabs/qunit-dom",
"labels": {
"breaking": ":boom: Breaking Change",
"enhancement": ":rocket: Enhancement",
"bug": ":bug: Bug Fix",
"documentation": ":memo: Documentation",
"internal": ":house: Internal"
}
},
"ember": {
"edition": "octane"
"concurrently": "^8.0.0",
"eslint": "^8.50.0",
"prettier": "^2.8.8"
},
"ember-addon": {
"configPath": "tests/dummy/config",
"after": [
"ember-cli-qunit",
"ember-qunit"
]
"engines": {
"node": ">= 16.*",
"yarn": "use pnpm",
"npm": "use pnpm"
},
"volta": {
"node": "18.18.0",
"pnpm": "7.33.6"
"node": "16.20.2",
BobrImperator marked this conversation as resolved.
Show resolved Hide resolved
"pnpm": "7.33.0"
}
}