Skip to content

Commit

Permalink
Merge pull request #744 from elwayman02/ember-4.9
Browse files Browse the repository at this point in the history
Ember 4.9 Blueprint Updates
  • Loading branch information
elwayman02 authored Dec 8, 2022
2 parents 287a8ab + 9f38243 commit a9c4af1
Show file tree
Hide file tree
Showing 9 changed files with 161 additions and 190 deletions.
4 changes: 2 additions & 2 deletions .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
}
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
Expand Down
5 changes: 0 additions & 5 deletions config/environment.js

This file was deleted.

18 changes: 10 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
},
"scripts": {
"build": "ember build --environment=production",
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix|hbs)\"",
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
"lint": "concurrently \"npm:lint:*(!fix|hbs)\" --names \"lint:\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each"
},
Expand All @@ -43,7 +43,8 @@
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~4.8.0",
"concurrently": "^7.6.0",
"ember-cli": "~4.9.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-deprecation-workflow": "^2.0.0",
"ember-cli-fastboot": "^3.3.2",
Expand All @@ -52,7 +53,6 @@
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~4.9.1",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-fetch": "^8.1.2",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
Expand All @@ -61,7 +61,7 @@
"ember-sinon-qunit": "^6.0.0",
"ember-source": "~4.9.1",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.1.1",
"ember-template-lint": "^5.2.0",
"ember-try": "^2.0.0",
"eslint": "^8.29.0",
"eslint-config-prettier": "^8.5.0",
Expand All @@ -72,9 +72,8 @@
"field-guide": "^2.4.0",
"field-guide-default-template": "^3.0.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prember": "^1.1.1",
"prettier": "^2.8.0",
"prettier": "^2.8.1",
"qunit": "^2.19.3",
"qunit-dom": "^2.0.0",
"release-it": "^15.5.1",
Expand All @@ -85,6 +84,9 @@
"fastbootDependencies": [
"crypto"
],
"peerDependencies": {
"ember-source": "^3.28.0 || ^4.0.0"
},
"engines": {
"node": "14.* || 16.* || >= 18"
},
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "4.8.0",
"version": "4.9.0",
"blueprints": [
{
"name": "addon",
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ module.exports = function (environment) {
rootURL: '/',
locationType: 'history',
EmberENV: {
EXTEND_PROTOTYPES: false,
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
Expand Down
Empty file removed vendor/.gitkeep
Empty file.
Loading

0 comments on commit a9c4af1

Please sign in to comment.