Skip to content

Commit bd72fd9

Browse files
authored
Merge pull request #393 from ember-learn/upgrade-ember-3.13
Upgrade v2 tracking branch to Ember 3.13
2 parents b652efd + b658293 commit bd72fd9

Some content is hidden

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

55 files changed

+65366
-14529
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
# dependencies
1010
/bower_components/
11+
/node_modules/
1112

1213
# misc
1314
/coverage/

.eslintrc.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
module.exports = {
22
root: true,
3+
parser: 'babel-eslint',
34
parserOptions: {
4-
ecmaVersion: 2017,
5+
ecmaVersion: 2018,
56
sourceType: 'module'
67
},
78
plugins: [
@@ -15,7 +16,7 @@ module.exports = {
1516
browser: true
1617
},
1718
rules: {
18-
'no-useless-escape': 'off'
19+
'ember/no-jquery': 'error'
1920
},
2021
overrides: [
2122
// node files
@@ -29,7 +30,8 @@ module.exports = {
2930
'testem.js',
3031
'blueprints/*/index.js',
3132
'config/**/*.js',
32-
'tests/dummy/config/**/*.js'
33+
'tests/dummy/config/**/*.js',
34+
'port.js'
3335
],
3436
excludedFiles: [
3537
'addon/**',
@@ -38,8 +40,7 @@ module.exports = {
3840
'tests/dummy/app/**'
3941
],
4042
parserOptions: {
41-
sourceType: 'script',
42-
ecmaVersion: 2015
43+
sourceType: 'script'
4344
},
4445
env: {
4546
browser: false,

.github/workflows/ci.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- v[0-9]+.[0-9]+.[0-9]+
9+
pull_request:
10+
11+
env:
12+
NODE_VERSION: 10
13+
14+
jobs:
15+
test:
16+
name: Lint and Test
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v2
20+
- uses: mansona/npm-lockfile-version@v1
21+
- uses: actions/setup-node@v2
22+
with:
23+
node-version: ${{ env.NODE_VERSION }}
24+
25+
- run: npm i -g npm@7
26+
- run: npm ci
27+
- run: npm run lint:hbs
28+
- run: npm run lint:js
29+
- run: npm run test
30+
31+
32+
test-addon-floating:
33+
name: Test addon (floating dependencies)
34+
runs-on: ubuntu-latest
35+
steps:
36+
- uses: actions/checkout@v2
37+
- uses: actions/setup-node@v2
38+
with:
39+
node-version: ${{ env.NODE_VERSION }}
40+
41+
- run: npm i -g npm@7
42+
- run: npm install --no-package-lock
43+
- run: npm run test
44+
45+
test-compatibility:
46+
name: Test compatibility
47+
runs-on: ubuntu-latest
48+
needs: test
49+
strategy:
50+
matrix:
51+
scenario:
52+
- 'ember-release'
53+
- 'ember-beta'
54+
- 'ember-canary'
55+
- 'ember-default-with-jquery'
56+
steps:
57+
- uses: actions/checkout@v2
58+
- uses: actions/setup-node@v2
59+
with:
60+
node-version: ${{ env.NODE_VERSION }}
61+
62+
- run: npm i -g npm@7
63+
- run: npm ci
64+
- name: Test
65+
run: npx ember try:one $EMBER_TRY_SCENARIO ${{ matrix.scenario }}

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,20 @@
99
/node_modules/
1010

1111
# misc
12+
/.env*
13+
/.pnp*
1214
/.sass-cache
1315
/connect.lock
1416
/coverage/
1517
/libpeerconnection.log
1618
/npm-debug.log*
1719
/testem.log
1820
/yarn-error.log
19-
package-lock.json
2021

2122
# ember-try
2223
/.node_modules.ember-try/
2324
/bower.json.ember-try
2425
/package.json.ember-try
26+
27+
.vscode
28+
.changelog

.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
/.bowerrc
1010
/.editorconfig
1111
/.ember-cli
12+
/.env*
1213
/.eslintignore
1314
/.eslintrc.js
15+
/.git/
1416
/.gitignore
1517
/.template-lintrc.js
1618
/.travis.yml
1719
/.watchmanconfig
1820
/bower.json
1921
/config/ember-try.js
22+
/CONTRIBUTING.md
2023
/ember-cli-build.js
2124
/testem.js
2225
/tests/

.travis.yml

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

CONTRIBUTING.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# How To Contribute
2+
3+
## Installation
4+
5+
* `git clone <repository-url>`
6+
* `cd ember-styleguide`
7+
* `npm install`
8+
9+
## Linting
10+
11+
* `npm run lint:hbs`
12+
* `npm run lint:js`
13+
* `npm run lint:js -- --fix`
14+
15+
## Running tests
16+
17+
* `ember test` – Runs the test suite on the current Ember version
18+
* `ember test --server` – Runs the test suite in "watch mode"
19+
* `ember try:each` – Runs the test suite against multiple Ember versions
20+
21+
## Running the dummy application
22+
23+
* `ember serve`
24+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
25+
26+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# ember-styleguide [![Build Status](https://travis-ci.org/ember-learn/ember-styleguide.svg?branch=master)](https://travis-ci.org/ember-learn/ember-styleguide) [![Latest NPM release](https://img.shields.io/npm/v/ember-styleguide.svg)](https://www.npmjs.com/package/ember-styleguide.svg)
22

3-
This addon is intended to provide basic components for easier style coordination among the Ember family of websites, although the original intent is to support the emberjs.com website. We are committed to the goal of meeting WCAG 2.0 AA conformance standards.
3+
This addon is intended to provide basic components for easier style coordination among the Ember family of websites, although the original intent is to support the emberjs.com website. We are committed to the goal of meeting WCAG 2.0 AA conformance standards.
44

5-
Contributions are encouraged! You'll notice that the issues in this repository have been labeled to help you find the issue that is just right for you!
5+
Contributions are encouraged! You'll notice that the issues in this repository have been labeled to help you find the issue that is just right for you!
66

7-
[See the visual design](https://codepen.io/melsumner/pen/9d551738a81e319a773395a2cfa1a82e) as a work in progress & feel free to submit ideas of your own!
7+
[See the visual design](https://codepen.io/melsumner/pen/9d551738a81e319a773395a2cfa1a82e) as a work in progress & feel free to submit ideas of your own!
88

99

1010

@@ -29,12 +29,11 @@ Contributions are encouraged! You'll notice that the issues in this repository h
2929

3030
* `ember build`
3131

32-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
3332

3433
## WIP Notes
3534

3635
* Each component must have the component name attached to the component as a CSS class.
37-
* It may feel as though there is duplicated code throughout these components; during the WIP process, we are favoring duplication over abstraction.
38-
* Font icons through [ember-fontawesome](https://fontawesome.com/how-to-use/on-the-web/using-with/ember) - it is supported by the font awesome team and they render to SVG.
36+
* It may feel as though there is duplicated code throughout these components; during the WIP process, we are favoring duplication over abstraction.
37+
* Font icons through [ember-fontawesome](https://fontawesome.com/how-to-use/on-the-web/using-with/ember) - it is supported by the font awesome team and they render to SVG.
3938
* The `es-pagewrapper` component has a property to indicate if there will be a sidebar or not. There might be a better way to do this.
40-
* In this addon, the `section` element is used as a container and is intended to span the full width of the viewport.
39+
* In this addon, the `section` element is used as a container and is intended to span the full width of the viewport.

changelog.template

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{{#each releases}}
2+
x.x.x / {{isoDate}}
3+
==================
4+
{{#if merges}}
5+
{{#each merges}}
6+
* {{#if commit.breaking}}**Breaking change:** {{/if}}{{message}} #{{id}} from @{{githubIssue.user.login}}
7+
{{/each}}
8+
{{/if}}
9+
10+
{{#if fixes}}
11+
{{#each fixes}}
12+
* FIX: {{#if commit.breaking}}**Breaking change:** {{/if}}{{commit.subject}}{{#each fixes}} {{#if href}}[`#{{id}}`]({{href}}){{/if}}{{/each}}
13+
{{/each}}
14+
{{/if}}
15+
{{/each}}

config/addon-docs.js

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

0 commit comments

Comments
 (0)