Skip to content

Commit

Permalink
upgrade blueprints to v5.3 (#693)
Browse files Browse the repository at this point in the history
  • Loading branch information
jelhan authored Oct 17, 2023
1 parent 64c5de6 commit 8bb8af2
Show file tree
Hide file tree
Showing 22 changed files with 742 additions and 402 deletions.
4 changes: 2 additions & 2 deletions .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"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.
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
}
12 changes: 0 additions & 12 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,26 +1,14 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/api
/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
20 changes: 9 additions & 11 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 @@ -34,6 +37,7 @@ module.exports = {
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./testem.js',
Expand All @@ -49,13 +53,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
rules: {
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off',
},
extends: ['plugin:n/recommended'],
},
{
// test files
Expand Down
38 changes: 20 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,22 @@ on:
pull_request:

jobs:
lint-javascript:
name: lint javascript
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Install node modules
run: yarn install
- name: Run lint
run: yarn lint:js
lint-templates:
name: lint ember templates
lint:
name: lint
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18
- name: Install node modules
run: yarn install
- name: Run lint
run: yarn lint:hbs
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Lint
run: yarn lint

test-bundlesize:
name: test bundlesize
runs-on: ubuntu-latest
Expand All @@ -44,10 +36,12 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
- name: Install node modules
run: yarn install
- name: Run tests
run: yarn test:bundlesize

test-csp-header:
name: test CSP in .htaccess
runs-on: ubuntu-latest
Expand All @@ -56,10 +50,12 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
- name: Install node modules
run: yarn install
- name: Run tests
run: yarn test:csp-header

test-chrome:
name: test against Chrome
runs-on: ubuntu-latest
Expand All @@ -68,6 +64,7 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
- name: Install node modules
run: yarn install
- name: Install chrome browser
Expand All @@ -80,6 +77,7 @@ jobs:
run: yarn build --environment test
- name: run tests in chrome
run: yarn test:ember --launch Chrome --path dist

test-firefox:
name: test against Firefox
runs-on: ubuntu-latest
Expand All @@ -88,6 +86,7 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
- name: Install node modules
run: yarn install
- name: Setup firefox
Expand All @@ -100,6 +99,7 @@ jobs:
run: yarn build --environment test
- name: run tests in firefox
run: yarn test:ember --launch Firefox --path dist

test-browserstack:
name: test against additional browser in BrowserStack
runs-on: ubuntu-latest
Expand All @@ -108,6 +108,7 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
- name: Install node modules
run: yarn install
- name: Build with test environment
Expand All @@ -131,6 +132,7 @@ jobs:
uses: browserstack/github-actions/setup-local@master
with:
local-testing: stop

test-backend:
name: Test php backend
runs-on: ubuntu-latest
Expand Down
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,32 +1,25 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/declarations/
/api/tests/_output/
/api/tests/_tmp/
/api/tests/_support/_generated/

# dependencies
/bower_components/
/node_modules/
/api/vendor/

# 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

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
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/
15 changes: 15 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
'use strict';

module.exports = {
extends: [
'stylelint-config-standard',
'stylelint-config-standard-scss',
'stylelint-prettier/recommended',
],
rules: {
'declaration-block-no-duplicate-properties': null,
'no-descending-specificity': null,
'scss/no-global-function-names': null,
'selector-class-pattern': null,
},
};
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"]
}
3 changes: 2 additions & 1 deletion app/styles/_bootstrap-tweaking.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
border: $custom-select-border-width solid gray("500");
}

h3, .h3 {
h3,
.h3 {
margin-top: map-get($spacers, 5);
}
3 changes: 3 additions & 0 deletions app/styles/_calendar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

.ember-power-calendar {
@include ember-power-calendar(30px);

width: 100%;
}

.ember-power-calendar .ember-power-calendar-day,
.ember-power-calendar .ember-power-calendar-weekday {
max-width: none;
Expand All @@ -12,6 +14,7 @@
height: auto;
margin: 1px;
}

.ember-power-calendar .ember-power-calendar-weekdays,
.ember-power-calendar .ember-power-calendar-week {
height: 3em;
Expand Down
4 changes: 3 additions & 1 deletion app/styles/_generic-croodle-styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.cr-logo {
font-size: $font-size-base;
margin-bottom: 0;

// This is needed for cases when the h1 does not contain a link, like when JS
// is disabled.
color: $body-bg;
Expand All @@ -20,6 +21,7 @@

.cr-hide-on-mobile {
display: none;

@include media-breakpoint-up(md) {
display: block;
}
Expand All @@ -32,5 +34,5 @@
// adds the same padding-right as .is-valid / .is-invalid validation feedback
// classes provided by Bootstrap do
.cr-pr-validation {
padding-right: calc(1.5em + .74rem);
padding-right: calc(1.5em + 0.74rem);
}
2 changes: 1 addition & 1 deletion app/styles/_open-iconic.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "open-iconic/font/css/open-iconic-bootstrap.scss";
@import "open-iconic/font/css/open-iconic-bootstrap";

.oi {
// open-iconic uses `display: inline-block` by default which prevents text
Expand Down
7 changes: 4 additions & 3 deletions app/styles/_participants-table.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
table {
overflow: scroll;

th, td {
th,
td {
white-space: nowrap;
}

thead {
// position sticky on thead is not supported by Chrome and Edge
position: -webkit-sticky;
position: sticky;
position: sticky;
top: 0;
z-index: 100;
Expand All @@ -33,7 +34,7 @@
th,
td {
&:first-child {
position: -webkit-sticky;
position: sticky;
position: sticky;
left: 0;
z-index: 200;
Expand Down
Loading

0 comments on commit 8bb8af2

Please sign in to comment.