Several fixes for the module unification feature flag #6908

mixonic · 2017-03-27T06:17:25Z

Several fixes here for the module unification flag, written mostly by @rwjblue with my very watchful supervision.

Avoid depending on the app tree being present at all times
Create a more realistic src build pipeline
Property add src files to the linting system
When the src tree is present, defer to src/main.js to declare an application instead of app/app.js.

Turbo87 · 2017-03-27T06:23:37Z

lib/broccoli/ember-app.js

@@ -187,7 +187,8 @@ class EmberApp {
    let srcPath = this._resolveLocal('src');
    let srcTree = existsSync(srcPath) ? new WatchedDir(srcPath) : null;

-    let appTree = new WatchedDir(this._resolveLocal('app'));
+    let appPath = this._resolveLocal('app');
+    let appTree = existsSync(appPath) ? new WatchedDir(appPath) : null;


I'm a little worried about the potential side effects of this change since we don't have that many unit tests for the build pipeline yet and the change is not covered by the feature flag

Ya, we need to flag this, and add tests to cover these changes generally speaking.

homu · 2017-06-09T18:06:15Z

☔ The latest upstream changes (presumably #7118) made this pull request unmergeable. Please resolve the merge conflicts.

mixonic · 2017-07-02T17:31:41Z

This code is some of that last stuff we need to see landed in order to support MU behind feature flags.

Checking that this method was called is super bizarre.

rwjblue · 2017-07-07T21:49:45Z

Finally got some time to work on this, and I think its ready for another round of reviews.

Rebased on top of current master
Removed one super bizarre (and misplaced) test
Fixed up the previously failing tests
Added a few new integration style tests around lib/broccoli/ember-app.js (we can now confirm that EmberApp#appAndDependencies returns the right things in a fast (< 100ms) broccoli-test-helper style test 🎉 )
Guarded all new functionality behind the MODULE_UNIFICATION experiment

cibernox

My understanding of this is very small, so I just left a nit pick.

cibernox · 2017-07-08T13:59:24Z

lib/broccoli/ember-app.js

@@ -1127,8 +1183,11 @@ class EmberApp {
    let config = this._configTree();
    let templates = this._processedTemplatesTree();

+    let srcTree = experiments.MODULE_UNIFICATION ? this._processedSrcTree() : null;


Perhaps move the experiments.MODULE_UNIFICATION check to _processedSrcTree to make it a noop and just call it here blindly?

twokul · 2017-07-18T06:55:39Z

@mixonic @rwjblue I must be reading the code wrong? experiments.MODULE_UNIFICATION always returns something (__module-unification__ [id=EMBER_CLI91203924408] for example). That means check like this won't work:

if (!experiments.MODULE_UNIFICATION) {
  return null;
}

and you always have to pair it with another guard !this.trees.src

Turbo87 · 2017-07-18T07:04:21Z

@twokul experiments are disabled on the beta and release branches

Turbo87 reviewed Mar 27, 2017

View reviewed changes

Turbo87 added enhancement Needs Tests labels Mar 28, 2017

mixonic mentioned this pull request May 30, 2017

Module Unification Epic #6332

Closed

13 tasks

mixonic mentioned this pull request Jul 2, 2017

Move to flags and published builds iezer/partial-app#1

Merged

Several fixes for the module unification feature flag

0163aea

rwjblue force-pushed the module-unification-fixes branch from 709a351 to d05346c Compare July 6, 2017 23:49

rwjblue added 3 commits July 6, 2017 20:00

Fix linting issue.

7594ded

Fix test relying on lazy error when app tree is missing.

d305772

Remove bizarre / brittle test.

14174a2

Checking that this method was called is super bizarre.

rwjblue force-pushed the module-unification-fixes branch from d05346c to 14174a2 Compare July 7, 2017 16:13

rwjblue added 3 commits July 7, 2017 12:42

Guard all changes based on experiments.MODULE_UNIFICATION.

04addb3

Add basic test for EmberApp#index to function without an app dir.

7bba217

Add tests for combinations of src and app.

e6be678

mixonic removed the Needs Tests label Jul 8, 2017

cibernox reviewed Jul 8, 2017

View reviewed changes

Small cleanup per review

814d996

rwjblue approved these changes Jul 8, 2017

View reviewed changes

mixonic merged commit ba73fc8 into master Jul 8, 2017

mixonic deleted the module-unification-fixes branch July 8, 2017 17:58

mixonic restored the module-unification-fixes branch July 8, 2017 18:02

locks deleted the module-unification-fixes branch July 9, 2017 23:40

Several fixes for the module unification feature flag #6908

Several fixes for the module unification feature flag #6908

mixonic commented Mar 27, 2017

Turbo87 Mar 27, 2017

rwjblue Mar 27, 2017

homu commented Jun 9, 2017

mixonic commented Jul 2, 2017

rwjblue commented Jul 7, 2017

cibernox left a comment

cibernox Jul 8, 2017 •

edited

twokul commented Jul 18, 2017

Turbo87 commented Jul 18, 2017

Several fixes for the module unification feature flag #6908

Several fixes for the module unification feature flag #6908

Conversation

mixonic commented Mar 27, 2017

Turbo87 Mar 27, 2017

Choose a reason for hiding this comment

rwjblue Mar 27, 2017

Choose a reason for hiding this comment

homu commented Jun 9, 2017

mixonic commented Jul 2, 2017

rwjblue commented Jul 7, 2017

cibernox left a comment

Choose a reason for hiding this comment

cibernox Jul 8, 2017 • edited

Choose a reason for hiding this comment

twokul commented Jul 18, 2017

Turbo87 commented Jul 18, 2017

cibernox Jul 8, 2017 •

edited