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

chore(deps): update dependencies #1039

Merged
merged 1 commit into from
Dec 8, 2023
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
8 changes: 0 additions & 8 deletions .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": 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.
Expand Down
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

# snippets
/tests/dummy/app/snippets/*.js
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
try-scenario:
- ember-lts-4.8
- ember-lts-4.4
- ember-lts-4.12
- ember-release
- ember-beta
- ember-canary
Expand Down
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
# 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
Expand All @@ -26,7 +20,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
6 changes: 0 additions & 6 deletions .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
14 changes: 1 addition & 13 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# 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
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
2 changes: 1 addition & 1 deletion addon/components/validated-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default class ValidatedFormComponent extends Component {
if (model.errors[0]?.key) {
document
.querySelector(
`[name=${model.errors[0].key.replaceAll(".", "\\.")}]`
`[name=${model.errors[0].key.replaceAll(".", "\\.")}]`,
)
?.scrollIntoView({ behavior: "smooth" });
}
Expand Down
2 changes: 1 addition & 1 deletion addon/passed-or-default.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function passedOrDefault(componentName) {
return ensureSafeComponent(
this.args[property] ??
importSync(getOwnConfig()[componentName]).default,
this
this,
);
},
};
Expand Down
25 changes: 4 additions & 21 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");

const TEST_SCENARIO = process.env.TEST_SCENARIO ?? "THEME_DEFAULT";

// Configuration for test scenarios
const SCENARIO_CONFIGS = {
THEME_DEFAULT: { theme: null },
Expand Down Expand Up @@ -38,10 +36,12 @@ module.exports = function (defaults) {
defaults: {
hint: "dummy/components/permanent-custom-hint",
},
...(SCENARIO_CONFIGS[TEST_SCENARIO] ?? {}),
...(SCENARIO_CONFIGS[process.env.TEST_SCENARIO] ?? {}),
},
"@embroider/macros": {
setOwnConfig: { testScenario: TEST_SCENARIO },
setOwnConfig: {
testScenario: process.env.TEST_SCENARIO ?? "THEME_DEFAULT",
},
},
});

Expand All @@ -59,22 +59,5 @@ module.exports = function (defaults) {
package: "qunit",
},
],
// https://github.com/embroider-build/embroider/issues/1322#issuecomment-1386857904
packageRules: [
{
package: "@ember-data/store",
addonModules: {
"-private.js": {
dependsOnModules: [],
},
"-private/system/core-store.js": {
dependsOnModules: [],
},
"-private/system/model/internal-model.js": {
dependsOnModules: [],
},
},
},
],
});
};
72 changes: 41 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,77 +35,87 @@
"prepare": "husky install"
},
"dependencies": {
"@babel/core": "^7.23.2",
"@embroider/macros": "^1.13.3",
"@embroider/util": "^1.12.1",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"ember-changeset": "^4.1.2",
"ember-changeset-validations": "^4.1.1",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.2.0",
"ember-truth-helpers": "^3.1.1"
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-truth-helpers": "^3.1.0"
},
"devDependencies": {
"@adfinis/eslint-config": "2.0.0",
"@adfinis/eslint-config": "2.1.0",
"@adfinis/semantic-release-config": "4.1.0",
"@babel/eslint-parser": "7.23.3",
"@babel/plugin-proposal-decorators": "7.23.5",
"@ember/optional-features": "2.0.0",
"@ember/string": "3.1.1",
"@ember/test-helpers": "2.9.3",
"@ember/test-helpers": "3.2.1",
"@embroider/test-setup": "3.0.3",
"@fortawesome/ember-fontawesome": "2.0.0",
"@fortawesome/fontawesome-svg-core": "6.4.0",
"@fortawesome/fontawesome-svg-core": "6.5.1",
"@fortawesome/free-solid-svg-icons": "6.5.1",
"broccoli-asset-rev": "3.0.0",
"concurrently": "8.0.1",
"ember-auto-import": "2.6.3",
"ember-cli": "4.12.1",
"ember-cli-addon-docs": "5.2.0",
"ember-cli-dependency-checker": "3.3.1",
"concurrently": "8.2.2",
"ember-auto-import": "2.7.0",
"ember-cli": "5.4.1",
"ember-cli-addon-docs": "6.0.2",
"ember-cli-clean-css": "3.0.0",
"ember-cli-dependency-checker": "3.3.2",
"ember-cli-deploy": "2.0.0",
"ember-cli-deploy-build": "2.0.0",
"ember-cli-deploy-build": "3.0.0",
"ember-cli-deploy-git": "1.3.4",
"ember-cli-deploy-git-ci": "1.0.1",
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-sri": "2.1.1",
"ember-cli-terser": "4.0.2",
"ember-cli-test-loader": "3.1.0",
"ember-concurrency": "3.0.0",
"ember-data": "4.12.0",
"ember-concurrency": "3.1.1",
"ember-data": "5.3.0",
"ember-flatpickr": "4.0.0",
"ember-load-initializers": "2.1.2",
"ember-qunit": "6.2.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-template-lint": "5.13.0",
"ember-template-lint-plugin-prettier": "4.2.0",
"ember-try": "2.0.0",
"eslint": "8.54.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-ember": "11.5.2",
"ember-template-lint-plugin-prettier": "5.0.0",
"ember-try": "3.0.0",
"eslint": "8.55.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-ember": "11.11.1",
"eslint-plugin-import": "2.29.0",
"eslint-plugin-n": "15.7.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-qunit": "7.3.4",
"eslint-plugin-n": "16.3.1",
"eslint-plugin-prettier": "5.0.1",
"eslint-plugin-qunit": "8.0.1",
"husky": "8.0.3",
"lint-staged": "15.2.0",
"loader.js": "4.7.0",
"prettier": "2.8.8",
"prettier": "3.1.0",
"qunit": "2.20.0",
"qunit-dom": "3.0.0",
"semantic-release": "22.0.10",
"stylelint": "15.10.3",
"stylelint-config-standard": "33.0.0",
"stylelint-prettier": "3.0.0",
"webpack": "5.88.2"
"stylelint": "16.0.0",
"stylelint-config-standard": "35.0.0",
"stylelint-prettier": "4.1.0",
"webpack": "5.89.0"
},
"peerDependencies": {
"ember-source": "^4.0.0"
"ember-source": ">= 4.0.0"
},
"packageManager": "[email protected]",
"pnpm": {
"peerDependencyRules": {
"allowedVersions": {
"ember-source": "^5.0.0"
}
}
},
"engines": {
"node": "14.* || 16.* || >= 18"
"node": ">= 18"
},
"ember": {
"edition": "octane"
Expand Down
Loading