Skip to content

Commit 7d9c182

Browse files
authored
Merge pull request #1 from kaliber5/v1
Convert back to v1 format
2 parents dfd9a3a + 57515cb commit 7d9c182

Some content is hidden

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

56 files changed

+530
-1397
lines changed
File renamed without changes.
File renamed without changes.

packages/test-app/.eslintrc.js renamed to .eslintrc.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ module.exports = {
2828
'./.prettierrc.js',
2929
'./.template-lintrc.js',
3030
'./ember-cli-build.js',
31+
'./index.js',
3132
'./testem.js',
3233
'./blueprints/*/index.js',
3334
'./config/**/*.js',
34-
'./lib/*/index.js',
35-
'./server/**/*.js',
35+
'./tests/dummy/config/**/*.js',
3636
],
3737
parserOptions: {
3838
sourceType: 'script',
@@ -43,11 +43,6 @@ module.exports = {
4343
},
4444
plugins: ['node'],
4545
extends: ['plugin:node/recommended'],
46-
rules: {
47-
// this can be removed once the following is fixed
48-
// https://github.com/mysticatea/eslint-plugin-node/issues/77
49-
'node/no-unpublished-require': 'off',
50-
},
5146
},
5247
{
5348
// test files

.github/workflows/ci.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
pull_request: {}
99

1010
concurrency:
11-
group: ci-${{ github.head_ref || github.ref }}
12-
cancel-in-progress: true
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
1313

1414
jobs:
1515
test:
@@ -28,7 +28,7 @@ jobs:
2828
- name: Lint
2929
run: yarn lint
3030
- name: Run Tests
31-
run: yarn test
31+
run: yarn test:ember
3232

3333
floating:
3434
name: "Floating Dependencies"
@@ -43,12 +43,12 @@ jobs:
4343
- name: Install Dependencies
4444
run: yarn install --no-lockfile
4545
- name: Run Tests
46-
run: yarn test
46+
run: yarn test:ember
4747

4848
try-scenarios:
4949
name: ${{ matrix.try-scenario }}
5050
runs-on: ubuntu-latest
51-
needs: 'test'
51+
needs: "test"
5252

5353
strategy:
5454
fail-fast: false
@@ -74,4 +74,3 @@ jobs:
7474
run: yarn install --frozen-lockfile
7575
- name: Run Tests
7676
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
77-
working-directory: packages/test-app

.npmignore

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# compiled output
2+
/dist/
3+
/tmp/
4+
5+
# dependencies
6+
/bower_components/
7+
8+
# misc
9+
/.bowerrc
10+
/.editorconfig
11+
/.ember-cli
12+
/.env*
13+
/.eslintcache
14+
/.eslintignore
15+
/.eslintrc.js
16+
/.git/
17+
/.github/
18+
/.gitignore
19+
/.prettierignore
20+
/.prettierrc.js
21+
/.template-lintrc.js
22+
/.travis.yml
23+
/.watchmanconfig
24+
/bower.json
25+
/config/ember-try.js
26+
/CONTRIBUTING.md
27+
/ember-cli-build.js
28+
/testem.js
29+
/tests/
30+
/yarn-error.log
31+
/yarn.lock
32+
.gitkeep
33+
34+
# ember-try
35+
/.node_modules.ember-try/
36+
/bower.json.ember-try
37+
/npm-shrinkwrap.json.ember-try
38+
/package.json.ember-try
39+
/package-lock.json.ember-try
40+
/yarn.lock.ember-try
File renamed without changes.

CONTRIBUTING.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313

1414
## Running tests
1515

16-
* `yarn test` – Runs the test suite on the current Ember version
17-
* `yarn test:watch` – Runs the test suite in "watch mode"
16+
* `ember test` – Runs the test suite on the current Ember version
17+
* `ember test --server` – Runs the test suite in "watch mode"
18+
* `ember try:each` – Runs the test suite against multiple Ember versions
1819

1920
## Running the dummy application
2021

21-
* `yarn start`
22+
* `ember serve`
2223
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2324

2425
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ Compatibility
88
------------------------------------------------------------------------------
99

1010
* Ember.js v3.24 or above
11-
* Embroider or ember-auto-import v2
11+
* Ember CLI v3.24 or above
12+
* Node.js v12 or above
1213

1314

1415
Installation

0 commit comments

Comments
 (0)