Skip to content

Commit ff1898e

Browse files
authored
Merge pull request #82 from prysmex/update-3.28.0
Update 3.28.0 -- Roadmap
2 parents 354c98e + 1be6f51 commit ff1898e

File tree

132 files changed

+4666
-5474
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+4666
-5474
lines changed

docs/installation.md

-18
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,4 @@ var app = new EmberApp(defaults, {
4141
},
4242
//...
4343
});
44-
```
45-
By default, `@ember-eui/core` will only include the compiled css theme version. If by any means you need to extend or access to css variables you can opt in:
46-
47-
```javascript
48-
// ember-cli-build.js
49-
var app = new EmberApp(defaults, {
50-
//...
51-
'@ember-eui/core': {
52-
useCompiledCss: false
53-
},
54-
//...
55-
});
56-
```
57-
58-
And then import it inside your app/styles/app.sass, word of caution, the performance of recompiling elastic sass is really noticable, so try to avoid this.
59-
60-
```css
61-
@import 'ember-eui-core';
6244
```

package.json

+9-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,15 @@
66
"site"
77
],
88
"devDependencies": {
9-
"@underline/eslint-config-ember-typescript": "^0.10.1",
10-
"@underline/eslint-config-node": "^0.10.0",
11-
"lerna": "^3.22.1"
9+
"@underline/eslint-config-ember-typescript": "^0.12.0",
10+
"@underline/eslint-config-node": "^0.12.0",
11+
"lerna": "^4.0.0"
12+
},
13+
"resolutions": {
14+
"@embroider/macros": "^1.0.0",
15+
"@embroider/shared-internals": "^1.0.0",
16+
"@embroider/util": "^1.0.0",
17+
"@embroider/test-setup": "^1.0.0"
1218
},
1319
"volta": {
1420
"node": "12.22.1"

packages/changeset-form/.eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
17+
.eslintcache
1618

1719
# ember-try
1820
/.node_modules.ember-try/

packages/changeset-form/.eslintrc.js

+17-18
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ module.exports = {
1010
legacyDecorators: true
1111
}
1212
},
13-
plugins: [
14-
'ember'
15-
],
13+
plugins: ['ember'],
1614
extends: [
1715
'eslint:recommended',
18-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended'
1918
],
2019
env: {
2120
browser: true
@@ -25,20 +24,15 @@ module.exports = {
2524
// node files
2625
{
2726
files: [
28-
'.eslintrc.js',
29-
'.template-lintrc.js',
30-
'ember-cli-build.js',
31-
'index.js',
32-
'testem.js',
33-
'blueprints/*/index.js',
34-
'config/**/*.js',
35-
'tests/dummy/config/**/*.js'
36-
],
37-
excludedFiles: [
38-
'addon/**',
39-
'addon-test-support/**',
40-
'app/**',
41-
'tests/dummy/app/**'
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./index.js',
32+
'./testem.js',
33+
'./blueprints/*/index.js',
34+
'./config/**/*.js',
35+
'./tests/dummy/config/**/*.js'
4236
],
4337
parserOptions: {
4438
sourceType: 'script'
@@ -49,6 +43,11 @@ module.exports = {
4943
},
5044
plugins: ['node'],
5145
extends: ['plugin:node/recommended']
46+
},
47+
{
48+
// Test files:
49+
files: ['tests/**/*-test.{js,ts}'],
50+
extends: ['plugin:qunit/recommended']
5251
}
5352
]
5453
};

packages/changeset-form/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.pnp*
1414
/.sass-cache
15+
/.eslintcache
1516
/connect.lock
1617
/coverage/
1718
/libpeerconnection.log

packages/changeset-form/.npmignore

+4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
1516
/.git/
1617
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1720
/.template-lintrc.js
1821
/.travis.yml
1922
/.watchmanconfig
@@ -23,6 +26,7 @@
2326
/ember-cli-build.js
2427
/testem.js
2528
/tests/
29+
/yarn-error.log
2630
/yarn.lock
2731
.gitkeep
2832

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane'
4+
extends: 'recommended'
55
};

packages/changeset-form/.travis.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- "10"
6+
- "12"
77

88
dist: xenial
99

@@ -46,21 +46,19 @@ jobs:
4646

4747
# we recommend new addons test the current and previous LTS
4848
# as well as latest stable release (bonus points to beta/canary)
49-
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
50-
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
5149
- env: EMBER_TRY_SCENARIO=ember-lts-3.20
50+
- env: EMBER_TRY_SCENARIO=ember-lts-3.24
5251
- env: EMBER_TRY_SCENARIO=ember-release
5352
- env: EMBER_TRY_SCENARIO=ember-beta
5453
- env: EMBER_TRY_SCENARIO=ember-canary
5554
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
5655
- env: EMBER_TRY_SCENARIO=ember-classic
56+
- env: EMBER_TRY_SCENARIO=embroider-safe
57+
- env: EMBER_TRY_SCENARIO=embroider-optimized
5758

5859
before_install:
5960
- curl -o- -L https://yarnpkg.com/install.sh | bash
6061
- export PATH=$HOME/.yarn/bin:$PATH
6162

62-
install:
63-
- yarn install --non-interactive
64-
6563
script:
6664
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

packages/changeset-form/CONTRIBUTING.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
## Linting
1010

11-
* `yarn lint:hbs`
12-
* `yarn lint:js`
13-
* `yarn lint:js --fix`
11+
* `yarn lint`
12+
* `yarn lint:fix`
1413

1514
## Running tests
1615

packages/changeset-form/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ This package depends on [`@ember-eui/core`](../core/README.md), so follow up the
88
Compatibility
99
------------------------------------------------------------------------------
1010

11-
* Ember.js v3.12 or above
12-
* Ember CLI v2.13 or above
13-
* Node.js v10 or above
11+
* Ember.js v3.20 or above
12+
* Ember CLI v3.20 or above
13+
* Node.js v12 or above
1414

1515

1616
Installation
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/context';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/context';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/base';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/base';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-base';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-base';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-checkbox-group';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-checkbox-group';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-checkbox';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-checkbox';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-dual-range-slider';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-dual-range-slider';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-number';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-number';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-password';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-password';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-radio-group';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-radio-group';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-radio';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-radio';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-range-slider';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-range-slider';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-select';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-select';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-switch';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-switch';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-text-area';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-text-area';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-text';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form/fields/field-text';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form';
1+
export { default } from '@ember-eui/changeset-form/components/eui-changeset-form';

packages/changeset-form/config/ember-try.js

+9-14
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,25 @@
11
'use strict';
22

33
const getChannelURL = require('ember-source-channel-url');
4+
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
45

5-
module.exports = async function() {
6+
module.exports = async function () {
67
return {
78
useYarn: true,
89
scenarios: [
910
{
10-
name: 'ember-lts-3.12',
11-
npm: {
12-
devDependencies: {
13-
'ember-source': '~3.12.0'
14-
}
15-
}
16-
},
17-
{
18-
name: 'ember-lts-3.16',
11+
name: 'ember-lts-3.20',
1912
npm: {
2013
devDependencies: {
21-
'ember-source': '~3.16.0'
14+
'ember-source': '~3.20.5'
2215
}
2316
}
2417
},
2518
{
26-
name: 'ember-lts-3.20',
19+
name: 'ember-lts-3.24',
2720
npm: {
2821
devDependencies: {
29-
'ember-source': '~3.20.5'
22+
'ember-source': '~3.24.3'
3023
}
3124
}
3225
},
@@ -81,7 +74,9 @@ module.exports = async function() {
8174
edition: 'classic'
8275
}
8376
}
84-
}
77+
},
78+
embroiderSafe(),
79+
embroiderOptimized()
8580
]
8681
};
8782
};
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

3-
module.exports = function(/* environment, appConfig */) {
4-
return { };
3+
module.exports = function (/* environment, appConfig */) {
4+
return {};
55
};

0 commit comments

Comments
 (0)