Skip to content

Commit 8f56157

Browse files
committed
Move addon to subfolder
Make gitignore work for all directories Add root package.json Update CI Use previously upgraded node
1 parent d405fd7 commit 8f56157

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+169
-145
lines changed

.github/workflows/ci.yml

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
- run: yarn install --frozen-lockfile
2626
- run: yarn lint
2727
- run: yarn test:ember
28+
working-directory: addon
2829

2930
floating-dependencies:
3031
name: 'Floating Dependencies'
@@ -36,6 +37,7 @@ jobs:
3637
- uses: volta-cli/action@v4
3738
- run: yarn install --no-lockfile
3839
- run: yarn test:ember
40+
working-directory: addon
3941

4042
try-scenarios:
4143
name: 'Try: ${{ matrix.ember-try-scenario }}'
@@ -63,6 +65,7 @@ jobs:
6365
run: yarn install --frozen-lockfile
6466
- name: test
6567
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
68+
working-directory: addon
6669

6770
types:
6871
runs-on: ubuntu-latest
@@ -84,5 +87,7 @@ jobs:
8487
run: yarn install --frozen-lockfile
8588
- name: install TS version
8689
run: yarn install --dev typescript@${{matrix.ts-version}}
90+
working-directory: addon
8791
- name: test types
8892
run: yarn test:types
93+
working-directory: addon

.gitignore

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist/
5-
/tmp/
6-
/.eslintcache
4+
dist/
5+
tmp/
6+
.eslintcache
77

88
# dependencies
9-
/bower_components/
10-
/node_modules/
9+
bower_components/
10+
node_modules/
1111

1212
# misc
13-
/.env*
14-
/.pnp*
15-
/.sass-cache
16-
/.eslintcache
17-
/connect.lock
18-
/coverage/
19-
/libpeerconnection.log
20-
/npm-debug.log*
21-
/testem.log
22-
/yarn-error.log
13+
.env*
14+
.pnp*
15+
.sass-cache
16+
.eslintcache
17+
connect.lock
18+
coverage/
19+
libpeerconnection.log
20+
npm-debug.log*
21+
testem.log
22+
yarn-error.log
2323

2424
# ember-try
25-
/.node_modules.ember-try/
26-
/bower.json.ember-try
27-
/npm-shrinkwrap.json.ember-try
28-
/package.json.ember-try
29-
/package-lock.json.ember-try
30-
/yarn.lock.ember-try
25+
.node_modules.ember-try/
26+
bower.json.ember-try
27+
npm-shrinkwrap.json.ember-try
28+
package.json.ember-try
29+
package-lock.json.ember-try
30+
yarn.lock.ember-try
3131

3232
# broccoli-debug
33-
/DEBUG/
33+
DEBUG/

.editorconfig addon/.editorconfig

File renamed without changes.

.ember-cli addon/.ember-cli

File renamed without changes.

.eslintignore addon/.eslintignore

File renamed without changes.

.eslintrc.js addon/.eslintrc.js

File renamed without changes.

.npmignore addon/.npmignore

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

CHANGELOG.md addon/CHANGELOG.md

LICENSE.md addon/LICENSE.md

README.md addon/README.md

RELEASE.md addon/RELEASE.md

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

app/.gitkeep addon/app/.gitkeep

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

index.js addon/index.js

File renamed without changes.

addon/package.json

