Skip to content

Commit 8bb8af2

Browse files
authored
upgrade blueprints to v5.3 (#693)
1 parent 64c5de6 commit 8bb8af2

22 files changed

+742
-402
lines changed

.ember-cli

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"disableAnalytics": false,
99

1010
/**
11-
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12-
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
1313
*/
1414
"isTypeScriptProject": false
1515
}

.eslintignore

-12
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/api
159
/coverage/
1610
!.*
1711
.*/
18-
.eslintcache
1912

2013
# ember-try
2114
/.node_modules.ember-try/
22-
/bower.json.ember-try
23-
/npm-shrinkwrap.json.ember-try
24-
/package.json.ember-try
25-
/package-lock.json.ember-try
26-
/yarn.lock.ember-try

.eslintrc.js

+9-11
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
5+
parser: '@babel/eslint-parser',
66
parserOptions: {
7-
ecmaVersion: 2018,
7+
ecmaVersion: 'latest',
88
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true,
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
13+
],
1114
},
1215
},
1316
plugins: ['ember'],
@@ -34,6 +37,7 @@ module.exports = {
3437
files: [
3538
'./.eslintrc.js',
3639
'./.prettierrc.js',
40+
'./.stylelintrc.js',
3741
'./.template-lintrc.js',
3842
'./ember-cli-build.js',
3943
'./testem.js',
@@ -49,13 +53,7 @@ module.exports = {
4953
browser: false,
5054
node: true,
5155
},
52-
plugins: ['node'],
53-
extends: ['plugin:node/recommended'],
54-
rules: {
55-
// this can be removed once the following is fixed
56-
// https://github.com/mysticatea/eslint-plugin-node/issues/77
57-
'node/no-unpublished-require': 'off',
58-
},
56+
extends: ['plugin:n/recommended'],
5957
},
6058
{
6159
// test files

.github/workflows/ci.yml

+20-18
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,22 @@ on:
77
pull_request:
88

99
jobs:
10-
lint-javascript:
11-
name: lint javascript
12-
runs-on: ubuntu-latest
13-
steps:
14-
- uses: actions/checkout@v4
15-
- uses: actions/setup-node@v3
16-
with:
17-
node-version: 18
18-
- name: Install node modules
19-
run: yarn install
20-
- name: Run lint
21-
run: yarn lint:js
22-
lint-templates:
23-
name: lint ember templates
10+
lint:
11+
name: lint
2412
runs-on: ubuntu-latest
13+
timeout-minutes: 10
14+
2515
steps:
2616
- uses: actions/checkout@v4
2717
- uses: actions/setup-node@v3
2818
with:
2919
node-version: 18
30-
- name: Install node modules
31-
run: yarn install
32-
- name: Run lint
33-
run: yarn lint:hbs
20+
cache: yarn
21+
- name: Install Dependencies
22+
run: yarn install --frozen-lockfile
23+
- name: Lint
24+
run: yarn lint
25+
3426
test-bundlesize:
3527
name: test bundlesize
3628
runs-on: ubuntu-latest
@@ -44,10 +36,12 @@ jobs:
4436
- uses: actions/setup-node@v3
4537
with:
4638
node-version: 18
39+
cache: yarn
4740
- name: Install node modules
4841
run: yarn install
4942
- name: Run tests
5043
run: yarn test:bundlesize
44+
5145
test-csp-header:
5246
name: test CSP in .htaccess
5347
runs-on: ubuntu-latest
@@ -56,10 +50,12 @@ jobs:
5650
- uses: actions/setup-node@v3
5751
with:
5852
node-version: 18
53+
cache: yarn
5954
- name: Install node modules
6055
run: yarn install
6156
- name: Run tests
6257
run: yarn test:csp-header
58+
6359
test-chrome:
6460
name: test against Chrome
6561
runs-on: ubuntu-latest
@@ -68,6 +64,7 @@ jobs:
6864
- uses: actions/setup-node@v3
6965
with:
7066
node-version: 18
67+
cache: yarn
7168
- name: Install node modules
7269
run: yarn install
7370
- name: Install chrome browser
@@ -80,6 +77,7 @@ jobs:
8077
run: yarn build --environment test
8178
- name: run tests in chrome
8279
run: yarn test:ember --launch Chrome --path dist
80+
8381
test-firefox:
8482
name: test against Firefox
8583
runs-on: ubuntu-latest
@@ -88,6 +86,7 @@ jobs:
8886
- uses: actions/setup-node@v3
8987
with:
9088
node-version: 18
89+
cache: yarn
9190
- name: Install node modules
9291
run: yarn install
9392
- name: Setup firefox
@@ -100,6 +99,7 @@ jobs:
10099
run: yarn build --environment test
101100
- name: run tests in firefox
102101
run: yarn test:ember --launch Firefox --path dist
102+
103103
test-browserstack:
104104
name: test against additional browser in BrowserStack
105105
runs-on: ubuntu-latest
@@ -108,6 +108,7 @@ jobs:
108108
- uses: actions/setup-node@v3
109109
with:
110110
node-version: 18
111+
cache: yarn
111112
- name: Install node modules
112113
run: yarn install
113114
- name: Build with test environment
@@ -131,6 +132,7 @@ jobs:
131132
uses: browserstack/github-actions/setup-local@master
132133
with:
133134
local-testing: stop
135+
134136
test-backend:
135137
name: Test php backend
136138
runs-on: ubuntu-latest

.gitignore

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,25 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64
/api/tests/_output/
75
/api/tests/_tmp/
86
/api/tests/_support/_generated/
97

108
# dependencies
11-
/bower_components/
129
/node_modules/
1310
/api/vendor/
1411

1512
# misc
1613
/.env*
1714
/.pnp*
18-
/.sass-cache
1915
/.eslintcache
20-
/connect.lock
2116
/coverage/
22-
/libpeerconnection.log
2317
/npm-debug.log*
2418
/testem.log
2519
/yarn-error.log
2620

2721
# ember-try
2822
/.node_modules.ember-try/
29-
/bower.json.ember-try
3023
/npm-shrinkwrap.json.ember-try
3124
/package.json.ember-try
3225

.prettierignore

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
16-
.eslintcache
17-
.lint-todo/
10+
.*/
1811

1912
# ember-try
2013
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try

.stylelintignore

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
7+
# addons
8+
/.node_modules.ember-try/

.stylelintrc.js

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: [
5+
'stylelint-config-standard',
6+
'stylelint-config-standard-scss',
7+
'stylelint-prettier/recommended',
8+
],
9+
rules: {
10+
'declaration-block-no-duplicate-properties': null,
11+
'no-descending-specificity': null,
12+
'scss/no-global-function-names': null,
13+
'selector-class-pattern': null,
14+
},
15+
};

.watchmanconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp", "dist"]
2+
"ignore_dirs": ["dist"]
33
}

