Skip to content

Commit d5bbccb

Browse files
authored
Upgrade with Ember CLI 4.12 blueprints (#86)
* ember-cli-update should use --pnpm flag * upgrade project with Ember CLI 4.12 blueprints * upgrade ember-template-lint to fix compatbility issue * hold back @embroider/test-setup upgrade as Embroider tests are failing
1 parent 0d207be commit d5bbccb

20 files changed

+959
-1686
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
}

.eslintrc.js

Lines changed: 9 additions & 6 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,8 +45,7 @@ module.exports = {
4145
browser: false,
4246
node: true,
4347
},
44-
plugins: ['node'],
45-
extends: ['plugin:node/recommended'],
48+
extends: ['plugin:n/recommended'],
4649
},
4750
{
4851
// test files

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ on:
99
pull_request: {}
1010

1111
concurrency:
12-
group: ci-${{ github.head_ref || github.ref }}
13-
cancel-in-progress: true
12+
group: ci-${{ github.head_ref || github.ref }}
13+
cancel-in-progress: true
1414

1515
jobs:
1616
test:
1717
name: "Tests"
1818
runs-on: ubuntu-latest
19+
timeout-minutes: 10
1920

2021
steps:
2122
- uses: actions/checkout@v5
@@ -37,6 +38,7 @@ jobs:
3738
floating:
3839
name: "Floating Dependencies"
3940
runs-on: ubuntu-latest
41+
timeout-minutes: 10
4042

4143
steps:
4244
- uses: actions/checkout@v5
@@ -55,7 +57,8 @@ jobs:
5557
try-scenarios:
5658
name: ${{ matrix.try-scenario }}
5759
runs-on: ubuntu-latest
58-
needs: 'test'
60+
needs: "test"
61+
timeout-minutes: 10
5962

6063
strategy:
6164
fail-fast: false

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@
2727
/package.json.ember-try
2828
/package-lock.json.ember-try
2929
/yarn.lock.ember-try
30+
31+
# broccoli-debug
32+
/DEBUG/

.npmignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
/.gitignore
1919
/.prettierignore
2020
/.prettierrc.js
21+
/.stylelintignore
22+
/.stylelintrc.js
2123
/.template-lintrc.js
2224
/.travis.yml
2325
/.watchmanconfig
2426
/bower.json
25-
/config/ember-try.js
2627
/CONTRIBUTING.md
2728
/ember-cli-build.js
2829
/testem.js

.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/

.stylelintrc.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+
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
5+
};

README.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Ember-bootstrap-changeset-validations
1+
# Ember Bootstrap Changeset Validations
22

33
[![Build Status](https://travis-ci.org/kaliber5/ember-bootstrap-changeset-validations.svg?branch=master)](https://travis-ci.org/kaliber5/ember-bootstrap-changeset-validations)
44

@@ -7,8 +7,7 @@ This way your forms are only submitted when the underlying data is valid, otherw
77
markup will be applied. See the [FormElement documentation](https://www.ember-bootstrap.com/api/classes/Components.FormElement.html) for
88
further details.
99

10-
Compatibility
11-
------------------------------------------------------------------------------
10+
## Compatibility
1211

1312
* Ember Bootstrap v5 or above
1413
* Ember Changeset and Ember Changeset Validations v4
@@ -17,8 +16,7 @@ Compatibility
1716
* Node.js v20 or above
1817

1918

20-
Installation
21-
------------------------------------------------------------------------------
19+
## Installation
2220

2321
ember install ember-bootstrap-changeset-validations
2422

@@ -56,8 +54,7 @@ Then assign the changeset based on that to your form:
5654
* [Jeldrik Hanschke](https://github.com/jelhan)
5755

5856

59-
Contributing
60-
------------------------------------------------------------------------------
57+
## Contributing
6158

6259
See the [Contributing](CONTRIBUTING.md) guide for details.
6360

ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

55
module.exports = function (defaults) {
6-
let app = new EmberAddon(defaults, {
6+
const app = new EmberAddon(defaults, {
77
// Add options here
88
'ember-bootstrap': {
99
bootstrapVersion: 5,

0 commit comments

Comments
 (0)