+132
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
{
2+
"name": "ember-qunit",
3+
"version": "7.0.0",
4+
"description": "QUnit helpers for testing Ember.js applications",
5+
"keywords": [
6+
"ember-addon"
7+
],
8+
"repository": {
9+
"type": "git",
10+
"url": "https://github.com/emberjs/ember-qunit.git"
11+
},
12+
"license": "MIT",
13+
"contributors": [
14+
"Stefan Penner",
15+
"Ryan Florence",
16+
"Robert Jackson",
17+
"Dan Gebhardt",
18+
"Steve Calvert"
19+
],
20+
"directories": {
21+
"doc": "doc",
22+
"test": "tests"
23+
},
24+
"types": "types/index.d.ts",
25+
"scripts": {
26+
"build": "ember build --environment=production",
27+
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
28+
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
29+
"lint:js": "eslint . --cache",
30+
"lint:js:fix": "eslint . --fix",
31+
"start": "ember serve",
32+
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
33+
"test:types": "tsc --noEmit --project types",
34+
"test:ember": "ember test",
35+
"test:ember-compatibility": "ember try:each"
36+
},
37+
"dependencies": {
38+
"broccoli-funnel": "^3.0.8",
39+
"broccoli-merge-trees": "^3.0.2",
40+
"common-tags": "^1.8.0",
41+
"ember-auto-import": "^2.6.1",
42+
"ember-cli-babel": "^7.26.11",
43+
"ember-cli-test-loader": "^3.0.0",
44+
"resolve-package-path": "^4.0.3",
45+
"silent-error": "^1.1.1",
46+
"validate-peer-dependencies": "^2.2.0"
47+
},
48+
"devDependencies": {
49+
"@babel/core": "^7.21.0",
50+
"@babel/eslint-parser": "^7.19.1",
51+
"@ember/optional-features": "^2.0.0",
52+
"@ember/string": "^3.1.1",
53+
"@ember/test-helpers": "^3.0.3",
54+
"@embroider/test-setup": "^2.1.1",
55+
"@glimmer/component": "^1.1.2",
56+
"@tsconfig/ember": "^2.0.0",
57+
"@types/qunit": "^2.19.4",
58+
"@types/rsvp": "^4.0.4",
59+
"ember-angle-bracket-invocation-polyfill": "^3.0.2",
60+
"ember-cli": "~4.10.0",
61+
"ember-cli-dependency-checker": "^3.3.1",
62+
"ember-cli-htmlbars": "^6.2.0",
63+
"ember-cli-inject-live-reload": "^2.1.0",
64+
"ember-cli-terser": "^4.0.2",
65+
"ember-disable-prototype-extensions": "^1.1.3",
66+
"ember-load-initializers": "^2.1.2",
67+
"ember-resolver": "^9.0.1",
68+
"ember-source": "~4.10.0",
69+
"ember-source-channel-url": "^3.0.0",
70+
"ember-try": "^2.0.0",
71+
"eslint": "^8.35.0",
72+
"eslint-config-prettier": "^8.6.0",
73+
"eslint-plugin-disable-features": "^0.1.3",
74+
"eslint-plugin-node": "^11.1.0",
75+
"eslint-plugin-prettier": "^4.2.1",
76+
"expect-type": "^0.15.0",
77+
"loader.js": "^4.7.0",
78+
"npm-run-all": "^4.1.5",
79+
"prettier": "2.8.4",
80+
"qunit": "^2.19.4",
81+
"release-it": "^15.7.0",
82+
"release-it-lerna-changelog": "^5.0.0",
83+
"typescript": "^4.9.5",
84+
"webpack": "^5.75.0"
85+
},
86+
"peerDependencies": {
87+
"@ember/test-helpers": ">=3.0.3",
88+
"ember-source": ">=4.0.0",
89+
"qunit": "^2.13.0"
90+
},
91+
"engines": {
92+
"node": "16.* || >= 18"
93+
},
94+
"publishConfig": {
95+
"registry": "https://registry.npmjs.org"
96+
},
97+
"changelog": {
98+
"repo": "emberjs/ember-qunit",
99+
"labels": {
100+
"breaking": ":boom: Breaking Change",
101+
"enhancement": ":rocket: Enhancement",
102+
"bug": ":bug: Bug Fix",
103+
"documentation": ":memo: Documentation",
104+
"internal": ":house: Internal"
105+
}
106+
},
107+
"ember": {
108+
"edition": "octane"
109+
},
110+
"ember-addon": {
111+
"configPath": "tests/dummy/config"
112+
},
113+
"release-it": {
114+
"plugins": {
115+
"release-it-lerna-changelog": {
116+
"infile": "CHANGELOG.md",
117+
"launchEditor": true
118+
}
119+
},
120+
"git": {
121+
"tagName": "v${version}"
122+
},
123+
"github": {
124+
"release": true,
125+
"tokenRef": "GITHUB_AUTH"
126+
}
127+
},
128+
"volta": {
129+
"node": "18.16.0",
130+
"yarn": "1.22.19"
131+
}
132+
}

testem.js addon/testem.js

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.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

package.json

