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.

Sign up for GitHub

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

upgrade Ember CLI and blueprints to v4.4 #684

Merged
merged 4 commits into from
Oct 16, 2023
Merged

upgrade Ember CLI and blueprints to v4.4 #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea701d0
upgrade Ember CLI and blueprints to v4.4
jelhan Oct 16, 2023
ea9b537
Merge remote-tracking branch 'origin/master' into ember-cli-update-v4.4
jelhan Oct 16, 2023
f261c9f
remove duplicated GitHub actions
jelhan Oct 16, 2023
0d7a0f2
fix linting
jelhan Oct 16, 2023
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
8 changes: 7 additions & 1 deletion .ember-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,11 @@

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
"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.
*/
"isTypeScriptProject": false
}
3 changes: 3 additions & 0 deletions .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,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
3 changes: 2 additions & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,11 @@ module.exports = {
},
},
{
// Test files:
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
rules: {
'qunit/no-assert-equal': 'warn',
'qunit/no-assert-logical-expression': 'warn',
'qunit/no-async-module-callbacks': 'warn',
'qunit/require-expect': 'warn',
Expand Down
0 .github/workflows/test-workflow.yml → .github/workflows/ci.yml
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,15 @@
# 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

# broccoli-debug
/DEBUG/

# BrowserStack
/*.pid
/*.log
4 changes: 4 additions & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,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
8 changes: 8 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,15 @@ Croodle is an end-to-end encrypted web application to schedule a date or to do a

This is an alpha version. Changes could brake backward compatibility. It is also not well tested and some features are missing. It is not meant for productive use yet.

<<<<<<< HEAD
Croodle is inspired by [PrivateBin](https://github.com/PrivateBin/PrivateBin) and, of course, by Doodle.
=======
* [Git](https://git-scm.com/)
* [Node.js](https://nodejs.org/)
* [Yarn](https://yarnpkg.com/)
* [Ember CLI](https://cli.emberjs.com/release/)
* [Google Chrome](https://google.com/chrome/)
>>>>>>> e9ac386 (v3.28.6...v4.4.1)

## Security notice

Expand Down
1 change: 0 additions & 1 deletion app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Croodle</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
Expand Down
2 changes: 1 addition & 1 deletion config/ember-cli-update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "3.28.6",
"version": "4.4.1",
"blueprints": [
{
"name": "app",
Expand Down
27 changes: 13 additions & 14 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,27 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^2.6.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@ember/test-helpers": "^2.7.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"babel-eslint": "^10.1.0",
"bootstrap": "^4.3.1",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.0.0",
"ember-auto-import": "^2.4.1",
"ember-bootstrap": "^5.0.0",
"ember-classic-decorator": "^3.0.0",
"ember-cli": "~3.28.6",
"ember-cli": "~4.4.1",
"ember-cli-app-version": "^6.0.0",
"ember-cli-babel": "^8.0.0",
"ember-cli-browser-navigation-button-test-helper": "^0.3.0",
"ember-cli-browserstack": "^2.0.0",
"ember-cli-bundlesize": "^0.3.0",
"ember-cli-clipboard": "^0.16.0",
"ember-cli-content-security-policy": "^2.0.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-deprecation-workflow": "^2.0.0",
"ember-cli-flash": "^4.0.0",
"ember-cli-htmlbars": "^6.0.0",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-mirage": "^3.0.0",
"ember-cli-page-object": "^2.0.0",
Expand All @@ -63,38 +63,37 @@
"ember-intl": "^5.0.0",
"ember-load-initializers": "^2.1.2",
"ember-math-helpers": "^3.0.0",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-modifier": "^4.0.0",
"ember-page-title": "^8.0.0",
"ember-power-calendar": "^0.20.0",
"ember-power-calendar-luxon": "^0.5.0",
"ember-qunit": "^6.0.0",
"ember-resolver": "^11.0.0",
"ember-source": "~4.12.0",
"ember-template-lint": "^4.0.0",
"ember-template-lint": "^4.8.0",
"ember-test-selectors": "^6.0.0",
"ember-truth-helpers": "^4.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.0.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^6.2.0",
"eslint-plugin-qunit": "^7.2.0",
"fs-extra": "^9.0.0",
"lerna-changelog": "^2.0.0",
"loader.js": "^4.7.0",
"miragejs": "^0.1.47",
"npm-run-all": "^4.1.5",
"open-iconic": "^1.1.1",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"prettier": "^2.6.2",
"qunit": "^2.19.1",
"qunit-dom": "^3.0.0",
"release-it": "^16.0.0",
"release-it-lerna-changelog": "^5.0.0",
"sass": "^1.19.0",
"sjcl": "^1.0.8",
"tracked-built-ins": "^3.3.0",
"webpack": "^5.0.0"
"webpack": "^5.72.1"
},
"engines": {
"node": "18.* || >=20"
Expand Down
Empty file removed tests/helpers/.gitkeep
View file
Open in desktop
Empty file.
42 changes: 42 additions & 0 deletions tests/helpers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import {
setupApplicationTest as upstreamSetupApplicationTest,
setupRenderingTest as upstreamSetupRenderingTest,
setupTest as upstreamSetupTest,
} from 'ember-qunit';

// This file exists to provide wrappers around ember-qunit's / ember-mocha's
// test setup functions. This way, you can easily extend the setup that is
// needed per test type.

function setupApplicationTest(hooks, options) {
upstreamSetupApplicationTest(hooks, options);

// Additional setup for application tests can be done here.
//
// For example, if you need an authenticated session for each
// application test, you could do:
//
// hooks.beforeEach(async function () {
// await authenticateSession(); // ember-simple-auth
// });
//
// This is also a good place to call test setup functions coming
// from other addons:
//
// setupIntl(hooks); // ember-intl
// setupMirage(hooks); // ember-cli-mirage
}

function setupRenderingTest(hooks, options) {
upstreamSetupRenderingTest(hooks, options);

// Additional setup for rendering tests can be done here.
}

function setupTest(hooks, options) {
upstreamSetupTest(hooks, options);

// Additional setup for unit tests can be done here.
}

export { setupApplicationTest, setupRenderingTest, setupTest };
1 change: 0 additions & 1 deletion tests/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Croodle Tests</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
Expand Down
Loading
Loading