Skip to content

Commit 0f385e7

Browse files
nadnoslennadnoslen
authored
⬆️ Upgrade Ember-Cli 3.12 (#98)
* v3.9.0 * ⬆️ v3.9.0...v3.10.1 * ♻️ Running Codemods * v3.10.0 * ⬆️ v3.10.1...v3.12.1
1 parent 3a3e785 commit 0f385e7

File tree

15 files changed

+313
-175
lines changed

15 files changed

+313
-175
lines changed

‎.eslintrc.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
root: true,
33
parserOptions: {
4-
ecmaVersion: 2017,
4+
ecmaVersion: 2018,
55
sourceType: 'module',
66
},
77
plugins: ['ember'],
@@ -26,7 +26,6 @@ module.exports = {
2626
excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
2727
parserOptions: {
2828
sourceType: 'script',
29-
ecmaVersion: 2015,
3029
},
3130
env: {
3231
browser: false,

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set Node.js
1515
uses: actions/setup-node@master
1616
with:
17-
node-version: 10.24.1
17+
node-version: 12.22.8
1818

1919
- name: Get yarn cache
2020
id: yarn-cache

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nodejs 10.24.1
1+
nodejs 12.22.8

‎.travis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- '6'
6+
- '8'
77

88
sudo: false
99
dist: trusty
@@ -50,8 +50,8 @@ jobs:
5050
# we recommend new addons test the current and previous LTS
5151
# as well as latest stable release (bonus points to beta/canary)
5252
- stage: 'Additional Tests'
53-
env: EMBER_TRY_SCENARIO=ember-lts-2.18
54-
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
53+
env: EMBER_TRY_SCENARIO=ember-lts-3.4
54+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
5555
- env: EMBER_TRY_SCENARIO=ember-release
5656
- env: EMBER_TRY_SCENARIO=ember-beta
5757
- env: EMBER_TRY_SCENARIO=ember-canary

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ a _vanilla_ port of Gruber's original works.
1717

1818
## Compatibility
1919

20-
- Ember.js v2.18 or above
20+
- Ember.js v3.4 or above
2121
- Ember CLI v2.13 or above
22+
- Node.js v8 or above
2223

2324
## Installation
2425

‎addon/components/set-links-target.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ export default Component.extend({
3434
// got this far, then apply a target if it hasn't already got one
3535
if (isEmpty(element.getAttribute('target'))) {
3636
element.setAttribute('target', targetValue);
37+
if (targetValue === '_blank') {
38+
element.setAttribute('rel', 'noopener noreferrer');
39+
}
3740
}
3841
});
3942
},

‎config/ember-try.js‎

Lines changed: 56 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -2,78 +2,73 @@
22

33
const getChannelURL = require('ember-source-channel-url');
44

5-
module.exports = function () {
6-
return Promise.all([getChannelURL('release'), getChannelURL('beta'), getChannelURL('canary')]).then(urls => {
7-
return {
8-
scenarios: [
9-
{
10-
name: 'ember-lts-2.18',
11-
env: {
12-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
13-
},
14-
npm: {
15-
devDependencies: {
16-
'@ember/jquery': '^0.5.1',
17-
'ember-source': '~2.18.0',
18-
},
5+
module.exports = async function () {
6+
return {
7+
useYarn: true,
8+
scenarios: [
9+
{
10+
name: 'ember-lts-3.4',
11+
npm: {
12+
devDependencies: {
13+
'ember-source': '~3.4.0',
1914
},
2015
},
21-
{
22-
name: 'ember-lts-3.4',
23-
npm: {
24-
devDependencies: {
25-
'ember-source': '~3.4.0',
26-
},
16+
},
17+
{
18+
name: 'ember-lts-3.8',
19+
npm: {
20+
devDependencies: {
21+
'ember-source': '~3.8.0',
2722
},
2823
},
29-
{
30-
name: 'ember-release',
31-
npm: {
32-
devDependencies: {
33-
'ember-source': urls[0],
34-
},
24+
},
25+
{
26+
name: 'ember-release',
27+
npm: {
28+
devDependencies: {
29+
'ember-source': await getChannelURL('release'),
3530
},
3631
},
37-
{
38-
name: 'ember-beta',
39-
npm: {
40-
devDependencies: {
41-
'ember-source': urls[1],
42-
},
32+
},
33+
{
34+
name: 'ember-beta',
35+
npm: {
36+
devDependencies: {
37+
'ember-source': await getChannelURL('beta'),
4338
},
4439
},
45-
{
46-
name: 'ember-canary',
47-
npm: {
48-
devDependencies: {
49-
'ember-source': urls[2],
50-
},
40+
},
41+
{
42+
name: 'ember-canary',
43+
npm: {
44+
devDependencies: {
45+
'ember-source': await getChannelURL('canary'),
5146
},
5247
},
53-
// The default `.travis.yml` runs this scenario via `yarn test`,
54-
// not via `ember try`. It's still included here so that running
55-
// `ember try:each` manually or from a customized CI config will run it
56-
// along with all the other scenarios.
57-
{
58-
name: 'ember-default',
59-
npm: {
60-
devDependencies: {},
61-
},
48+
},
49+
// The default `.travis.yml` runs this scenario via `yarn test`,
50+
// not via `ember try`. It's still included here so that running
51+
// `ember try:each` manually or from a customized CI config will run it
52+
// along with all the other scenarios.
53+
{
54+
name: 'ember-default',
55+
npm: {
56+
devDependencies: {},
6257
},
63-
{
64-
name: 'ember-default-with-jquery',
65-
env: {
66-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
67-
'jquery-integration': true,
68-
}),
69-
},
70-
npm: {
71-
devDependencies: {
72-
'@ember/jquery': '^0.5.1',
73-
},
58+
},
59+
{
60+
name: 'ember-default-with-jquery',
61+
env: {
62+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
63+
'jquery-integration': true,
64+
}),
65+
},
66+
npm: {
67+
devDependencies: {
68+
'@ember/jquery': '^0.5.1',
7469
},
7570
},
76-
],
77-
};
78-
});
71+
},
72+
],
73+
};
7974
};

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-cli-marked-down",
3-
"version": "3.8.0",
3+
"version": "3.10.0",
44
"description": "This addon provides a means to generate html formatted markup from markdown source.",
55
"keywords": [
66
"ember-addon",
@@ -48,7 +48,7 @@
4848
"dependencies": {
4949
"ember-auto-import": "^1.5.3",
5050
"ember-cli-babel": "^7.26.11",
51-
"ember-cli-htmlbars": "^3.0.0",
51+
"ember-cli-htmlbars": "^3.0.1",
5252
"lodash.startswith": "^4.2.1",
5353
"showdown": "^1.9.1"
5454
},
@@ -59,7 +59,7 @@
5959
"bootstrap-sass": "^3.4.3",
6060
"bootswatch": "^3.4.1",
6161
"broccoli-asset-rev": "^3.0.0",
62-
"ember-cli": "~3.9.0",
62+
"ember-cli": "~3.12.1",
6363
"ember-cli-dependency-checker": "^3.1.0",
6464
"ember-cli-deploy": "^1.0.2",
6565
"ember-cli-deploy-build": "^2.0.0",
@@ -79,7 +79,7 @@
7979
"ember-maybe-import-regenerator": "^0.1.6",
8080
"ember-qunit": "^4.6.0",
8181
"ember-resolver": "^8.0.3",
82-
"ember-source": "~3.9.0",
82+
"ember-source": "~3.12.0",
8383
"ember-source-channel-url": "^3.0.0",
8484
"ember-try": "^2.0.0",
8585
"eslint-plugin-ember": "^7.0.0",
@@ -91,7 +91,7 @@
9191
"sass": "~1.48.0"
9292
},
9393
"engines": {
94-
"node": "6.* || 8.* || >= 10.*"
94+
"node": "8.* || >= 10.*"
9595
},
9696
"ember-addon": {
9797
"configPath": "tests/dummy/config"

‎testem.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ module.exports = {
99
// --no-sandbox is needed when running Chrome inside a container
1010
process.env.CI ? '--no-sandbox' : null,
1111
'--headless',
12-
'--disable-gpu',
1312
'--disable-dev-shm-usage',
1413
'--disable-software-rasterizer',
1514
'--mute-audio',

‎tests/dummy/app/templates/another-page.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<h1>Opened In The Same Tab!</h1>
44
<p>
55
See how the first link opened to this page in the same tab? Perfect.
6-
{{#link-to "index"}}Now go back and try the other link from the same example.{{/link-to}}
6+
<LinkTo @route="index">Now go back and try the other link from the same example.</LinkTo>
77
Notice that it will open in another tab because its origin isn't from ember-cli-marked-down.cybertooth.io.
88
</p>
99
</div>

0 commit comments

Comments
 (0)