Skip to content

Commit 3ec9814

Browse files
authored
Merge pull request #426 from ember-bootstrap/upgrade-with-ember-cli-blueprints-5-12
Upgrade with Ember CLI v5.12 blueprints
2 parents 33f573b + 88e1d88 commit 3ec9814

File tree

12 files changed

+110
-218
lines changed

12 files changed

+110
-218
lines changed

.ember-cli

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
{
2-
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
7-
*/
8-
"disableAnalytics": false,
9-
102
/**
113
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
124
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.

.eslintignore

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
5+
/declarations/
66
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
127

138
# misc
149
/coverage/
1510
!.*
1611
.*/
17-
.eslintcache
1812

1913
# ember-try
2014
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try

.gitignore

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64

75
# dependencies
8-
/bower_components/
96
/node_modules/
107

118
# misc
129
/.env*
1310
/.pnp*
14-
/.sass-cache
1511
/.eslintcache
16-
/connect.lock
1712
/coverage/
18-
/libpeerconnection.log
1913
/npm-debug.log*
2014
/testem.log
2115
/yarn-error.log
2216

2317
# ember-try
2418
/.node_modules.ember-try/
25-
/bower.json.ember-try
2619
/npm-shrinkwrap.json.ember-try
2720
/package.json.ember-try
2821
/package-lock.json.ember-try

.npmignore

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
/dist/
33
/tmp/
44

5-
# dependencies
6-
/bower_components/
7-
85
# misc
9-
/.bowerrc
106
/.editorconfig
117
/.ember-cli
128
/.env*
@@ -23,18 +19,18 @@
2319
/.template-lintrc.js
2420
/.travis.yml
2521
/.watchmanconfig
26-
/bower.json
2722
/CONTRIBUTING.md
2823
/ember-cli-build.js
2924
/testem.js
3025
/tests/
26+
/tsconfig.declarations.json
27+
/tsconfig.json
3128
/yarn-error.log
3229
/yarn.lock
3330
.gitkeep
3431

3532
# ember-try
3633
/.node_modules.ember-try/
37-
/bower.json.ember-try
3834
/npm-shrinkwrap.json.ember-try
3935
/package.json.ember-try
4036
/package-lock.json.ember-try

.prettierignore

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
16-
.eslintcache
17-
.lint-todo/
10+
.*/
1811

1912
# ember-try
2013
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try

.watchmanconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp", "dist"]
2+
"ignore_dirs": ["dist"]
33
}

CONTRIBUTING.md

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

33
## Installation
44

5-
* `git clone <repository-url>`
6-
* `cd my-addon`
7-
* `npm install`
5+
- `git clone <repository-url>`
6+
- `cd ember-bootstrap-power-select`
7+
- `pnpm install`
88

99
## Linting
1010

11-
* `pnpm lint`
12-
* `pnpm lint:fix`
11+
- `pnpm lint`
12+
- `pnpm lint:fix`
1313

1414
## Running tests
1515

16-
* `ember test` – Runs the test suite on the current Ember version
17-
* `ember test --server` – Runs the test suite in "watch mode"
18-
* `ember try:each` – Runs the test suite against multiple Ember versions
16+
- `pnpm test` – Runs the test suite on the current Ember version
17+
- `pnpm test:ember --server` – Runs the test suite in "watch mode"
18+
- `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions
1919

2020
## Running the dummy application
2121

22-
* `ember serve`
23-
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
22+
- `pnpm start`
23+
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

2525
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,31 @@
1616
},
1717
"scripts": {
1818
"build": "ember build --environment=production",
19-
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
19+
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
2020
"lint:css": "stylelint \"**/*.css\"",
21-
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
22-
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
21+
"lint:css:fix": "concurrently \"pnpm:lint:css -- --fix\"",
22+
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
2323
"lint:hbs": "ember-template-lint .",
2424
"lint:hbs:fix": "ember-template-lint . --fix",
2525
"lint:js": "eslint . --cache",
2626
"lint:js:fix": "eslint . --fix",
2727
"start": "ember server",
28-
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
28+
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
2929
"test:ember": "ember test",
3030
"test:ember-compatibility": "ember try:each",
3131
"test:blueprint": "mocha node-tests --recursive"
3232
},
3333
"dependencies": {
34+
"@babel/core": "^7.25.2",
3435
"chalk": "^4.1.2",
35-
"ember-cli-babel": "^8.0.0",
36+
"ember-cli-babel": "^8.2.0",
3637
"ember-cli-build-config-editor": "^0.5.0",
37-
"ember-cli-htmlbars": "^6.2.0"
38+
"ember-cli-htmlbars": "^6.3.0"
3839
},
3940
"devDependencies": {
4041
"@babel/eslint-parser": "7.28.4",
4142
"@babel/plugin-proposal-decorators": "7.28.0",
4243
"@ember/optional-features": "2.2.0",
43-
"@ember/string": "4.0.1",
4444
"@ember/test-helpers": "5.3.0",
4545
"@embroider/macros": "1.18.1",
4646
"@embroider/test-setup": "4.0.0",
@@ -55,6 +55,7 @@
5555
"ember-bootstrap": "6.5.0",
5656
"ember-cli": "6.7.0",
5757
"ember-cli-blueprint-test-helpers": "0.19.2",
58+
"ember-cli-clean-css": "^3.0.0",
5859
"ember-cli-dependency-checker": "3.3.3",
5960
"ember-cli-inject-live-reload": "2.1.0",
6061
"ember-cli-sri": "2.1.1",
@@ -71,7 +72,7 @@
7172
"ember-try": "4.0.0",
7273
"eslint": "8.57.1",
7374
"eslint-config-prettier": "10.1.8",
74-
"eslint-plugin-ember": "11.12.0",
75+
"eslint-plugin-ember": "12.2.1",
7576
"eslint-plugin-n": "17.23.1",
7677
"eslint-plugin-prettier": "5.5.4",
7778
"eslint-plugin-qunit": "8.2.5",

0 commit comments

Comments
 (0)