Skip to content

Commit

Permalink
[UI] Upgraded to Ember 5.9.0, etc
Browse files Browse the repository at this point in the history
  • Loading branch information
rykov committed Jun 7, 2024
1 parent bf4b0cc commit 1a279f0
Show file tree
Hide file tree
Showing 12 changed files with 3,411 additions and 3,737 deletions.
13 changes: 1 addition & 12 deletions ui/.eslintignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,14 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/declarations/
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/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
9 changes: 1 addition & 8 deletions ui/.gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/declarations/

# dependencies
/bower_components/
/node_modules/

# 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
/package-lock.json.ember-try
Expand Down
14 changes: 1 addition & 13 deletions ui/.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
4 changes: 4 additions & 0 deletions ui/.template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@

module.exports = {
extends: 'recommended',
rules: {
'no-at-ember-render-modifiers': 'off',
'no-builtin-form-components': 'off',
},
};
2 changes: 1 addition & 1 deletion ui/.watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
2 changes: 1 addition & 1 deletion ui/app/routes/preview/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class PreviewRenderRoute extends Route {
variables: { recipient: r, content: c },
query,
},
'renderOne'
'renderOne',
);
}
}
23 changes: 23 additions & 0 deletions ui/config/embroider.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
'use strict';

module.exports = function embroiderConfig() {
return {
staticAddonTestSupportTrees: true,
staticAddonTrees: true,
staticModifiers: true,

// TODO: Fix & enable
// staticComponents: true,
// staticHelpers: true,

// Load uncommon routes separately
// splitAtRoutes: ['orgs', 'my', 'user'],

// Performance?
skipBabel: [
{
package: 'qunit',
},
],
};
};
3 changes: 2 additions & 1 deletion ui/config/optional-features.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"application-template-wrapper": false,
"default-async-observers": true,
"jquery-integration": false,
"template-only-glimmer-components": true
"template-only-glimmer-components": true,
"no-implicit-route-model": true
}
9 changes: 2 additions & 7 deletions ui/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ module.exports = function (defaults) {
// along with the exports of each module as its value.

const { Webpack } = require('@embroider/webpack');
return require('@embroider/compat').compatBuild(app, Webpack, {
skipBabel: [
{
package: 'qunit',
},
],
});
const emOpts = require('./config/embroider.js')();
return require('@embroider/compat').compatBuild(app, Webpack, emOpts);
};
92 changes: 46 additions & 46 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "preview",
"version": "0.0.0",
"private": true,
"description": "Small description for preview goes here",
"description": "Paperboy UI",
"repository": "",
"license": "MIT",
"author": "",
Expand All @@ -12,80 +12,80 @@
},
"scripts": {
"build": "ember build --environment=production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.{css,scss}\"",
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:css:fix": "concurrently \"yarn:lint:css -- --fix\"",
"lint:fix": "concurrently \"yarn: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": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
"test": "concurrently \"yarn:lint\" \"yarn:test:*\" --names \"lint,test:\"",
"test:ember": "ember test"
},
"devDependencies": {
"@babel/eslint-parser": "^7.21.3",
"@babel/plugin-proposal-decorators": "^7.21.0",
"@babel/core": "^7.24.7",
"@babel/eslint-parser": "^7.24.7",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@csstools/postcss-sass": "^5.0.0",
"@ember/optional-features": "^2.0.0",
"@ember/optional-features": "^2.1.0",
"@ember/render-modifiers": "^2.0.0",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^2.9.3",
"@embroider/compat": "^2.1.1",
"@embroider/core": "^2.1.1",
"@embroider/webpack": "^2.1.1",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0",
"@embroider/compat": "^3.5.1",
"@embroider/core": "^3.4.10",
"@embroider/webpack": "^4.0.1",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@tailwindcss/forms": "^0.3.3",
"@tailwindcss/typography": "^0.4.1",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.13",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.0.1",
"concurrently": "^8.2.2",
"ember-apollo-client": "^4.0.2",
"ember-auto-import": "^2.6.3",
"ember-cli": "~4.12.0",
"ember-cli-app-version": "^6.0.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-htmlbars": "^6.2.0",
"ember-auto-import": "^2.7.3",
"ember-cli": "~5.9.0",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^8.2.0",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-postcss": "^8.0.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-fetch": "^8.1.2",
"ember-load-initializers": "^2.1.2",
"ember-modifier": "^4.1.0",
"ember-page-title": "^7.0.0",
"ember-qunit": "^6.2.0",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.0.2",
"ember-resize-observer-service": "^1.0.0",
"ember-resolver": "^10.0.0",
"ember-source": "~4.12.0",
"ember-template-lint": "^5.7.2",
"ember-truth-helpers": "^3.0.0",
"eslint": "^8.37.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-ember": "^11.5.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.4",
"ember-resolver": "^11.0.1",
"ember-source": "~5.9.0",
"ember-template-lint": "^6.0.0",
"ember-truth-helpers": "^4.0.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^12.1.1",
"eslint-plugin-n": "^17.8.1",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"graphql": "^16.3.0",
"loader.js": "^4.7.0",
"postcss-scss": "^4.0.0",
"prettier": "^2.8.7",
"qunit": "^2.19.4",
"prettier": "^3.3.1",
"qunit": "^2.21.0",
"qunit-dom": "^2.0.0",
"sass": "^1.37.5",
"stylelint": "^15.4.0",
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-standard": "^32.0.0",
"stylelint-prettier": "^3.0.0",
"stylelint-scss": "^4.6.0",
"tailwindcss": "^2.2.7",
"tracked-built-ins": "^3.1.1",
"webpack": "^5.78.0"
"stylelint": "^16.6.1",
"stylelint-config-standard": "^36.0.0",
"stylelint-prettier": "^5.0.0",
"stylelint-scss": "^6.3.1",
"tailwindcss": "^3.3.4",
"tracked-built-ins": "^3.3.0",
"webpack": "^5.91.0"
},
"engines": {
"node": "14.* || 16.* || >= 18"
"node": ">= 18"
},
"ember": {
"edition": "octane"
Expand Down
2 changes: 1 addition & 1 deletion ui/tests/helpers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
setupTest as upstreamSetupTest,
} from 'ember-qunit';

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

Expand Down
Loading

0 comments on commit 1a279f0

Please sign in to comment.