fix(bundle): remove bundling.

angular · Jun 7, 2016 · 065e98f · 065e98f
1 parent b92b236
commit 065e98f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/addon/ng2/blueprints/ng2/files/__path__/tsconfig.json b/addon/ng2/blueprints/ng2/files/__path__/tsconfig.json
@@ -4,6 +4,7 @@
     "declaration": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "mapRoot": "/",
     "module": "commonjs",
     "moduleResolution": "node",
     "noEmitOnError": true,

diff --git a/lib/broccoli/angular-broccoli-bundle.js b/lib/broccoli/angular-broccoli-bundle.js
@@ -16,14 +16,8 @@ class BundlePlugin extends Plugin {
   build() {
     var relativeRoot = path.relative(process.cwd(), this.inputPaths[0]);
     var builder = new Builder(relativeRoot, `${relativeRoot}/system-config.js`);
-    return builder.bundle('main - [app/**/*]',
-        `${this.outputPath}/main.js`, {
-          minify: true
-        })
-      .then(() => builder.bundle('app - (app/**/*.js - [app/**/*.js])',
-        `${this.outputPath}/app/index.js`, {
-          minify: true
-        }))
+
+    return builder.bundle('main', `${this.outputPath}/main.js`, { minify: true })
       .then(() => fse.copySync(`${this.inputPaths[0]}/system-config.js`,
         `${this.outputPath}/system-config.js`));
   }

diff --git a/tests/e2e/e2e_workflow.spec.js b/tests/e2e/e2e_workflow.spec.js
@@ -66,10 +66,10 @@ describe('Basic end-to-end Workflow', function () {
     // stuck to the first build done
     sh.exec(`${ngBin} build -prod`);
     expect(existsSync(path.join(process.cwd(), 'dist'))).to.be.equal(true);
-    var appBundlePath = path.join(process.cwd(), 'dist', 'app', 'index.js');
-    var appBundleContent = fs.readFileSync(appBundlePath, { encoding: 'utf8' });
+    var mainBundlePath = path.join(process.cwd(), 'dist', 'main.js');
+    var mainBundleContent = fs.readFileSync(mainBundlePath, { encoding: 'utf8' });
     // production: true minimized turns into production:!0
-    expect(appBundleContent).to.include('production:!0');
+    expect(mainBundleContent).to.include('production:!0');
     // Also does not create new things in GIT.
     expect(sh.exec('git status --porcelain').output).to.be.equal(undefined);
   });
@@ -415,7 +415,7 @@ describe('Basic end-to-end Workflow', function () {
         expect('build failed where it should have succeeded').to.equal('');
       });
   });
-  
+
   it('Serve and run e2e tests after all other commands', function () {
     this.timeout(240000);