Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run npx ember-cli-update --to=4.1.0 to sync with the latest blueprint #2315

Merged
merged 5 commits into from
Jan 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,7 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module.exports = {
extends: ['plugin:node/recommended'],
},
{
// Test files:
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on:
- master
pull_request: {}

concurrency:
group: ci-${{ github.head_ref || github.ref }}
cancel-in-progress: true

jobs:
test:
name: "Tests"
Expand Down Expand Up @@ -62,13 +66,12 @@ jobs:
- ember-lts-3.20
- ember-lts-3.24
- ember-lts-3.28
#- ember-release
#- ember-beta
#- ember-canary
- ember-release
- ember-beta
- ember-canary
- ember-classic
- ember-default-with-jquery
#- embroider-safe
#- embroider-optimized
# - embroider-safe
# - embroider-optimized

steps:
- uses: actions/checkout@v2
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# custom
.floo
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.19.0
12.22.7
9 changes: 9 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,21 @@
/.eslintignore
/.eslintrc.js
/.git/
/.github/
/.gitignore
/.node-version
/.prettierignore
/.prettierrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/addon-docs.js
/config/deploy.js
/config/ember-try.js
/CONTRIBUTING.md
/ISSUE_TEMPLATE.md
/SECURITY.md
/ember-cli-build.js
/testem.js
/tests/
Expand All @@ -33,7 +39,10 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

/.sass-cache
/jekyll-tmp
Expand Down
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@
/coverage/
!.*
.eslintcache
.lint-todo/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ A client-side server to develop, test and prototype your Ember CLI app.

----

## Compatibility

* Ember.js v3.12 or above
* Ember CLI v3.12 or above
* Node.js v12 or above

## Installation

```sh
Expand Down
25 changes: 0 additions & 25 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,6 @@ module.exports = async function () {
devDependencies: {
'ember-source': await getChannelURL('release'),
},
dependencies: {
'ember-auto-import': '^2.2.4',
webpack: '^5.64.4',
},
},
},
{
Expand All @@ -69,10 +65,6 @@ module.exports = async function () {
devDependencies: {
'ember-source': await getChannelURL('beta'),
},
dependencies: {
'ember-auto-import': '^2.2.4',
webpack: '^5.64.4',
},
},
},
{
Expand All @@ -81,23 +73,6 @@ module.exports = async function () {
devDependencies: {
'ember-source': await getChannelURL('canary'),
},
dependencies: {
'ember-auto-import': '^2.2.4',
webpack: '^5.64.4',
},
},
},
{
name: 'ember-default-with-jquery',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true,
}),
},
npm: {
devDependencies: {
'@ember/jquery': '^1.1.0',
},
},
},
{
Expand Down
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"broccoli-funnel": "^3.0.3",
"broccoli-merge-trees": "^4.2.0",
"ember-auto-import": "^2.2.4",
"ember-cli-babel": "^7.26.6",
"ember-cli-babel": "^7.26.11",
"ember-destroyable-polyfill": "^2.0.3",
"ember-get-config": "0.2.4 - 0.5.0 || ^1.0.0",
"ember-inflector": "^2.0.0 || ^3.0.0 || ^4.0.2",
Expand All @@ -71,12 +71,12 @@
"@ember/jquery": "^2.0.0",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/test-setup": "^0.41.0",
"@embroider/test-setup": "^0.50.1",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.28.4",
"ember-cli": "~4.1.0",
"ember-cli-addon-docs": "^4.2.1",
"ember-cli-addon-docs-esdoc": "^0.4.0",
"ember-cli-dependency-checker": "^3.2.0",
Expand All @@ -97,20 +97,19 @@
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^8.1.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-moment": "^9.0.1",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~3.28.8",
"ember-source": "~4.1.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.14.0",
"ember-template-lint": "^3.15.0",
"ember-try": "^2.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.8",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.1.0",
"eslint-plugin-qunit": "^7.2.0",
"faker": "^5.1.0",
"fastboot": "^3.2.0-beta.5",
"js-yaml": "^4.0.0",
Expand Down
9 changes: 6 additions & 3 deletions test-projects/01-basic-app/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
/yarn-error.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion test-projects/01-basic-app/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": "3.28.4",
"version": "4.1.0",
"blueprints": [
{
"name": "app",
Expand Down
15 changes: 0 additions & 15 deletions test-projects/01-basic-app/config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,6 @@ const browsers = [
'last 1 Safari versions',
];

// Ember's browser support policy is changing, and IE11 support will end in
// v4.0 onwards.
//
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
//
// If you need IE11 support on a version of Ember that still offers support
// for it, uncomment the code block below.
//
// const isCI = Boolean(process.env.CI);
// const isProduction = process.env.EMBER_ENV === 'production';
//
// if (isCI || isProduction) {
// browsers.push('ie 11');
// }

module.exports = {
browsers,
node: 'current',
Expand Down
6 changes: 3 additions & 3 deletions test-projects/01-basic-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
"ember-export-application-global": "*",
"ember-fetch": "*",
"ember-load-initializers": "*",
"ember-maybe-import-regenerator": "*",
"ember-qunit": "*",
"ember-resolver": "*",
"ember-source": "*",
Expand All @@ -50,10 +49,11 @@
"miragejs": "*",
"npm-run-all": "*",
"qunit": "*",
"qunit-dom": "*"
"qunit-dom": "*",
"webpack": "*"
},
"engines": {
"node": ">= 10.*"
"node": "12.* || 14.* || >= 16"
},
"ember": {
"edition": "octane"
Expand Down
9 changes: 6 additions & 3 deletions test-projects/02-app-that-excludes-mirage/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
/yarn-error.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "3.28.4",
"version": "4.1.0",
"blueprints": [
{
"name": "app",
Expand Down
15 changes: 0 additions & 15 deletions test-projects/02-app-that-excludes-mirage/config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,6 @@ const browsers = [
'last 1 Safari versions',
];

// Ember's browser support policy is changing, and IE11 support will end in
// v4.0 onwards.
//
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
//
// If you need IE11 support on a version of Ember that still offers support
// for it, uncomment the code block below.
//
// const isCI = Boolean(process.env.CI);
// const isProduction = process.env.EMBER_ENV === 'production';
//
// if (isCI || isProduction) {
// browsers.push('ie 11');
// }

module.exports = {
browsers,
node: 'current',
Expand Down
6 changes: 3 additions & 3 deletions test-projects/02-app-that-excludes-mirage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
"ember-export-application-global": "*",
"ember-fetch": "*",
"ember-load-initializers": "*",
"ember-maybe-import-regenerator": "*",
"ember-qunit": "*",
"ember-resolver": "*",
"ember-source": "*",
Expand All @@ -50,10 +49,11 @@
"miragejs": "*",
"npm-run-all": "*",
"qunit": "*",
"qunit-dom": "*"
"qunit-dom": "*",
"webpack": "*"
},
"engines": {
"node": ">= 10.*"
"node": "12.* || 14.* || >= 16"
},
"ember": {
"edition": "octane"
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": "3.28.4",
"version": "4.1.0",
"blueprints": [
{
"name": "addon",
Expand Down
15 changes: 0 additions & 15 deletions tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,6 @@ const browsers = [
'last 1 Safari versions',
];

// Ember's browser support policy is changing, and IE11 support will end in
// v4.0 onwards.
//
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
//
// If you need IE11 support on a version of Ember that still offers support
// for it, uncomment the code block below.
//
// const isCI = Boolean(process.env.CI);
// const isProduction = process.env.EMBER_ENV === 'production';
//
// if (isCI || isProduction) {
// browsers.push('ie 11');
// }

module.exports = {
browsers,
node: 'current',
Expand Down
Loading