Skip to content

Commit 2bc08ae

Browse files
authored
Merge pull request #282 from jrjohnson/update-ember-4.12
Update Ember CLI v3.28.3...v4.12.1
2 parents 7d6de57 + 405b23a commit 2bc08ae

27 files changed

+6980
-8714
lines changed

.ember-cli

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
10+
/**
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13+
*/
14+
"isTypeScriptProject": false
915
}

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@
1919
# ember-try
2020
/.node_modules.ember-try/
2121
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2223
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

.eslintrc.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
5+
parser: '@babel/eslint-parser',
66
parserOptions: {
7-
ecmaVersion: 2018,
7+
ecmaVersion: 'latest',
88
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true,
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
13+
],
1114
},
1215
},
1316
plugins: ['ember'],
@@ -26,6 +29,7 @@ module.exports = {
2629
files: [
2730
'./.eslintrc.js',
2831
'./.prettierrc.js',
32+
'./.stylelintrc.js',
2933
'./.template-lintrc.js',
3034
'./ember-cli-build.js',
3135
'./index.js',
@@ -41,11 +45,10 @@ module.exports = {
4145
browser: false,
4246
node: true,
4347
},
44-
plugins: ['node'],
45-
extends: ['plugin:node/recommended'],
48+
extends: ['plugin:n/recommended'],
4649
},
4750
{
48-
// Test files:
51+
// test files
4952
files: ['tests/**/*-test.{js,ts}'],
5053
extends: ['plugin:qunit/recommended'],
5154
},

.github/workflows/ci.yaml

Lines changed: 0 additions & 82 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
pull_request: {}
9+
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
test:
16+
name: "Tests"
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 10
19+
20+
steps:
21+
- uses: actions/checkout@v3
22+
- name: Install Node
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: 14.x
26+
cache: npm
27+
- name: Install Dependencies
28+
run: npm ci
29+
- name: Lint
30+
run: npm run lint
31+
- name: Run Tests
32+
run: npm run test:ember
33+
- name: percy
34+
run: npm run test:percy
35+
env:
36+
PERCY_TOKEN: ${{secrets.PERCY_TOKEN}}
37+
38+
floating:
39+
name: "Floating Dependencies"
40+
runs-on: ubuntu-latest
41+
timeout-minutes: 10
42+
43+
steps:
44+
- uses: actions/checkout@v3
45+
- uses: actions/setup-node@v3
46+
with:
47+
node-version: 14.x
48+
cache: npm
49+
- name: Install Dependencies
50+
run: npm install --no-shrinkwrap
51+
- name: Run Tests
52+
run: npm run test:ember
53+
54+
try-scenarios:
55+
name: ${{ matrix.try-scenario }}
56+
runs-on: ubuntu-latest
57+
needs: "test"
58+
timeout-minutes: 10
59+
60+
strategy:
61+
fail-fast: false
62+
matrix:
63+
try-scenario:
64+
- ember-lts-4.4
65+
- ember-lts-4.8
66+
- ember-release
67+
- ember-beta
68+
- ember-canary
69+
- embroider-safe
70+
- embroider-optimized
71+
72+
steps:
73+
- uses: actions/checkout@v3
74+
- name: Install Node
75+
uses: actions/setup-node@v3
76+
with:
77+
node-version: 14.x
78+
cache: npm
79+
- name: Install Dependencies
80+
run: npm ci
81+
- name: Run Tests
82+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,10 @@
2323
# ember-try
2424
/.node_modules.ember-try/
2525
/bower.json.ember-try
26+
/npm-shrinkwrap.json.ember-try
2627
/package.json.ember-try
28+
/package-lock.json.ember-try
29+
/yarn.lock.ember-try
30+
31+
# broccoli-debug
32+
/DEBUG/

.npmignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@
1414
/.eslintignore
1515
/.eslintrc.js
1616
/.git/
17+
/.github/
1718
/.gitignore
1819
/.prettierignore
1920
/.prettierrc.js
21+
/.stylelintignore
22+
/.stylelintrc.js
2023
/.template-lintrc.js
2124
/.travis.yml
2225
/.watchmanconfig
2326
/bower.json
24-
/config/ember-try.js
2527
/CONTRIBUTING.md
2628
/ember-cli-build.js
2729
/testem.js
@@ -33,4 +35,7 @@
3335
# ember-try
3436
/.node_modules.ember-try/
3537
/bower.json.ember-try
38+
/npm-shrinkwrap.json.ember-try
3639
/package.json.ember-try
40+
/package-lock.json.ember-try
41+
/yarn.lock.ember-try

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

.prettierrc.js

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

33
module.exports = {
4-
singleQuote: true,
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
512
};

.stylelintignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
7+
# addons
8+
/.node_modules.ember-try/

0 commit comments

Comments
 (0)