Skip to content

Commit 1a279f0

Browse files
committed
[UI] Upgraded to Ember 5.9.0, etc
1 parent bf4b0cc commit 1a279f0

12 files changed

+3411
-3737
lines changed

Diff for: ui/.eslintignore

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

54
# compiled output
5+
/declarations/
66
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
127

138
# misc
149
/coverage/
1510
!.*
1611
.*/
17-
.eslintcache
1812

1913
# ember-try
2014
/.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

Diff for: ui/.gitignore

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64

75
# dependencies
8-
/bower_components/
96
/node_modules/
107

118
# misc
129
/.env*
1310
/.pnp*
14-
/.sass-cache
1511
/.eslintcache
16-
/connect.lock
1712
/coverage/
18-
/libpeerconnection.log
1913
/npm-debug.log*
2014
/testem.log
2115
/yarn-error.log
2216

2317
# ember-try
2418
/.node_modules.ember-try/
25-
/bower.json.ember-try
2619
/npm-shrinkwrap.json.ember-try
2720
/package.json.ember-try
2821
/package-lock.json.ember-try

Diff for: ui/.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

Diff for: ui/.template-lintrc.js

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

33
module.exports = {
44
extends: 'recommended',
5+
rules: {
6+
'no-at-ember-render-modifiers': 'off',
7+
'no-builtin-form-components': 'off',
8+
},
59
};

Diff for: ui/.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
}

Diff for: ui/app/routes/preview/render.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default class PreviewRenderRoute extends Route {
1414
variables: { recipient: r, content: c },
1515
query,
1616
},
17-
'renderOne'
17+
'renderOne',
1818
);
1919
}
2020
}

Diff for: ui/config/embroider.js

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
'use strict';
2+
3+
module.exports = function embroiderConfig() {
4+
return {
5+
staticAddonTestSupportTrees: true,
6+
staticAddonTrees: true,
7+
staticModifiers: true,
8+
9+
// TODO: Fix & enable
10+
// staticComponents: true,
11+
// staticHelpers: true,
12+
13+
// Load uncommon routes separately
14+
// splitAtRoutes: ['orgs', 'my', 'user'],
15+
16+
// Performance?
17+
skipBabel: [
18+
{
19+
package: 'qunit',
20+
},
21+
],
22+
};
23+
};

Diff for: ui/config/optional-features.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"application-template-wrapper": false,
33
"default-async-observers": true,
44
"jquery-integration": false,
5-
"template-only-glimmer-components": true
5+
"template-only-glimmer-components": true,
6+
"no-implicit-route-model": true
67
}

Diff for: ui/ember-cli-build.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ module.exports = function (defaults) {
2323
// along with the exports of each module as its value.
2424

2525
const { Webpack } = require('@embroider/webpack');
26-
return require('@embroider/compat').compatBuild(app, Webpack, {
27-
skipBabel: [
28-
{
29-
package: 'qunit',
30-
},
31-
],
32-
});
26+
const emOpts = require('./config/embroider.js')();
27+
return require('@embroider/compat').compatBuild(app, Webpack, emOpts);
3328
};

Diff for: ui/package.json

