fix embroider

Author: mansona

app/controllers/project-version/index.js

@@ -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(

app/helpers/html-safe.js

@@ -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);

ember-cli-build.js

@@ -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]);
 };