Skip to content

Commit 74b5508

Browse files
mansonamansona
committed
reset blueprint using ember-cli-update
1 parent dbb25cd commit 74b5508

22 files changed

+1292
-948
lines changed

‎README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -742,13 +742,6 @@ Make sure you have `.vscode/launch.json` with minimal configuration that looks l
742742
743743
Run the automated tests by running `npm test`.
744744
745-
Note that the integration tests create new Ember applications via `ember
746-
new` and thus have to run an `npm install`, which can take several
747-
minutes, particularly on slow connections.
748-
749-
To speed up test runs you can run `npm run test:precook` to "precook" a
750-
`node_modules` directory that will be reused across test runs.
751-
752745
### Debugging Integration Tests
753746
754747
Run the tests with the `DEBUG` environment variable set to

‎packages/ember-cli-fastboot/.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
1617
.eslintcache
1718

1819
# ember-try

‎packages/ember-cli-fastboot/.eslintrc.js

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable no-dupe-keys, prettier/prettier */
21
'use strict';
32

43
module.exports = {
@@ -18,34 +17,23 @@ module.exports = {
1817
'plugin:prettier/recommended',
1918
],
2019
env: {
21-
browser: true
22-
},
23-
rules: {
24-
'ember/no-get': 'warn',
25-
'ember/require-computed-property-dependencies': 'warn'
20+
browser: true,
2621
},
2722
rules: {},
2823
overrides: [
2924
// node files
3025
{
3126
files: [
32-
'.eslintrc.js',
33-
'.prettierrc.js',
34-
'.template-lintrc.js',
35-
'ember-cli-build.js',
36-
'index.js',
37-
'testem.js',
38-
'blueprints/*/index.js',
39-
'config/**/*.js',
40-
'tests/dummy/config/**/*.js',
41-
'lib/**/*.js'
42-
],
43-
excludedFiles: [
44-
'app/**',
45-
'addon/**',
46-
'addon-test-support/**',
47-
'app/**',
48-
'tests/dummy/app/**',
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./index.js',
32+
'./testem.js',
33+
'./blueprints/*/index.js',
34+
'./config/**/*.js',
35+
'./tests/dummy/config/**/*.js',
36+
'./lib/**/*.js',
4937
],
5038
parserOptions: {
5139
sourceType: 'script',
@@ -57,5 +45,10 @@ module.exports = {
5745
plugins: ['node'],
5846
extends: ['plugin:node/recommended'],
5947
},
48+
{
49+
// Test files:
50+
files: ['tests/**/*-test.{js,ts}'],
51+
extends: ['plugin:qunit/recommended'],
52+
},
6053
],
6154
};

‎packages/ember-cli-fastboot/.gitignore

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
# compiled output
4+
/dist/
5+
/tmp/
6+
7+
# dependencies
8+
/bower_components/
9+
/node_modules/
10+
11+
# misc
12+
/.env*
13+
/.pnp*
14+
/.sass-cache
15+
/.eslintcache
16+
/connect.lock
17+
/coverage/
18+
/libpeerconnection.log
19+
/npm-debug.log*
20+
/testem.log
21+
/yarn-error.log
22+
23+
# ember-try
24+
/.node_modules.ember-try/
25+
/bower.json.ember-try
26+
/package.json.ember-try

‎packages/ember-cli-fastboot/.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
/testem.js
2828
/test/
2929
/tests/
30+
/yarn-error.log
3031
/yarn.lock
3132
.gitkeep
3233

‎packages/ember-cli-fastboot/.template-lintrc.js

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

33
module.exports = {
4-
extends: 'octane',
4+
extends: 'recommended',
55
};

‎packages/ember-cli-fastboot/LICENSE.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2024
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
6+
7+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎packages/ember-cli-fastboot/config/ember-try.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports = async function () {
2727
name: 'ember-lts-3.24',
2828
npm: {
2929
devDependencies: {
30-
'ember-source': '~3.24.0',
30+
'ember-source': '~3.24.3',
3131
},
3232
},
3333
},
@@ -39,14 +39,6 @@ module.exports = async function () {
3939
},
4040
},
4141
},
42-
{
43-
name: 'ember-lts-4.4',
44-
npm: {
45-
devDependencies: {
46-
'ember-source': '~4.4.0',
47-
},
48-
},
49-
},
5042
{
5143
name: 'ember-release',
5244
npm: {

‎packages/ember-cli-fastboot/ember-cli-build.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,11 @@ module.exports = function (defaults) {
1515
*/
1616

1717
const { maybeEmbroider } = require('@embroider/test-setup');
18-
return maybeEmbroider(app);
18+
return maybeEmbroider(app, {
19+
skipBabel: [
20+
{
21+
package: 'qunit',
22+
},
23+
],
24+
});
1925
};

‎packages/ember-cli-fastboot/package.json

Lines changed: 18 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,16 @@
1414
},
1515
"scripts": {
1616
"build": "ember build --environment=production",
17-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
17+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
1818
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
1919
"lint:hbs": "ember-template-lint .",
2020
"lint:hbs:fix": "ember-template-lint . --fix",
2121
"lint:js": "eslint . --cache",
22-
"release": "release-it",
2322
"lint:js:fix": "eslint . --fix",
2423
"start": "ember serve",
2524
"test": "npm-run-all lint test:*",
2625
"test:mocha": "mocha",
2726
"test:ember": "ember test",
28-
"test:precook": "node node_modules/ember-cli-addon-tests/scripts/precook-node-modules.js",
2927
"test:ember-compatibility": "ember try:each"
3028
},
3129
"dependencies": {
@@ -56,59 +54,47 @@
5654
"@glimmer/component": "^1.0.4",
5755
"@glimmer/tracking": "^1.0.4",
5856
"babel-eslint": "^10.1.0",
59-
"body-parser": "^1.18.3",
6057
"broccoli-asset-rev": "^3.0.0",
6158
"broccoli-test-helper": "^1.5.0",
62-
"chai": "^4.3.4",
63-
"chai-fs": "^2.0.0",
64-
"chai-string": "^1.4.0",
65-
"co": "4.6.0",
6659
"ember-auto-import": "^2.2.1",
67-
"ember-cli": "~4.1.0",
68-
"ember-cli-addon-tests": "^0.11.1",
60+
"ember-cli": "~3.28.6",
6961
"ember-cli-dependency-checker": "^3.2.0",
70-
"ember-cli-htmlbars": "^5.7.1",
71-
"ember-cli-inject-live-reload": "^2.0.2",
62+
"ember-cli-htmlbars": "^5.7.2",
63+
"ember-cli-inject-live-reload": "^2.1.0",
7264
"ember-cli-sri": "^2.1.1",
73-
"ember-cli-terser": "^4.0.1",
65+
"ember-cli-terser": "^4.0.2",
7466
"ember-disable-prototype-extensions": "^1.1.3",
7567
"ember-export-application-global": "^2.0.1",
7668
"ember-load-initializers": "^2.1.2",
77-
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
69+
"ember-maybe-import-regenerator": "^0.1.6",
7870
"ember-page-title": "^7.0.0",
7971
"ember-qunit": "^5.1.5",
80-
"ember-resolver": "^8.0.2",
81-
"ember-sinon": "^2.2.0",
82-
"ember-source": "~3.26.1",
72+
"ember-resolver": "^8.0.3",
73+
"ember-source": "~3.28.8",
8374
"ember-source-channel-url": "^3.0.0",
84-
"ember-template-lint": "^3.2.0",
85-
"ember-try": "^2.0.0",
86-
"eslint": "^7.23.0",
87-
"eslint-config-prettier": "^8.1.0",
88-
"eslint-plugin-ember": "^10.3.0",
75+
"ember-template-lint": "^3.15.0",
76+
"ember-try": "^3.0.0",
77+
"eslint": "^7.32.0",
78+
"eslint-config-prettier": "^8.3.0",
79+
"eslint-plugin-ember": "^10.5.8",
8980
"eslint-plugin-node": "^11.1.0",
90-
"eslint-plugin-prettier": "^3.3.1",
81+
"eslint-plugin-prettier": "^3.4.1",
82+
"eslint-plugin-qunit": "^6.2.0",
9183
"glob": "^7.1.3",
9284
"lint-to-the-future": "^2.0.0",
9385
"lint-to-the-future-eslint": "^2.0.1",
9486
"loader.js": "^4.7.0",
9587
"mocha": "^9.1.2",
9688
"npm-run-all": "^4.1.5",
97-
"prettier": "^2.2.1",
98-
"qunit": "^2.14.1",
89+
"prettier": "^2.5.1",
90+
"qunit": "^2.17.2",
9991
"qunit-dom": "^1.6.0",
100-
"release-it": "^14.2.2",
101-
"release-it-lerna-changelog": "^3.1.0",
102-
"request": "^2.88.0",
103-
"rsvp": "^4.8.3",
92+
"sinon": "^17.0.1",
10493
"webpack": "^5.90.1"
10594
},
10695
"engines": {
10796
"node": "14.* || 16.* || >=18"
10897
},
109-
"publishConfig": {
110-
"registry": "https://registry.npmjs.org/"
111-
},
11298
"ember": {
11399
"edition": "octane"
114100
},
@@ -117,8 +103,5 @@
117103
"before": [
118104
"broccoli-serve-files"
119105
]
120-
},
121-
"volta": {
122-
"extends": "../../package.json"
123106
}
124107
}

0 commit comments

Comments
 (0)