6ddfff5cd5
This is a big change. @matsko also deserves much of the credit for the implementation.
Previously, `ComponentInstruction`s held all the state for async components.
Now, we introduce several subclasses for `Instruction` to describe each type of navigation.
BREAKING CHANGE:
Redirects now use the Link DSL syntax. Before:
```
@RouteConfig([
{ path: '/foo', redirectTo: '/bar' },
{ path: '/bar', component: BarCmp }
])
```
After:
```
@RouteConfig([
{ path: '/foo', redirectTo: ['Bar'] },
{ path: '/bar', component: BarCmp, name: 'Bar' }
])
```
BREAKING CHANGE:
This also introduces `useAsDefault` in the RouteConfig, which makes cases like lazy-loading
and encapsulating large routes with sub-routes easier.
Previously, you could use `redirectTo` like this to expand a URL like `/tab` to `/tab/posts`:
@RouteConfig([
{ path: '/tab', redirectTo: '/tab/users' }
{ path: '/tab', component: TabsCmp, name: 'Tab' }
])
AppCmp { ... }
Now the recommended way to handle this is case is to use `useAsDefault` like so:
```
@RouteConfig([
{ path: '/tab', component: TabsCmp, name: 'Tab' }
])
AppCmp { ... }
@RouteConfig([
{ path: '/posts', component: PostsCmp, useAsDefault: true, name: 'Posts' },
{ path: '/users', component: UsersCmp, name: 'Users' }
])
TabsCmp { ... }
```
In the above example, you can write just `['/Tab']` and the route `Users` is automatically selected as a child route.
Closes #4728
Closes #4228
Closes #4170
Closes #4490
Closes #4694
Closes #5200
Closes #5475
72 lines
2.2 KiB
JavaScript
72 lines
2.2 KiB
JavaScript
'use strict';
|
|
|
|
var fs = require('fs');
|
|
var ts = require('typescript');
|
|
|
|
var files = [
|
|
'lifecycle_annotations_impl.ts',
|
|
'url_parser.ts',
|
|
'route_recognizer.ts',
|
|
'route_config_impl.ts',
|
|
'async_route_handler.ts',
|
|
'sync_route_handler.ts',
|
|
'component_recognizer.ts',
|
|
'instruction.ts',
|
|
'path_recognizer.ts',
|
|
'route_config_nomalizer.ts',
|
|
'route_lifecycle_reflector.ts',
|
|
'route_registry.ts',
|
|
'router.ts'
|
|
];
|
|
|
|
var PRELUDE = '(function(){\n';
|
|
var POSTLUDE = '\n}());\n';
|
|
var FACADES = fs.readFileSync(__dirname + '/lib/facades.es5', 'utf8');
|
|
var DIRECTIVES = fs.readFileSync(__dirname + '/src/ng_outlet.ts', 'utf8');
|
|
var moduleTemplate = fs.readFileSync(__dirname + '/src/module_template.js', 'utf8');
|
|
|
|
function main() {
|
|
var dir = __dirname + '/../angular2/src/router/';
|
|
var sharedCode = files.reduce(function (prev, file) {
|
|
return prev + transform(fs.readFileSync(dir + file, 'utf8'));
|
|
}, '');
|
|
|
|
var out = moduleTemplate.replace('//{{FACADES}}', FACADES).replace('//{{SHARED_CODE}}', sharedCode);
|
|
return PRELUDE + transform(DIRECTIVES) + out + POSTLUDE;
|
|
}
|
|
|
|
/*
|
|
* Given a directory name and a file's TypeScript content, return an object with the ES5 code,
|
|
* sourcemap, and exported variable identifier name for the content.
|
|
*/
|
|
var IMPORT_RE = new RegExp("import \\{?([\\w\\n_, ]+)\\}? from '(.+)';?", 'g');
|
|
var INJECT_RE = new RegExp("@Inject\\(ROUTER_PRIMARY_COMPONENT\\)", 'g');
|
|
var IMJECTABLE_RE = new RegExp("@Injectable\\(\\)", 'g');
|
|
function transform(contents) {
|
|
contents = contents.replace(INJECT_RE, '').replace(IMJECTABLE_RE, '');
|
|
contents = contents.replace(IMPORT_RE, function (match, imports, includePath) {
|
|
//TODO: remove special-case
|
|
if (isFacadeModule(includePath) || includePath === './router_outlet') {
|
|
return '';
|
|
}
|
|
return match;
|
|
});
|
|
return ts.transpile(contents, {
|
|
target: ts.ScriptTarget.ES5,
|
|
module: ts.ModuleKind.CommonJS
|
|
});
|
|
}
|
|
|
|
function isFacadeModule(modulePath) {
|
|
return modulePath.indexOf('facade') > -1 ||
|
|
modulePath === 'angular2/src/core/reflection/reflection';
|
|
}
|
|
|
|
module.exports = function () {
|
|
var dist = __dirname + '/../../dist';
|
|
if (!fs.existsSync(dist)) {
|
|
fs.mkdirSync(dist);
|
|
}
|
|
fs.writeFileSync(dist + '/angular_1_router.js', main());
|
|
};
|