Skip to content
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: 7 additions & 1 deletion .ember-cli
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
}
15 changes: 9 additions & 6 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

module.exports = {
root: true,
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 2018,
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
requireConfigFile: false,
babelOptions: {
plugins: [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
],
},
},
plugins: ['ember'],
Expand All @@ -26,6 +29,7 @@ module.exports = {
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./index.js',
Expand All @@ -41,8 +45,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
extends: ['plugin:n/recommended'],
},
{
// test files
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ on:
pull_request: {}

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

jobs:
test:
name: "Tests"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v5
Expand All @@ -37,6 +38,7 @@ jobs:
floating:
name: "Floating Dependencies"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v5
Expand All @@ -55,7 +57,8 @@ jobs:
try-scenarios:
name: ${{ matrix.try-scenario }}
runs-on: ubuntu-latest
needs: 'test'
needs: "test"
timeout-minutes: 10

strategy:
fail-fast: false
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# broccoli-debug
/DEBUG/
3 changes: 2 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
/.gitignore
/.prettierignore
/.prettierrc.js
/.stylelintignore
/.stylelintrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
Expand Down
9 changes: 8 additions & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
'use strict';

module.exports = {
singleQuote: true,
overrides: [
{
files: '*.{js,ts}',
options: {
singleQuote: true,
},
},
],
};
8 changes: 8 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# unconventional files
/blueprints/*/files/

# compiled output
/dist/

# addons
/.node_modules.ember-try/
5 changes: 5 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
};
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Ember-bootstrap-changeset-validations
# Ember Bootstrap Changeset Validations

[![Build Status](https://travis-ci.org/kaliber5/ember-bootstrap-changeset-validations.svg?branch=master)](https://travis-ci.org/kaliber5/ember-bootstrap-changeset-validations)

Expand All @@ -7,8 +7,7 @@ This way your forms are only submitted when the underlying data is valid, otherw
markup will be applied. See the [FormElement documentation](https://www.ember-bootstrap.com/api/classes/Components.FormElement.html) for
further details.

Compatibility
------------------------------------------------------------------------------
## Compatibility

* Ember Bootstrap v5 or above
* Ember Changeset and Ember Changeset Validations v4
Expand All @@ -17,8 +16,7 @@ Compatibility
* Node.js v20 or above


Installation
------------------------------------------------------------------------------
## Installation

ember install ember-bootstrap-changeset-validations

Expand Down Expand Up @@ -56,8 +54,7 @@ Then assign the changeset based on that to your form:
* [Jeldrik Hanschke](https://github.com/jelhan)


Contributing
------------------------------------------------------------------------------
## Contributing

See the [Contributing](CONTRIBUTING.md) guide for details.

Expand Down
2 changes: 1 addition & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function (defaults) {
let app = new EmberAddon(defaults, {
const app = new EmberAddon(defaults, {
// Add options here
'ember-bootstrap': {
bootstrapVersion: 5,
Expand Down
36 changes: 22 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,35 @@
},
"scripts": {
"build": "ember build --environment=production",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.css\"",
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
"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 lint test:*",
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.0.1"
"ember-cli-htmlbars": "^6.2.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.21.3",
"@babel/plugin-proposal-decorators": "^7.21.0",
"@ember/optional-features": "2.2.0",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "2.9.6",
"@embroider/test-setup": "1.8.3",
"@glimmer/component": "1.1.2",
"@glimmer/tracking": "1.1.2",
"babel-eslint": "10.1.0",
"bootstrap": "5.3.8",
"broccoli-asset-rev": "3.0.0",
"concurrently": "^8.0.1",
"ember-auto-import": "2.10.1",
"ember-bootstrap": "5.1.1",
"ember-changeset": "4.0.0",
Expand All @@ -52,32 +57,35 @@
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-sri": "2.1.1",
"ember-cli-terser": "4.0.2",
"ember-disable-prototype-extensions": "1.1.3",
"ember-export-application-global": "2.0.1",
"ember-focus-trap": "1.1.1",
"ember-load-initializers": "2.1.2",
"ember-page-title": "7.0.0",
"ember-qunit": "5.1.5",
"ember-resolver": "8.1.0",
"ember-qunit": "6.2.0",
"ember-resolver": "10.0.0",
"ember-source": "4.12.4",
"ember-source-channel-url": "3.0.0",
"ember-template-lint": "4.18.2",
"ember-template-lint": "^6.0.0",
"ember-try": "2.0.0",
"eslint": "7.32.0",
"eslint": "8.37.0",
"eslint-config-prettier": "8.10.2",
"eslint-plugin-ember": "10.6.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-ember": "11.5.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-prettier": "4.2.5",
"eslint-plugin-qunit": "7.3.4",
"loader.js": "4.7.0",
"npm-run-all": "4.1.5",
"prettier": "2.8.8",
"qunit": "2.24.1",
"qunit-dom": "2.0.0",
"release-it": "14.14.3",
"release-it-lerna-changelog": "3.1.0",
"stylelint": "^15.4.0",
"stylelint-config-standard": "^32.0.0",
"stylelint-prettier": "^3.0.0",
"webpack": "5.101.3"
},
"peerDependencies": {
"ember-source": ">=3.28.0"
},
"engines": {
"node": "20.* || 22.* || >= 24"
},
Expand Down
Loading