2016-06-23 09:47:54 -07:00
|
|
|
/**
|
|
|
|
|
* @license
|
|
|
|
|
* Copyright Google Inc. All Rights Reserved.
|
|
|
|
|
*
|
|
|
|
|
* Use of this source code is governed by an MIT-style license that can be
|
|
|
|
|
* found in the LICENSE file at https://angular.io/license
|
|
|
|
|
*/
|
|
|
|
|
|
feat(browser): use AppModules for bootstrap in the browser
This introduces the `BrowserModule` to be used for long form
bootstrap and offline compile bootstrap:
```
@AppModule({
modules: [BrowserModule],
precompile: [MainComponent],
providers: […], // additional providers
directives: […], // additional platform directives
pipes: […] // additional platform pipes
})
class MyModule {
constructor(appRef: ApplicationRef) {
appRef.bootstrap(MainComponent);
}
}
// offline compile
import {bootstrapModuleFactory} from ‘@angular/platform-browser’;
bootstrapModuleFactory(MyModuleNgFactory);
// runtime compile long form
import {bootstrapModule} from ‘@angular/platform-browser-dynamic’;
bootstrapModule(MyModule);
```
The short form, `bootstrap(...)`, can now creates a module on the fly,
given `directives`, `pipes, `providers`, `precompile` and `modules`
properties.
Related changes:
- make `SanitizationService`, `SecurityContext` public in `@angular/core` so that the offline compiler can resolve the token
- move `AnimationDriver` to `platform-browser` and make it
public so that the offline compiler can resolve the token
BREAKING CHANGES:
- short form bootstrap does no longer allow
to inject compiler internals (i.e. everything
from `@angular/compiler). Inject `Compiler` instead.
To provide custom providers for the compiler,
create a custom compiler via `browserCompiler({providers: [...]})`
and pass that into the `bootstrap` method.
2016-06-30 13:07:17 -07:00
|
|
|
import './init';
|
2016-06-01 14:58:11 -07:00
|
|
|
|
|
|
|
|
import * as fs from 'fs';
|
|
|
|
|
import * as path from 'path';
|
|
|
|
|
|
2016-08-12 22:13:54 -07:00
|
|
|
const EXPECTED_XMB = `<?xml version="1.0" encoding="UTF-8" ?>
|
2016-07-29 13:07:01 -07:00
|
|
|
<!DOCTYPE messagebundle [
|
|
|
|
|
<!ELEMENT messagebundle (msg)*>
|
|
|
|
|
<!ATTLIST messagebundle class CDATA #IMPLIED>
|
|
|
|
|
|
|
|
|
|
<!ELEMENT msg (#PCDATA|ph|source)*>
|
|
|
|
|
<!ATTLIST msg id CDATA #IMPLIED>
|
|
|
|
|
<!ATTLIST msg seq CDATA #IMPLIED>
|
|
|
|
|
<!ATTLIST msg name CDATA #IMPLIED>
|
|
|
|
|
<!ATTLIST msg desc CDATA #IMPLIED>
|
|
|
|
|
<!ATTLIST msg meaning CDATA #IMPLIED>
|
|
|
|
|
<!ATTLIST msg obsolete (obsolete) #IMPLIED>
|
|
|
|
|
<!ATTLIST msg xml:space (default|preserve) "default">
|
|
|
|
|
<!ATTLIST msg is_hidden CDATA #IMPLIED>
|
|
|
|
|
|
|
|
|
|
<!ELEMENT source (#PCDATA)>
|
|
|
|
|
|
|
|
|
|
<!ELEMENT ph (#PCDATA|ex)*>
|
|
|
|
|
<!ATTLIST ph name CDATA #REQUIRED>
|
|
|
|
|
|
|
|
|
|
<!ELEMENT ex (#PCDATA)>
|
|
|
|
|
]>
|
2016-07-21 13:56:58 -07:00
|
|
|
<messagebundle>
|
2017-04-14 18:06:25 +02:00
|
|
|
<msg id="126808141597411718"><source>node_modules/third_party/other_comp.d.ts:1,2</source>other-3rdP-component
|
|
|
|
|
multi-lines</msg>
|
2017-10-05 14:36:15 -07:00
|
|
|
<msg id="8136548302122759730" desc="desc" meaning="meaning"><source>src/basic.ts:1</source>translate me</msg>
|
|
|
|
|
<msg id="3492007542396725315"><source>src/basic.ts:5</source><source>src/entry_components.ts:1</source>Welcome</msg>
|
2016-09-30 16:22:42 -07:00
|
|
|
</messagebundle>
|
|
|
|
|
`;
|
2016-07-21 13:56:58 -07:00
|
|
|
|
2016-08-12 22:13:54 -07:00
|
|
|
const EXPECTED_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
|
|
|
|
|
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
|
2017-02-16 17:03:18 +01:00
|
|
|
<file source-language="fr" datatype="plaintext" original="ng2.template">
|
2016-09-30 16:22:42 -07:00
|
|
|
<body>
|
2017-10-05 14:36:15 -07:00
|
|
|
<trans-unit id="b0a17f08a4bd742b2acf39780c257c2f519d33ed" datatype="html">
|
|
|
|
|
<source>other-3rdP-component
|
|
|
|
|
multi-lines</source>
|
|
|
|
|
<context-group purpose="location">
|
|
|
|
|
<context context-type="sourcefile">node_modules/third_party/other_comp.d.ts</context>
|
|
|
|
|
<context context-type="linenumber">1</context>
|
|
|
|
|
</context-group>
|
|
|
|
|
</trans-unit>
|
2016-09-30 16:22:42 -07:00
|
|
|
<trans-unit id="76e1eccb1b772fa9f294ef9c146ea6d0efa8a2d4" datatype="html">
|
|
|
|
|
<source>translate me</source>
|
2017-04-14 18:06:25 +02:00
|
|
|
<context-group purpose="location">
|
|
|
|
|
<context context-type="sourcefile">src/basic.ts</context>
|
|
|
|
|
<context context-type="linenumber">1</context>
|
|
|
|
|
</context-group>
|
2016-09-30 16:22:42 -07:00
|
|
|
<note priority="1" from="description">desc</note>
|
|
|
|
|
<note priority="1" from="meaning">meaning</note>
|
|
|
|
|
</trans-unit>
|
|
|
|
|
<trans-unit id="65cc4ab3b4c438e07c89be2b677d08369fb62da2" datatype="html">
|
|
|
|
|
<source>Welcome</source>
|
2017-04-14 18:06:25 +02:00
|
|
|
<context-group purpose="location">
|
|
|
|
|
<context context-type="sourcefile">src/basic.ts</context>
|
|
|
|
|
<context context-type="linenumber">5</context>
|
|
|
|
|
</context-group>
|
|
|
|
|
<context-group purpose="location">
|
|
|
|
|
<context context-type="sourcefile">src/entry_components.ts</context>
|
|
|
|
|
<context context-type="linenumber">1</context>
|
|
|
|
|
</context-group>
|
2016-09-30 16:22:42 -07:00
|
|
|
</trans-unit>
|
|
|
|
|
</body>
|
|
|
|
|
</file>
|
|
|
|
|
</xliff>
|
|
|
|
|
`;
|
2016-08-12 22:13:54 -07:00
|
|
|
|
2017-04-14 09:05:00 -07:00
|
|
|
const EXPECTED_XLIFF2 = `<?xml version="1.0" encoding="UTF-8" ?>
|
|
|
|
|
<xliff version="2.0" xmlns="urn:oasis:names:tc:xliff:document:2.0" srcLang="en">
|
|
|
|
|
<file original="ng.template" id="ngi18n">
|
2017-10-05 14:36:15 -07:00
|
|
|
<unit id="126808141597411718">
|
|
|
|
|
<notes>
|
|
|
|
|
<note category="location">node_modules/third_party/other_comp.d.ts:1,2</note>
|
|
|
|
|
</notes>
|
|
|
|
|
<segment>
|
|
|
|
|
<source>other-3rdP-component
|
|
|
|
|
multi-lines</source>
|
|
|
|
|
</segment>
|
|
|
|
|
</unit>
|
2017-04-14 09:05:00 -07:00
|
|
|
<unit id="8136548302122759730">
|
|
|
|
|
<notes>
|
|
|
|
|
<note category="description">desc</note>
|
|
|
|
|
<note category="meaning">meaning</note>
|
2017-05-22 20:20:45 +02:00
|
|
|
<note category="location">src/basic.ts:1</note>
|
2017-04-14 09:05:00 -07:00
|
|
|
</notes>
|
|
|
|
|
<segment>
|
|
|
|
|
<source>translate me</source>
|
|
|
|
|
</segment>
|
|
|
|
|
</unit>
|
|
|
|
|
<unit id="3492007542396725315">
|
2017-05-22 20:20:45 +02:00
|
|
|
<notes>
|
|
|
|
|
<note category="location">src/basic.ts:5</note>
|
|
|
|
|
<note category="location">src/entry_components.ts:1</note>
|
|
|
|
|
</notes>
|
2017-04-14 09:05:00 -07:00
|
|
|
<segment>
|
|
|
|
|
<source>Welcome</source>
|
|
|
|
|
</segment>
|
|
|
|
|
</unit>
|
|
|
|
|
</file>
|
|
|
|
|
</xliff>
|
|
|
|
|
`;
|
|
|
|
|
|
2016-08-12 22:13:54 -07:00
|
|
|
describe('template i18n extraction output', () => {
|
2017-09-12 15:53:17 -07:00
|
|
|
const outDir = 'out';
|
2016-08-12 22:13:54 -07:00
|
|
|
|
|
|
|
|
it('should extract i18n messages as xmb', () => {
|
2017-02-15 18:50:03 +01:00
|
|
|
const xmbOutput = path.join(outDir, 'custom_file.xmb');
|
2016-06-01 14:58:11 -07:00
|
|
|
expect(fs.existsSync(xmbOutput)).toBeTruthy();
|
|
|
|
|
const xmb = fs.readFileSync(xmbOutput, {encoding: 'utf-8'});
|
2016-08-12 22:13:54 -07:00
|
|
|
expect(xmb).toEqual(EXPECTED_XMB);
|
2016-06-01 14:58:11 -07:00
|
|
|
});
|
2016-08-12 22:13:54 -07:00
|
|
|
|
|
|
|
|
it('should extract i18n messages as xliff', () => {
|
|
|
|
|
const xlfOutput = path.join(outDir, 'messages.xlf');
|
|
|
|
|
expect(fs.existsSync(xlfOutput)).toBeTruthy();
|
|
|
|
|
const xlf = fs.readFileSync(xlfOutput, {encoding: 'utf-8'});
|
|
|
|
|
expect(xlf).toEqual(EXPECTED_XLIFF);
|
|
|
|
|
});
|
2017-01-26 10:27:07 +01:00
|
|
|
|
2017-04-14 09:05:00 -07:00
|
|
|
it('should extract i18n messages as xliff version 2.0', () => {
|
|
|
|
|
const xlfOutput = path.join(outDir, 'messages.xliff2.xlf');
|
|
|
|
|
expect(fs.existsSync(xlfOutput)).toBeTruthy();
|
|
|
|
|
const xlf = fs.readFileSync(xlfOutput, {encoding: 'utf-8'});
|
|
|
|
|
expect(xlf).toEqual(EXPECTED_XLIFF2);
|
|
|
|
|
});
|
|
|
|
|
|
2017-01-26 10:27:07 +01:00
|
|
|
it('should not emit js', () => {
|
2017-09-12 15:53:17 -07:00
|
|
|
const files = fs.readdirSync(outDir);
|
|
|
|
|
files.forEach(f => expect(f).not.toMatch(/\.js$/));
|
2017-01-26 10:27:07 +01:00
|
|
|
});
|
2016-06-01 14:58:11 -07:00
|
|
|
});
|