+10-123
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,17 @@
11
{
2-
"name": "ember-qunit",
3-
"version": "7.0.0",
4-
"description": "QUnit helpers for testing Ember.js applications",
5-
"keywords": [
6-
"ember-addon"
7-
],
8-
"repository": {
9-
"type": "git",
10-
"url": "https://github.com/emberjs/ember-qunit.git"
11-
},
2+
"name": "root",
3+
"version": "0.0.0",
4+
"private": true,
125
"license": "MIT",
13-
"contributors": [
14-
"Stefan Penner",
15-
"Ryan Florence",
16-
"Robert Jackson",
17-
"Dan Gebhardt",
18-
"Steve Calvert"
19-
],
20-
"directories": {
21-
"doc": "doc",
22-
"test": "tests"
23-
},
24-
"types": "types/index.d.ts",
6+
"repository": "https://github.com/emberjs/ember-qunit",
257
"scripts": {
26-
"build": "ember build --environment=production",
27-
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
28-
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
29-
"lint:js": "eslint . --cache",
30-
"lint:js:fix": "eslint . --fix",
31-
"start": "ember serve",
32-
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
33-
"test:types": "tsc --noEmit --project types",
34-
"test:ember": "ember test",
35-
"test:ember-compatibility": "ember try:each"
36-
},
37-
"dependencies": {
38-
"broccoli-funnel": "^3.0.8",
39-
"broccoli-merge-trees": "^3.0.2",
40-
"common-tags": "^1.8.0",
41-
"ember-auto-import": "^2.6.1",
42-
"ember-cli-babel": "^7.26.11",
43-
"ember-cli-test-loader": "^3.0.0",
44-
"resolve-package-path": "^4.0.3",
45-
"silent-error": "^1.1.1",
46-
"validate-peer-dependencies": "^2.2.0"
47-
},
48-
"devDependencies": {
49-
"@babel/core": "^7.21.0",
50-
"@babel/eslint-parser": "^7.19.1",
51-
"@ember/optional-features": "^2.0.0",
52-
"@ember/string": "^3.1.1",
53-
"@ember/test-helpers": "^3.0.3",
54-
"@embroider/test-setup": "^2.1.1",
55-
"@glimmer/component": "^1.1.2",
56-
"@tsconfig/ember": "^2.0.0",
57-
"@types/qunit": "^2.19.4",
58-
"@types/rsvp": "^4.0.4",
59-
"ember-angle-bracket-invocation-polyfill": "^3.0.2",
60-
"ember-cli": "~4.10.0",
61-
"ember-cli-dependency-checker": "^3.3.1",
62-
"ember-cli-htmlbars": "^6.2.0",
63-
"ember-cli-inject-live-reload": "^2.1.0",
64-
"ember-cli-terser": "^4.0.2",
65-
"ember-disable-prototype-extensions": "^1.1.3",
66-
"ember-load-initializers": "^2.1.2",
67-
"ember-resolver": "^9.0.1",
68-
"ember-source": "~4.10.0",
69-
"ember-source-channel-url": "^3.0.0",
70-
"ember-try": "^2.0.0",
71-
"eslint": "^8.35.0",
72-
"eslint-config-prettier": "^8.6.0",
73-
"eslint-plugin-disable-features": "^0.1.3",
74-
"eslint-plugin-node": "^11.1.0",
75-
"eslint-plugin-prettier": "^4.2.1",
76-
"expect-type": "^0.15.0",
77-
"loader.js": "^4.7.0",
78-
"npm-run-all": "^4.1.5",
79-
"prettier": "2.8.4",
80-
"qunit": "^2.19.4",
81-
"release-it": "^15.7.0",
82-
"release-it-lerna-changelog": "^5.0.0",
83-
"typescript": "^4.9.5",
84-
"webpack": "^5.75.0"
85-
},
86-
"peerDependencies": {
87-
"@ember/test-helpers": ">=3.0.3",
88-
"ember-source": ">=4.0.0",
89-
"qunit": "^2.13.0"
90-
},
91-
"engines": {
92-
"node": "16.* || >= 18"
93-
},
94-
"publishConfig": {
95-
"registry": "https://registry.npmjs.org"
96-
},
97-
"changelog": {
98-
"repo": "emberjs/ember-qunit",
99-
"labels": {
100-
"breaking": ":boom: Breaking Change",
101-
"enhancement": ":rocket: Enhancement",
102-
"bug": ":bug: Bug Fix",
103-
"documentation": ":memo: Documentation",
104-
"internal": ":house: Internal"
105-
}
106-
},
107-
"ember": {
108-
"edition": "octane"
109-
},
110-
"ember-addon": {
111-
"configPath": "tests/dummy/config"
112-
},
113-
"release-it": {
114-
"plugins": {
115-
"release-it-lerna-changelog": {
116-
"infile": "CHANGELOG.md",
117-
"launchEditor": true
118-
}
119-
},
120-
"git": {
121-
"tagName": "v${version}"
122-
},
123-
"github": {
124-
"release": true,
125-
"tokenRef": "GITHUB_AUTH"
126-
}
8+
"lint": "yarn workspaces run lint",
9+
"lint:fix": "yarn workspaces run lint:fix",
10+
"test": "yarn workspaces run test"
12711
},
12+
"workspaces": [
13+
"addon"
14+
],
12815
"volta": {
12916
"node": "18.16.0",
13017
"yarn": "1.22.19"

0 commit comments

Comments
 (0)