+46-46
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "preview",
33
"version": "0.0.0",
44
"private": true,
5-
"description": "Small description for preview goes here",
5+
"description": "Paperboy UI",
66
"repository": "",
77
"license": "MIT",
88
"author": "",
@@ -12,80 +12,80 @@
1212
},
1313
"scripts": {
1414
"build": "ember build --environment=production",
15-
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
15+
"lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"",
1616
"lint:css": "stylelint \"**/*.{css,scss}\"",
17-
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
18-
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
17+
"lint:css:fix": "concurrently \"yarn:lint:css -- --fix\"",
18+
"lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"",
1919
"lint:hbs": "ember-template-lint .",
2020
"lint:hbs:fix": "ember-template-lint . --fix",
2121
"lint:js": "eslint . --cache",
2222
"lint:js:fix": "eslint . --fix",
2323
"start": "ember serve",
24-
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
24+
"test": "concurrently \"yarn:lint\" \"yarn:test:*\" --names \"lint,test:\"",
2525
"test:ember": "ember test"
2626
},
2727
"devDependencies": {
28-
"@babel/eslint-parser": "^7.21.3",
29-
"@babel/plugin-proposal-decorators": "^7.21.0",
28+
"@babel/core": "^7.24.7",
29+
"@babel/eslint-parser": "^7.24.7",
30+
"@babel/plugin-proposal-decorators": "^7.24.7",
3031
"@csstools/postcss-sass": "^5.0.0",
31-
"@ember/optional-features": "^2.0.0",
32+
"@ember/optional-features": "^2.1.0",
3233
"@ember/render-modifiers": "^2.0.0",
33-
"@ember/string": "^3.0.1",
34-
"@ember/test-helpers": "^2.9.3",
35-
"@embroider/compat": "^2.1.1",
36-
"@embroider/core": "^2.1.1",
37-
"@embroider/webpack": "^2.1.1",
34+
"@ember/string": "^3.1.1",
35+
"@ember/test-helpers": "^3.3.0",
36+
"@embroider/compat": "^3.5.1",
37+
"@embroider/core": "^3.4.10",
38+
"@embroider/webpack": "^4.0.1",
3839
"@glimmer/component": "^1.1.2",
3940
"@glimmer/tracking": "^1.1.2",
40-
"@tailwindcss/forms": "^0.3.3",
41-
"@tailwindcss/typography": "^0.4.1",
41+
"@tailwindcss/forms": "^0.5.7",
42+
"@tailwindcss/typography": "^0.5.13",
4243
"broccoli-asset-rev": "^3.0.0",
43-
"concurrently": "^8.0.1",
44+
"concurrently": "^8.2.2",
4445
"ember-apollo-client": "^4.0.2",
45-
"ember-auto-import": "^2.6.3",
46-
"ember-cli": "~4.12.0",
47-
"ember-cli-app-version": "^6.0.0",
48-
"ember-cli-babel": "^7.26.11",
49-
"ember-cli-dependency-checker": "^3.3.1",
50-
"ember-cli-htmlbars": "^6.2.0",
46+
"ember-auto-import": "^2.7.3",
47+
"ember-cli": "~5.9.0",
48+
"ember-cli-app-version": "^6.0.1",
49+
"ember-cli-babel": "^8.2.0",
50+
"ember-cli-clean-css": "^3.0.0",
51+
"ember-cli-dependency-checker": "^3.3.2",
52+
"ember-cli-htmlbars": "^6.3.0",
5153
"ember-cli-inject-live-reload": "^2.1.0",
5254
"ember-cli-postcss": "^8.0.0",
5355
"ember-cli-sri": "^2.1.1",
5456
"ember-cli-terser": "^4.0.2",
5557
"ember-fetch": "^8.1.2",
5658
"ember-load-initializers": "^2.1.2",
5759
"ember-modifier": "^4.1.0",
58-
"ember-page-title": "^7.0.0",
59-
"ember-qunit": "^6.2.0",
60+
"ember-page-title": "^8.2.3",
61+
"ember-qunit": "^8.0.2",
6062
"ember-resize-observer-service": "^1.0.0",
61-
"ember-resolver": "^10.0.0",
62-
"ember-source": "~4.12.0",
63-
"ember-template-lint": "^5.7.2",
64-
"ember-truth-helpers": "^3.0.0",
65-
"eslint": "^8.37.0",
66-
"eslint-config-prettier": "^8.8.0",
67-
"eslint-plugin-ember": "^11.5.0",
68-
"eslint-plugin-n": "^15.7.0",
69-
"eslint-plugin-prettier": "^4.2.1",
70-
"eslint-plugin-qunit": "^7.3.4",
63+
"ember-resolver": "^11.0.1",
64+
"ember-source": "~5.9.0",
65+
"ember-template-lint": "^6.0.0",
66+
"ember-truth-helpers": "^4.0.0",
67+
"eslint": "^8.57.0",
68+
"eslint-config-prettier": "^9.1.0",
69+
"eslint-plugin-ember": "^12.1.1",
70+
"eslint-plugin-n": "^17.8.1",
71+
"eslint-plugin-prettier": "^5.1.3",
72+
"eslint-plugin-qunit": "^8.1.1",
7173
"graphql": "^16.3.0",
7274
"loader.js": "^4.7.0",
7375
"postcss-scss": "^4.0.0",
74-
"prettier": "^2.8.7",
75-
"qunit": "^2.19.4",
76+
"prettier": "^3.3.1",
77+
"qunit": "^2.21.0",
7678
"qunit-dom": "^2.0.0",
77-
"sass": "^1.37.5",
78-
"stylelint": "^15.4.0",
79-
"stylelint-config-prettier": "^9.0.5",
80-
"stylelint-config-standard": "^32.0.0",
81-
"stylelint-prettier": "^3.0.0",
82-
"stylelint-scss": "^4.6.0",
83-
"tailwindcss": "^2.2.7",
84-
"tracked-built-ins": "^3.1.1",
85-
"webpack": "^5.78.0"
79+
"stylelint": "^16.6.1",
80+
"stylelint-config-standard": "^36.0.0",
81+
"stylelint-prettier": "^5.0.0",
82+
"stylelint-scss": "^6.3.1",
83+
"tailwindcss": "^3.3.4",
84+
"tracked-built-ins": "^3.3.0",
85+
"webpack": "^5.91.0"
8686
},
8787
"engines": {
88-
"node": "14.* || 16.* || >= 18"
88+
"node": ">= 18"
8989
},
9090
"ember": {
9191
"edition": "octane"

Diff for: ui/tests/helpers/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
setupTest as upstreamSetupTest,
55
} from 'ember-qunit';
66

7-
// This file exists to provide wrappers around ember-qunit's / ember-mocha's
7+
// This file exists to provide wrappers around ember-qunit's
88
// test setup functions. This way, you can easily extend the setup that is
99
// needed per test type.
1010

0 commit comments

Comments
 (0)