Skip to content

Commit

Permalink
chore(deps): update ember
Browse files Browse the repository at this point in the history
  • Loading branch information
anehx committed Dec 12, 2023
1 parent 296aad2 commit 631c55c
Show file tree
Hide file tree
Showing 66 changed files with 1,192 additions and 1,140 deletions.
12 changes: 0 additions & 12 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,16 @@
# unconventional js
**/blueprints/*/files/
**/vendor/

# compiled output
**/dist/
**/tmp/

# dependencies
**/bower_components/
**/node_modules/

# misc
**/coverage/
!.*
.*/
.eslintcache

# 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

# ember-cli-addon-docs
packages/-ember-caluma/app/snippets/
14 changes: 0 additions & 14 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,3 @@ updates:
- dependency-name: ember-apollo-client
versions:
- ">= 4.1.0 <= 4.1.1"
# https://github.com/villander/ember-engines-router-service/issues/67
- dependency-name: ember-engines-router-service
versions:
- ">= 0.4.0 <= 4.4.1"
# Not ready yet for Ember v5
- dependency-name: ember-source
versions:
- ">= 5.0.0"
- dependency-name: ember-cli
versions:
- ">= 5.0.0"
- dependency-name: ember-data
versions:
- ">= 5.0.0"
1 change: 1 addition & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ jobs:
fail-fast: false
matrix:
scenario:
- ember-lts-4.12
- ember-lts-4.8
- ember-lts-4.4
- ember-release
Expand Down
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
**/dist/
**/tmp/
**/declarations/

# dependencies
**/bower_components/
**/node_modules/

# misc
**/.env*
**/.pnp*
**/.sass-cache
**/.eslintcache
**/connect.lock
**/coverage/
**/libpeerconnection.log
**/npm-debug.log*
**/testem.log
**/yarn-error.log

# ember-try
**/.node_modules.ember-try/
**/bower.json.ember-try
**/npm-shrinkwrap.json.ember-try
**/package.json.ember-try
**/package-lock.json.ember-try
Expand Down
14 changes: 1 addition & 13 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,16 @@
# unconventional js
**/blueprints/*/files/
**/vendor/

# compiled output
**/dist/
**/tmp/

# dependencies
**/bower_components/
**/node_modules/

# misc
**/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

# release-it
CHANGELOG.md
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ The Ember.js addons for [Caluma](https://caluma.io) - a collaborative form editi

`@projectcaluma/ember-*` packages are guaranteed to work with the following LTS versions of Ember.js:

- 4.12
- 4.8
- 4.4

Expand Down
12 changes: 10 additions & 2 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ module.exports = async function () {
},
},
},
{
name: "ember-lts-4.12",
npm: {
devDependencies: {
"ember-source": "~4.12.0",
},
},
},
{
name: "ember-release",
npm: {
Expand All @@ -48,8 +56,8 @@ module.exports = async function () {
},
},
},
embroiderSafe(),
embroiderOptimized(),
embroiderSafe({ allowedToFail: true }),
embroiderOptimized({ allowedToFail: true }),
],
};
};
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@
"typescript"
],
"allowedVersions": {
"graphql": "^15.8.0"
"graphql": "^15.8.0",
"ember-source": "^5.0.0",
"ember-sortable>@ember/test-helpers": "^3.2.1"
}
}
},
Expand Down
8 changes: 0 additions & 8 deletions packages/-ember-caluma/.ember-cli
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": true,

