honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(typings): don't expose es6-shim typing.

Browse Source 
Also clean up unused typings generation; we publish the node tree, not browser tree.
Fixes #4882

Closes #4928
This commit is contained in:
Alex Eagle 2015-10-26 17:23:01 -07:00 committed by Alex Eagle
parent 137549d010
commit a881f09b77
2 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/broccoli/trees/browser_tree.ts
View File

@ -127,8 +127,7 @@ module.exports = function makeBrowserTree(options, destinationPath) {
// Use TypeScript to transpile the *.ts files to ES5 // Use TypeScript to transpile the *.ts files to ES5
var typescriptOptions = { var typescriptOptions = {
declaration: true, declaration: false,
stripInternal: true,
emitDecoratorMetadata: true, emitDecoratorMetadata: true,
experimentalDecorators: true, experimentalDecorators: true,
mapRoot: '', // force sourcemaps to use relative path mapRoot: '', // force sourcemaps to use relative path
@ -231,28 +230,8 @@ module.exports = function makeBrowserTree(options, destinationPath) {
htmlTree = mergeTrees([htmlTree, scripts, polymer, react]); htmlTree = mergeTrees([htmlTree, scripts, polymer, react]);
var typingsTree = new Funnel( es5Tree = mergeTrees([es5Tree, htmlTree, assetsTree, clientModules]);
'modules', es6Tree = mergeTrees([es6Tree, htmlTree, assetsTree, clientModules]);
{include: ['angular2/typings/**/*.d.ts', 'angular2/manual_typings/*.d.ts'], destDir: '/'});
// Add a line to the end of our top-level .d.ts file.
// This HACK for transitive typings is a workaround for
// https://github.com/Microsoft/TypeScript/issues/5097
//
// This allows users to get our top-level dependencies like es6-shim.d.ts
// to appear when they compile against angular2.
//
// This carries the risk that the user brings their own copy of that file
// (or any other symbols exported here) and they will get a compiler error
// because of the duplicate definitions.
// TODO(alexeagle): remove this when typescript releases a fix
es5Tree = replace(es5Tree, {
files: ['angular2/angular2.d.ts'],
patterns: [{match: /$/, replacement: 'import "./manual_typings/globals.d.ts";\n'}]
});
es5Tree = mergeTrees([es5Tree, htmlTree, assetsTree, clientModules, typingsTree]);
es6Tree = mergeTrees([es6Tree, htmlTree, assetsTree, clientModules, typingsTree]);
var mergedTree = mergeTrees([stew.mv(es6Tree, '/es6'), stew.mv(es5Tree, '/es5')]); var mergedTree = mergeTrees([stew.mv(es6Tree, '/es6'), stew.mv(es5Tree, '/es5')]);

19
tools/broccoli/trees/node_tree.ts
View File

@ -88,27 +88,24 @@ module.exports = function makeNodeTree(destinationPath) {
patterns: [ patterns: [
{ {
match: /^/, match: /^/,
replacement: function() { replacement:
return `var parse5Adapter = require('angular2/src/core/dom/parse5_adapter');\n\r () => `var parse5Adapter = require('angular2/src/core/dom/parse5_adapter');\r\n` +
parse5Adapter.Parse5DomAdapter.makeCurrent();`; `parse5Adapter.Parse5DomAdapter.makeCurrent();`
}
}, },
{match: /$/, replacement: function(_, relativePath) { return "\r\n main(); \n\r"; }} {match: /$/, replacement: (_, relativePath) => "\r\n main(); \r\n"}
] ]
}); });
// Prepend 'use strict' directive to all JS files. // Prepend 'use strict' directive to all JS files.
// See https://github.com/Microsoft/TypeScript/issues/3576 // See https://github.com/Microsoft/TypeScript/issues/3576
nodeTree = replace(nodeTree, { nodeTree = replace(
files: ['**/*.js'], nodeTree, {files: ['**/*.js'], patterns: [{match: /^/, replacement: () => `'use strict';`}]});
patterns: [{match: /^/, replacement: function() { return `'use strict';` }}]
});
// Add a line to the end of our top-level .d.ts file. // Add a line to the end of our top-level .d.ts file.
// This HACK for transitive typings is a workaround for // This HACK for transitive typings is a workaround for
// https://github.com/Microsoft/TypeScript/issues/5097 // https://github.com/Microsoft/TypeScript/issues/5097
// //
// This allows users to get our top-level dependencies like es6-shim.d.ts // This allows users to get our top-level dependencies like zone.d.ts
// to appear when they compile against angular2. // to appear when they compile against angular2.
// //
// This carries the risk that the user brings their own copy of that file // This carries the risk that the user brings their own copy of that file
@ -117,7 +114,7 @@ module.exports = function makeNodeTree(destinationPath) {
// TODO(alexeagle): remove this when typescript releases a fix // TODO(alexeagle): remove this when typescript releases a fix
nodeTree = replace(nodeTree, { nodeTree = replace(nodeTree, {
files: ['angular2/angular2.d.ts'], files: ['angular2/angular2.d.ts'],
patterns: [{match: /$/, replacement: 'import "./manual_typings/globals.d.ts";\n'}] patterns: [{match: /$/, replacement: 'import "./manual_typings/globals-es6.d.ts";\r\n'}]
}); });
return destCopy(nodeTree, destinationPath); return destCopy(nodeTree, destinationPath);