2016-06-23 12:47:54 -04: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
|
|
|
|
*/
|
|
|
|
|
2016-08-17 12:24:44 -04:00
|
|
|
import {ResourceLoader, analyzeAppProvidersForDeprecatedConfiguration, platformCoreDynamic} from '@angular/compiler';
|
2016-08-15 22:37:42 -04:00
|
|
|
import {ApplicationRef, COMPILER_OPTIONS, CUSTOM_ELEMENTS_SCHEMA, CompilerFactory, CompilerOptions, ComponentRef, NgModule, PlatformRef, Provider, Type, createPlatformFactory} from '@angular/core';
|
2016-08-10 21:21:28 -04:00
|
|
|
import {BrowserModule, WORKER_SCRIPT, WorkerAppModule, platformWorkerUi} from '@angular/platform-browser';
|
2016-06-08 19:38:52 -04:00
|
|
|
|
2016-07-18 06:50:31 -04:00
|
|
|
import {Console} from './core_private';
|
|
|
|
import {INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from './src/platform_providers';
|
2016-08-17 12:24:44 -04:00
|
|
|
import {CachedResourceLoader} from './src/resource_loader/resource_loader_cache';
|
|
|
|
import {ResourceLoaderImpl} from './src/resource_loader/resource_loader_impl';
|
2016-05-24 19:13:17 -04:00
|
|
|
|
2016-08-15 22:37:42 -04:00
|
|
|
|
|
|
|
|
2016-06-27 15:27:23 -04:00
|
|
|
/**
|
|
|
|
* @experimental
|
|
|
|
*/
|
2016-08-17 12:24:44 -04:00
|
|
|
export const RESOURCE_CACHE_PROVIDER: Provider[] =
|
|
|
|
[{provide: ResourceLoader, useClass: CachedResourceLoader}];
|
2016-06-10 13:21:53 -04:00
|
|
|
|
refactor(core): clean up platform bootstrap and initTestEnvironment
- Introduces `CompilerFactory` which can be part of a `PlatformRef`.
- Introduces `WorkerAppModule`, `WorkerUiModule`, `ServerModule`
- Introduces `serverDynamicPlatform` for applications using runtime compilation
on the server.
- Changes browser bootstrap for runtime and offline compilation (see below for an example).
* introduces `bootstrapModule` and `bootstrapModuleFactory` in `@angular/core`
* introduces new `browserDynamicPlatform` in `@angular/platform-browser-dynamic
- Changes `initTestEnvironment` (which used to be `setBaseTestProviders`) to not take a compiler factory any more (see below for an example).
BREAKING CHANGE:
## Migration from `setBaseTestProviders` to `initTestEnvironment`:
- For the browser platform:
BEFORE:
```
import {setBaseTestProviders} from ‘@angular/core/testing’;
import {TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS} from ‘@angular/platform-browser-dynamic/testing’;
setBaseTestProviders(TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
```
AFTER:
```
import {initTestEnvironment} from ‘@angular/core/testing’;
import {browserDynamicTestPlatform,
BrowserDynamicTestModule} from ‘@angular/platform-browser-dynamic/testing’;
initTestEnvironment(
BrowserDynamicTestModule,
browserDynamicTestPlatform());
```
- For the server platform:
BEFORE:
```
import {setBaseTestProviders} from ‘@angular/core/testing’;
import {TEST_SERVER_PLATFORM_PROVIDERS,
TEST_SERVER_APPLICATION_PROVIDERS} from ‘@angular/platform-server/testing/server’;
setBaseTestProviders(TEST_SERVER_PLATFORM_PROVIDERS,
TEST_SERVER_APPLICATION_PROVIDERS);
```
AFTER:
```
import {initTestEnvironment} from ‘@angular/core/testing’;
import {serverTestPlatform,
ServerTestModule} from ‘@angular/platform-browser-dynamic/testing’;
initTestEnvironment(
ServerTestModule,
serverTestPlatform());
```
## Bootstrap changes
```
@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 {browserPlatform} from ‘@angular/platform-browser’;
import {bootstrapModuleFactory} from ‘@angular/core’;
bootstrapModuleFactory(MyModuleNgFactory, browserPlatform());
// runtime compile long form
import {browserDynamicPlatform} from ‘@angular/platform-browser-dynamic’;
import {bootstrapModule} from ‘@angular/core’;
bootstrapModule(MyModule, browserDynamicPlatform());
```
Closes #9922
Part of #9726
2016-07-08 13:47:17 -04:00
|
|
|
/**
|
|
|
|
* @experimental API related to bootstrapping are still under review.
|
|
|
|
*/
|
2016-07-26 08:21:19 -04:00
|
|
|
export const platformBrowserDynamic = createPlatformFactory(
|
|
|
|
platformCoreDynamic, 'browserDynamic', INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS);
|
|
|
|
|
2016-06-15 20:12:22 -04:00
|
|
|
/**
|
2016-07-18 06:50:31 -04:00
|
|
|
* Bootstraps the worker ui.
|
|
|
|
*
|
|
|
|
* @experimental
|
2016-06-15 20:12:22 -04:00
|
|
|
*/
|
2016-06-15 11:25:31 -04:00
|
|
|
export function bootstrapWorkerUi(
|
2016-08-15 22:37:42 -04:00
|
|
|
workerScriptUri: string, customProviders: Provider[] = []): Promise<PlatformRef> {
|
2016-07-18 06:50:31 -04:00
|
|
|
// For now, just creates the worker ui platform...
|
2016-08-15 22:37:42 -04:00
|
|
|
return Promise.resolve(platformWorkerUi(([{
|
2016-07-18 06:50:31 -04:00
|
|
|
provide: WORKER_SCRIPT,
|
|
|
|
useValue: workerScriptUri,
|
2016-08-15 22:37:42 -04:00
|
|
|
}] as Provider[])
|
|
|
|
.concat(customProviders)));
|
2016-06-10 13:21:53 -04:00
|
|
|
}
|
|
|
|
|
2016-06-15 20:12:22 -04:00
|
|
|
/**
|
2016-07-18 06:50:31 -04:00
|
|
|
* @experimental API related to bootstrapping are still under review.
|
2016-06-15 20:12:22 -04:00
|
|
|
*/
|
2016-08-17 12:24:44 -04:00
|
|
|
export const platformWorkerAppDynamic = createPlatformFactory(
|
|
|
|
platformCoreDynamic, 'workerAppDynamic', [{
|
|
|
|
provide: COMPILER_OPTIONS,
|
|
|
|
useValue: {providers: [{provide: ResourceLoader, useClass: ResourceLoaderImpl}]},
|
|
|
|
multi: true
|
|
|
|
}]);
|
2016-06-10 13:21:53 -04:00
|
|
|
|
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 16:07:17 -04:00
|
|
|
function normalizeArray(arr: any[]): any[] {
|
|
|
|
return arr ? arr : [];
|
2016-07-18 06:50:31 -04:00
|
|
|
}
|