Skip to content

Commit

Permalink
Revert "Try embroider again (#1707)"
Browse files Browse the repository at this point in the history
This reverts commit 1430c07.
  • Loading branch information
RobbieTheWagner committed Nov 20, 2024
1 parent b09bc8c commit 6d48898
Showing 1 changed file with 29 additions and 27 deletions.
56 changes: 29 additions & 27 deletions test-app/ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const EmberApp = require('ember-cli/lib/broccoli/ember-app');
const { Webpack } = require('@embroider/webpack');
// const { Webpack } = require('@embroider/webpack');

module.exports = function (defaults) {
let app = new EmberApp(defaults, {
Expand All @@ -13,35 +13,37 @@ module.exports = function (defaults) {
},
});

return app.toTree();

// const { maybeEmbroider } = require('@embroider/test-setup');

// return maybeEmbroider(app);

return require('@embroider/compat').compatBuild(app, Webpack, {
staticAddonTrees: true,
staticAddonTestSupportTrees: true,
staticHelpers: true,
staticModifiers: true,
staticComponents: true,
staticEmberSource: true,
// return require('@embroider/compat').compatBuild(app, Webpack, {
// staticAddonTrees: true,
// staticAddonTestSupportTrees: true,
// staticHelpers: true,
// staticModifiers: true,
// staticComponents: true,
// staticEmberSource: true,

packagerOptions: {
webpackConfig: {
// slow, but highest fidelity
devtool: 'source-map',
module: {
rules: [
{
test: /\.(png|svg|jpg|jpeg|gif)$/i,
type: 'asset/resource',
},
{
test: /\.(woff|woff2|eot|ttf|otf)$/i,
type: 'asset/resource',
},
],
},
},
},
});
// packagerOptions: {
// webpackConfig: {
// // slow, but highest fidelity
// devtool: 'source-map',
// module: {
// rules: [
// {
// test: /\.(png|svg|jpg|jpeg|gif)$/i,
// type: 'asset/resource',
// },
// {
// test: /\.(woff|woff2|eot|ttf|otf)$/i,
// type: 'asset/resource',
// },
// ],
// },
// },
// },
// });
};

0 comments on commit 6d48898

Please sign in to comment.