/**
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.
Expand Down
2 changes: 1 addition & 1 deletion packages/-ember-caluma/.watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
3 changes: 3 additions & 0 deletions packages/-ember-caluma/app/adapters/application.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import JSONAPIAdapter from "@ember-data/adapter/json-api";

export default class ApplicationAdapter extends JSONAPIAdapter {}
2 changes: 1 addition & 1 deletion packages/-ember-caluma/app/models/group.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ import Model, { attr, belongsTo } from "@ember-data/model";
export default class GroupModel extends Model {
@attr name;

@belongsTo("groupType", { inverse: "groups", async: true }) type;
@belongsTo("group-type", { inverse: "groups", async: true }) type;
}
1 change: 1 addition & 0 deletions packages/-ember-caluma/app/services/store.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from "ember-data/store";
4 changes: 2 additions & 2 deletions packages/-ember-caluma/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"packages": [
{
"name": "ember-cli",
"version": "4.12.1",
"version": "5.4.1",
"blueprints": [
{
"name": "app",
"outputRepo": "https://github.com/ember-cli/ember-new-output",
"codemodsSource": "ember-app-codemods-manifest@1",
"isBaseBlueprint": true,
"options": ["--no-welcome"]
"options": ["--pnpm", "--no-welcome"]
}
]
}
Expand Down
8 changes: 5 additions & 3 deletions packages/-ember-caluma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"start-proxy": "ember serve --proxy http://localhost:8000"
},
"devDependencies": {
"@babel/core": "^7.23.5",
"@ember/legacy-built-in-components": "0.5.0",
"@ember/optional-features": "2.0.0",
"@ember/string": "3.1.1",
Expand All @@ -33,9 +34,10 @@
"ember-auto-import": "2.7.0",
"ember-changeset": "4.1.2",
"ember-changeset-validations": "4.1.1",
"ember-cli": "4.12.2",
"ember-cli": "5.4.1",
"ember-cli-addon-docs": "6.0.2",
"ember-cli-babel": "8.2.0",
"ember-cli-clean-css": "3.0.0",
"ember-cli-dependency-checker": "3.3.2",
"ember-cli-deploy": "2.0.0",
"ember-cli-deploy-build": "3.0.0",
Expand All @@ -49,7 +51,7 @@
"ember-cli-sri": "2.1.1",
"ember-cli-terser": "4.0.2",
"ember-composable-helpers": "5.0.0",
"ember-data": "4.12.5",
"ember-data": "5.3.0",
"ember-disable-prototype-extensions": "1.1.3",
"ember-engines": "0.9.0",
"ember-engines-router-service": "0.5.0",
Expand All @@ -62,7 +64,7 @@
"ember-power-select": "7.2.0",
"ember-resolver": "11.0.1",
"ember-sortable": "5.0.0",
"ember-source": "4.12.3",
"ember-source": "5.4.0",
"ember-truth-helpers": "4.0.3",
"ember-uikit": "9.0.0",
"ember-validated-form": "7.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/-ember-caluma/tests/helpers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
setupTest as upstreamSetupTest,
} from "ember-qunit";

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

Expand Down
8 changes: 0 additions & 8 deletions packages/analytics/.ember-cli
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": true,

/**
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.
Expand Down
6 changes: 0 additions & 6 deletions packages/analytics/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
Expand All @@ -23,7 +19,6 @@
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
Expand All @@ -34,7 +29,6 @@

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/.watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
11 changes: 6 additions & 5 deletions packages/analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.23.5",
"@ember/legacy-built-in-components": "^0.5.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
Expand Down Expand Up @@ -44,28 +45,28 @@
],
"devDependencies": {
"@ember/optional-features": "2.0.0",
"@ember/string": "3.1.1",
"@ember/test-helpers": "3.2.1",
"@ember/test-waiters": "3.1.0",
"@embroider/test-setup": "3.0.3",
"@faker-js/faker": "8.3.1",
"@projectcaluma/ember-testing": "workspace:*",
"broccoli-asset-rev": "3.0.0",
"ember-cli": "4.12.2",
"ember-cli": "5.4.1",
"ember-cli-clean-css": "3.0.0",
"ember-cli-code-coverage": "2.0.3",
"ember-cli-dependency-checker": "3.3.2",
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-mirage": "3.0.2",
"ember-cli-sass": "11.0.1",
"ember-cli-sri": "2.1.1",
"ember-cli-terser": "4.0.2",
"ember-data": "4.12.5",
"ember-data": "5.3.0",
"ember-engines": "0.9.0",
"ember-load-initializers": "2.1.2",
"ember-modifier": "4.1.0",
"ember-qunit": "8.0.2",
"ember-resolver": "11.0.1",
"ember-source": "4.12.3",
"ember-source": "5.4.0",
"ember-source-channel-url": "3.0.0",
"ember-try": "3.0.0",
"loader.js": "4.7.0",
Expand All @@ -88,7 +89,7 @@
}
},
"engines": {
"node": "14.* || 16.* || >= 18"
"node": ">= 18"
},
"ember": {
"edition": "octane"
Expand Down
5 changes: 3 additions & 2 deletions packages/analytics/tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
"packages": [
{
"name": "ember-cli",
"version": "4.12.1",
"version": "5.4.1",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true
"isBaseBlueprint": true,
"options": ["--pnpm", "--no-welcome"]
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/tests/helpers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
setupTest as upstreamSetupTest,
} from "ember-qunit";

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

Expand Down
10 changes: 10 additions & 0 deletions packages/analytics/tsconfig.declarations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"declarationDir": "declarations",
"emitDeclarationOnly": true,
"noEmit": false,
"rootDir": "."
},
"include": ["addon", "addon-test-support"]
}
Loading

0 comments on commit 631c55c

Please sign in to comment.