Skip to content

Commit

Permalink
fix embroider
Browse files Browse the repository at this point in the history
  • Loading branch information
mansona committed Jun 7, 2024
1 parent cbd8e7b commit 05f40ec
Show file tree
Hide file tree
Showing 9 changed files with 133 additions and 234 deletions.
2 changes: 1 addition & 1 deletion app/controllers/project-version/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Controller from '@ember/controller';
import { htmlSafe } from '@ember/string';
import { htmlSafe } from '@ember/template';

export default Controller.extend({
oldPackageImportSyntax: htmlSafe(
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/html-safe.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { helper } from '@ember/component/helper';
import { htmlSafe as emberHtmlSafe } from '@ember/string';
import { htmlSafe as emberHtmlSafe } from '@ember/template';

export function htmlSafe([content]) {
return emberHtmlSafe(content);
Expand Down
9 changes: 7 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,14 @@ module.exports = function (defaults) {
destDir: '/assets/',
});


const { Webpack } = require('@embroider/webpack');
const appTree = require('@embroider/compat').compatBuild(app, Webpack);
const appTree = require('@embroider/compat').compatBuild(app, Webpack, {
staticAddonTrees: true,
staticAddonTestSupportTrees: true,
staticHelpers: true,
staticModifiers: true,
staticComponents: true,
});

return mergeTrees([appTree, mappingsTree]);
};
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/compat": "^3.4.0",
"@embroider/core": "^3.4.2",
"@embroider/compat": "^3.4.3",
"@embroider/core": "^3.4.3",
"@embroider/webpack": "^3.2.1",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
Expand Down Expand Up @@ -64,6 +64,7 @@
"broccoli-merge-trees": "^2.0.0",
"ember-a11y-testing": "^0.5.4",
"ember-anchor": "^1.0.3",
"ember-auto-import": "^2.7.2",
"ember-cli": "~3.28.6",
"ember-cli-app-version": "^5.0.0",
"ember-cli-autoprefixer": "^1.0.0",
Expand Down Expand Up @@ -95,14 +96,14 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-metrics": "^1.5.2",
"ember-page-title": "^6.2.2",
"ember-power-select": "^4.1.6",
"ember-power-select": "^6.0.1",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-rfc176-data": "^0.3.17",
"ember-route-action-helper": "^2.0.5",
"ember-sinon": "^4.1.1",
"ember-source": "~3.28.8",
"ember-styleguide": "^3.1.1",
"ember-styleguide": "^3.3.0",
"ember-svg-jar": "^2.4.2",
"ember-template-lint": "^3.15.0",
"ember-test-selectors": "^6.0.0",
Expand Down Expand Up @@ -141,7 +142,7 @@
"spawndamnit": "2.0.0",
"testem": "^3.10.0",
"typescript": "^4.9.3",
"webpack": "^5.89.0"
"webpack": "^5.90.0"
},
"engines": {
"node": "16.* || 18.* || 20.*",
Expand Down
Loading

0 comments on commit 05f40ec

Please sign in to comment.