Skip to content

Commit f0c466e

Browse files
committed
Auto merge of #4465 - Turbo87:enable-embroider, r=Turbo87
Use embroider build system by default embroider is at v1.0.0 now and has been building a correctly working app for a while now, so it should be viable for us to upgrade now. see https://github.com/embroider-build/embroider/
2 parents 0a4e188 + 0339da7 commit f0c466e

File tree

2 files changed

+5
-26
lines changed

2 files changed

+5
-26
lines changed

.github/workflows/ci.yml

-15
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,6 @@ jobs:
4646
if: github.repository != 'rust-lang/crates.io'
4747
run: yarn test-coverage
4848

49-
embroider:
50-
name: Frontend (embroider)
51-
runs-on: ubuntu-20.04
52-
env:
53-
USE_EMBROIDER: 'true'
54-
55-
steps:
56-
- uses: actions/checkout@v2
57-
- uses: volta-cli/action@v1
58-
59-
- run: yarn install
60-
61-
- run: yarn test
62-
continue-on-error: true
63-
6449
backend-lint:
6550
name: Backend (linting)
6651
runs-on: ubuntu-20.04

ember-cli-build.js

+5-11
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
44
const postcssCustomMedia = require('postcss-custom-media');
55

6-
const { USE_EMBROIDER } = process.env;
7-
86
module.exports = function (defaults) {
97
let env = EmberApp.env();
108
let isProd = env === 'production';
@@ -50,13 +48,9 @@ module.exports = function (defaults) {
5048
app.import('node_modules/normalize.css/normalize.css', { prepend: true });
5149
app.import('vendor/qunit.css', { type: 'test' });
5250

53-
if (USE_EMBROIDER) {
54-
const { Webpack } = require('@embroider/webpack');
55-
return require('@embroider/compat').compatBuild(app, Webpack, {
56-
staticAddonTestSupportTrees: true,
57-
staticModifiers: true,
58-
});
59-
}
60-
61-
return app.toTree();
51+
const { Webpack } = require('@embroider/webpack');
52+
return require('@embroider/compat').compatBuild(app, Webpack, {
53+
staticAddonTestSupportTrees: true,
54+
staticModifiers: true,
55+
});
6256
};

0 commit comments

Comments
 (0)