app/styles/_bootstrap-tweaking.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
border: $custom-select-border-width solid gray("500");
2020
}
2121

22-
h3, .h3 {
22+
h3,
23+
.h3 {
2324
margin-top: map-get($spacers, 5);
2425
}

app/styles/_calendar.scss

+3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
.ember-power-calendar {
44
@include ember-power-calendar(30px);
5+
56
width: 100%;
67
}
8+
79
.ember-power-calendar .ember-power-calendar-day,
810
.ember-power-calendar .ember-power-calendar-weekday {
911
max-width: none;
@@ -12,6 +14,7 @@
1214
height: auto;
1315
margin: 1px;
1416
}
17+
1518
.ember-power-calendar .ember-power-calendar-weekdays,
1619
.ember-power-calendar .ember-power-calendar-week {
1720
height: 3em;

app/styles/_generic-croodle-styles.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
.cr-logo {
66
font-size: $font-size-base;
77
margin-bottom: 0;
8+
89
// This is needed for cases when the h1 does not contain a link, like when JS
910
// is disabled.
1011
color: $body-bg;
@@ -20,6 +21,7 @@
2021

2122
.cr-hide-on-mobile {
2223
display: none;
24+
2325
@include media-breakpoint-up(md) {
2426
display: block;
2527
}
@@ -32,5 +34,5 @@
3234
// adds the same padding-right as .is-valid / .is-invalid validation feedback
3335
// classes provided by Bootstrap do
3436
.cr-pr-validation {
35-
padding-right: calc(1.5em + .74rem);
37+
padding-right: calc(1.5em + 0.74rem);
3638
}

app/styles/_open-iconic.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "open-iconic/font/css/open-iconic-bootstrap.scss";
1+
@import "open-iconic/font/css/open-iconic-bootstrap";
22

33
.oi {
44
// open-iconic uses `display: inline-block` by default which prevents text

app/styles/_participants-table.scss

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
table {
88
overflow: scroll;
99

10-
th, td {
10+
th,
11+
td {
1112
white-space: nowrap;
1213
}
1314

1415
thead {
1516
// position sticky on thead is not supported by Chrome and Edge
16-
position: -webkit-sticky;
17+
position: sticky;
1718
position: sticky;
1819
top: 0;
1920
z-index: 100;
@@ -33,7 +34,7 @@
3334
th,
3435
td {
3536
&:first-child {
36-
position: -webkit-sticky;
37+
position: sticky;
3738
position: sticky;
3839
left: 0;
3940
z-index: 200;

0 commit comments

Comments
 (0)