Skip to content

Commit 4c675cf

Browse files
authored
Merge pull request #893 from mansona/drop-npm
2 parents 17592f8 + bc27a0d commit 4c675cf

43 files changed

Lines changed: 39255 additions & 24084 deletions

Some content is hidden

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

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
- floating-deps
5858

5959
strategy:
60+
fail-fast: false
6061
matrix:
6162
command:
6263
# try:each
@@ -72,9 +73,9 @@ jobs:
7273
- ./node_modules/.bin/ember try:each --config-path='../test/fixtures/dummy-ember-try-config.js' --skip-cleanup true
7374

7475
# try:ember
75-
- ./node_modules/.bin/ember try:ember '> 2.16.0 < 3.0.0'
76-
- ./node_modules/.bin/ember try:ember '2.10.0' --config-path='../test/fixtures/dummy-ember-try-config.js'
77-
- ./node_modules/.bin/ember try:ember '3.2.0' --skip-cleanup=true
76+
- ./node_modules/.bin/ember try:ember '> 3.26.0 < 3.28.0'
77+
- ./node_modules/.bin/ember try:ember '3.18.0' --config-path='../test/fixtures/dummy-ember-try-config.js'
78+
- ./node_modules/.bin/ember try:ember '3.24.0' --skip-cleanup=true
7879

7980
# try:config
8081
- ./node_modules/.bin/ember try:config

smoke-test-app/.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

smoke-test-app/.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
17+
.eslintcache
1618

1719
# ember-try
1820
/.node_modules.ember-try/

smoke-test-app/.eslintrc.js

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,53 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
5+
parser: 'babel-eslint',
36
parserOptions: {
4-
ecmaVersion: 2017,
5-
sourceType: 'module'
7+
ecmaVersion: 2018,
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true,
11+
},
612
},
7-
plugins: [
8-
'ember'
9-
],
13+
plugins: ['ember'],
1014
extends: [
1115
'eslint:recommended',
12-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1318
],
1419
env: {
15-
browser: true
16-
},
17-
rules: {
20+
browser: true,
1821
},
22+
rules: {},
1923
overrides: [
2024
// node files
2125
{
2226
files: [
23-
'.eslintrc.js',
24-
'.template-lintrc.js',
25-
'ember-cli-build.js',
26-
'testem.js',
27-
'blueprints/*/index.js',
28-
'config/**/*.js',
29-
'lib/*/index.js'
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./index.js',
32+
'./testem.js',
33+
'./blueprints/*/index.js',
34+
'./config/**/*.js',
35+
'./tests/dummy/config/**/*.js',
3036
],
3137
parserOptions: {
3238
sourceType: 'script',
33-
ecmaVersion: 2015
3439
},
3540
env: {
3641
browser: false,
37-
node: true
38-
}
39-
}
40-
]
42+
node: true,
43+
},
44+
plugins: ['node'],
45+
extends: ['plugin:node/recommended'],
46+
},
47+
{
48+
// Test files:
49+
files: ['tests/**/*-test.{js,ts}'],
50+
extends: ['plugin:qunit/recommended'],
51+
},
52+
],
4153
};

smoke-test-app/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010

1111
# misc
1212
/.env*
13+
/.pnp*
1314
/.sass-cache
15+
/.eslintcache
1416
/connect.lock
1517
/coverage/
1618
/libpeerconnection.log

smoke-test-app/.npmignore

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
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+
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
20+
/.template-lintrc.js
21+
/.travis.yml
22+
/.watchmanconfig
23+
/bower.json
24+
/config/ember-try.js
25+
/CONTRIBUTING.md
26+
/ember-cli-build.js
27+
/testem.js
28+
/tests/
29+
/yarn-error.log
30+
/yarn.lock
31+
.gitkeep
32+
33+
# ember-try
34+
/.node_modules.ember-try/
35+
/bower.json.ember-try
36+
/package.json.ember-try

smoke-test-app/.prettierignore

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

smoke-test-app/.prettierrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
singleQuote: true,
5+
};

smoke-test-app/.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'recommended'
4+
extends: 'recommended',
55
};

smoke-test-app/.travis.yml

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
22
language: node_js
33
node_js:
4-
- "6"
4+
# we recommend testing addons with the same minimum supported node version as Ember CLI
5+
# so that your addon works for all apps
6+
- "12"
57

6-
sudo: false
7-
dist: trusty
8+
dist: xenial
89

910
addons:
1011
chrome: stable
@@ -17,13 +18,47 @@ env:
1718
# See https://git.io/vdao3 for details.
1819
- JOBS=1
1920

21+
branches:
22+
only:
23+
- master
24+
# npm version tags
25+
- /^v\d+\.\d+\.\d+/
26+
27+
jobs:
28+
fast_finish: true
29+
allow_failures:
30+
- env: EMBER_TRY_SCENARIO=ember-canary
31+
32+
include:
33+
# runs linting and tests with current locked deps
34+
- stage: "Tests"
35+
name: "Tests"
36+
script:
37+
- yarn lint
38+
- yarn test:ember
39+
40+
- stage: "Additional Tests"
41+
name: "Floating Dependencies"
42+
install:
43+
- yarn install --no-lockfile --non-interactive
44+
script:
45+
- yarn test:ember
46+
47+
# we recommend new addons test the current and previous LTS
48+
# as well as latest stable release (bonus points to beta/canary)
49+
- env: EMBER_TRY_SCENARIO=ember-lts-3.24
50+
- env: EMBER_TRY_SCENARIO=ember-lts-3.28
51+
- env: EMBER_TRY_SCENARIO=ember-release
52+
- env: EMBER_TRY_SCENARIO=ember-beta
53+
- env: EMBER_TRY_SCENARIO=ember-canary
54+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
55+
- env: EMBER_TRY_SCENARIO=ember-classic
56+
- env: EMBER_TRY_SCENARIO=embroider-safe
57+
- env: EMBER_TRY_SCENARIO=embroider-optimized
58+
2059
before_install:
2160
- curl -o- -L https://yarnpkg.com/install.sh | bash
2261
- export PATH=$HOME/.yarn/bin:$PATH
2362

24-
install:
25-
- yarn install --non-interactive
26-
2763
script:
28-
- yarn lint:js
29-
- yarn test
64+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

0 commit comments

Comments
 (0)