Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Clean Up #17543

Merged
merged 2 commits into from
Oct 13, 2022
Merged

Upgrade Clean Up #17543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f48c1d5
updates deprecation workflow and filter
zofskeez Oct 13, 2022
c6a9ec3
cleans up build errors, removes unused ivy-codemirror and sass and up…
zofskeez Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/app/initializers/deprecation-filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export function initialize() {
registerDeprecationHandler((message, options, next) => {
// filter deprecations that are scheduled to be removed in a specific version
// when upgrading or addressing deprecation warnings be sure to update this or remove if not needed
if (options?.until !== '4.0.0') {
if (options?.until !== '5.0.0') {
next(message, options);
}
return;
Expand Down
2 changes: 1 addition & 1 deletion ui/app/styles/components/modal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.modal-background {
background: rgb(235, 238, 242, 0.9);
background: rgba(235, 238, 242, 0.9);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SassCompiler was throwing an error on build since rgb only accepts 3 arguments.

}

.modal-card {
Expand Down
23 changes: 9 additions & 14 deletions ui/config/deprecation-workflow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,15 @@ self.deprecationWorkflow = self.deprecationWorkflow || {};
//}
self.deprecationWorkflow.config = {
// current output from deprecationWorkflow.flushDeprecations();
// deprecations that will not be removed until 4.0.0 are filtered by deprecation-filter initializer rather than silencing below
// deprecations that will not be removed until 5.0.0 are filtered by deprecation-filter initializer rather than silencing below
workflow: [
{ handler: 'log', matchId: 'routing.transition-methods' },
{ handler: 'log', matchId: 'implicit-injections' },
{ handler: 'log', matchId: 'ember-metal.get-with-default' },
{ handler: 'log', matchId: 'manager-capabilities.modifiers-3-13' },
{ handler: 'log', matchId: 'computed-property.override' },
{ handler: 'log', matchId: 'ember-glimmer.link-to.positional-arguments' },
{ handler: 'log', matchId: 'this-property-fallback' },
{ handler: 'log', matchId: 'ember-source.deprecation-without-for' },
{ handler: 'log', matchId: 'ember-source.deprecation-without-since' },
{ handler: 'log', matchId: 'ember-composable-helpers.contains-helper' },
{ handler: 'log', matchId: 'ember-component.is-visible' },
{ handler: 'log', matchId: 'ember-engines.deprecation-camelized-engine-names' },
{ handler: 'log', matchId: 'ember-engines.deprecation-router-service-from-host' },
{ handler: 'silence', matchId: 'ember-data:model-save-promise' },
{ handler: 'silence', matchId: 'ember-engines.deprecation-camelized-engine-names' },
{ handler: 'silence', matchId: 'ember-engines.deprecation-router-service-from-host' },
{ handler: 'silence', matchId: 'ember-modifier.use-modify' },
{ handler: 'silence', matchId: 'ember-modifier.no-element-property' },
{ handler: 'silence', matchId: 'ember-modifier.no-args-property' },
{ handler: 'silence', matchId: 'ember-cli-mirage-config-routes-only-export' },
{ handler: 'silence', matchId: 'setting-on-hash' },
Comment on lines -10 to +17
Copy link
Contributor Author

@zofskeez zofskeez Oct 13, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were generated by running deprecationWorkflow.flushDeprecations() in the browser console after running the tests. Since we are targeting deprecations to be removed in a future version we can silence until the next upgrade.

],
};
2 changes: 2 additions & 0 deletions ui/ember-cli-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

const EmberApp = require('ember-cli/lib/broccoli/ember-app');
const config = require('./config/environment')();
const nodeSass = require('node-sass');

const environment = EmberApp.env();
const isProd = environment === 'production';
Expand Down Expand Up @@ -38,6 +39,7 @@ const appConfig = {
enabled: !isProd,
},
sassOptions: {
implementation: nodeSass,
sourceMap: false,
onlyIncluded: true,
},
Expand Down
8 changes: 3 additions & 5 deletions ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-mirage": "2.4.0",
"ember-cli-page-object": "1.17.10",
"ember-cli-sass": "^10.0.1",
"ember-cli-sass": "11.0.1",
"ember-cli-sri": "meirish/ember-cli-sri#rooturl",
"ember-cli-string-helpers": "6.1.0",
"ember-cli-terser": "^4.0.2",
Expand All @@ -126,7 +126,7 @@
"ember-service-worker": "meirish/ember-service-worker#configurable-scope",
"ember-sinon": "^4.0.0",
"ember-source": "~4.4.0",
"ember-svg-jar": "^2.1.0",
"ember-svg-jar": "2.4.0",
"ember-template-lint": "4.8.0",
"ember-template-lint-plugin-prettier": "4.0.0",
"ember-test-selectors": "6.0.0",
Expand All @@ -143,11 +143,10 @@
"eslint-plugin-qunit": "^7.2.0",
"filesize": "^4.2.1",
"flat": "^4.1.0",
"ivy-codemirror": "IvyApp/ivy-codemirror#fb09333c5144da47e14a9e6260f80577d5408374",
"jsondiffpatch": "^0.4.1",
"jsonlint": "^1.6.3",
"loader.js": "^4.7.0",
"node-sass": "6.0.1",
"node-sass": "7.0.3",
"normalize.css": "4.1.1",
"npm-run-all": "^4.1.5",
"pkijs": "^2.2.2",
Expand All @@ -158,7 +157,6 @@
"qunit": "^2.19.1",
"qunit-dom": "^2.0.0",
"route-recognizer": "^0.3.4",
"sass": "^1.29.0",
"sass-svg-uri": "^1.0.0",
"shell-quote": "^1.6.1",
"string.prototype.endswith": "^0.2.0",
Expand Down
Loading