Skip to content

Commit

Permalink
Merge pull request #1990 from mgechev/revert-1985-feature/postinstall…
Browse files Browse the repository at this point in the history
…_script_update

Revert "Postinstall script update"
  • Loading branch information
mgechev authored Jun 27, 2017
2 parents cd89d75 + cc5dd84 commit 32272c6
Show file tree
Hide file tree
Showing 4 changed files with 170 additions and 127 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"lint": "gulp tslint",
"karma": "karma",
"karma.start": "karma start",
"postinstall": "gulp check.versions && npm prune && gulp webdriver && gulp print.banner",
"postinstall": "gulp check.versions && gulp build.bundle.rxjs && npm prune && gulp webdriver && gulp print.banner",
"reinstall": "npm cache clean && npm install",
"serve.coverage": "gulp serve.coverage --color",
"serve.dev": "gulp serve.dev --color --env-config dev",
Expand Down
3 changes: 2 additions & 1 deletion tools/config/seed.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ export class SeedConfig {
{ src: 'zone.js/dist/long-stack-trace-zone.js', inject: 'libs', buildType: BUILD_TYPES.DEVELOPMENT },
{ src: 'intl/dist/Intl.min.js', inject: 'shims' },
{ src: 'systemjs/dist/system.src.js', inject: 'shims', buildType: BUILD_TYPES.DEVELOPMENT },
{ src: 'rxjs/Rx.js', inject: 'libs', buildType: BUILD_TYPES.DEVELOPMENT },
// Temporary fix. See https://github.com/angular/angular/issues/9359
{ src: '.tmp/Rx.min.js', inject: 'libs', buildType: BUILD_TYPES.DEVELOPMENT },
];

/**
Expand Down
32 changes: 32 additions & 0 deletions tools/tasks/seed/build.bundle.rxjs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/**
* Temporary fix. See https://github.com/angular/angular/issues/9359
*/

const Builder = require('systemjs-builder');

export = (done: any) => {
const options = {
normalize: true,
runtime: false,
sourceMaps: true,
sourceMapContents: true,
minify: true,
mangle: false
};
var builder = new Builder('./');
builder.config({
paths: {
'n:*': 'node_modules/*',
'rxjs/*': 'node_modules/rxjs/*.js',
},
map: {
'rxjs': 'n:rxjs',
},
packages: {
'rxjs': {main: 'Rx.js', defaultExtension: 'js'},
}
});
builder.bundle('rxjs', 'node_modules/.tmp/Rx.min.js', options)
.then(() => done())
.catch((error:any) => done(error));
};
Loading

0 comments on commit 32272c6

Please sign in to comment.