Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/commands/serve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,13 @@ command(
return args
},
args => {
serve(args.prod, args.aot)
serve(args.prod)
}
)
.option('prod', {
default: false,
description: 'Run with optimizations enabled'
})
.option('aot', {
default: false,
description: 'Pass through AOT Compiler'
})
.option('sw', {
default: false,
description: 'Enable service-worker'
Expand All @@ -39,14 +35,15 @@ function logServeCommandStart() {
logInfo('Launching Serve Command')
}

function serve(isProdBuild = false, isAotBuild = false) {
function serve(isProdBuild = false) {
readConfig_()
.pipe(
tap(logServeCommandStart),
take(1)
)
.subscribe(config => {
const cache = !isProdBuild
const isAotBuild = isProdBuild
const log = config.fusebox.verbose || false
const homeDir = resolve('.')
const serverOutput = resolve(config.fusebox.server.outputDir)
Expand Down
16 changes: 14 additions & 2 deletions src/generators/angular-core.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ import { writeFile_, mkDirAndContinueIfExists_ } from '../utilities/rx-fs'
import { forkJoin } from 'rxjs'
import { resolve } from 'path'
import { flatMap } from 'rxjs/operators'
import { browserModuleTemplate } from '../templates/core/browser'
import {
browserModuleTemplate,
browserAotEntryTemplate,
browserJitEntryTemplate
} from '../templates/core/browser'
import {
serverTemplate,
serverModuleTemplate,
Expand Down Expand Up @@ -62,7 +66,15 @@ export function generateCoreAngularBrowser(projectDir: string) {
flatMap(() => mkDirAndContinueIfExists_(baseDir)),
flatMap(() =>
forkJoin([
writeFile_(`${baseDir}/app.browser.module.ts`, browserModuleTemplate)
writeFile_(`${baseDir}/app.browser.module.ts`, browserModuleTemplate),
writeFile_(
`${baseDir}/app.browser.entry.jit.ts`,
browserJitEntryTemplate
),
writeFile_(
`${baseDir}/app.browser.entry.aot.ts`,
browserAotEntryTemplate
)
])
)
)
Expand Down
4 changes: 4 additions & 0 deletions src/templates/core/browser/app.browser.entry.aot.ts.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { platformBrowser } from '@angular/platform-browser'
import { AppBrowserModuleNgFactory } from './app.browser.module.ngfactory'

platformBrowser().bootstrapModuleFactory(AppBrowserModuleNgFactory)
4 changes: 4 additions & 0 deletions src/templates/core/browser/app.browser.entry.jit.ts.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
import { AppBrowserModule } from './app.browser.module'

platformBrowserDynamic().bootstrapModule(AppBrowserModule)
2 changes: 0 additions & 2 deletions src/templates/core/browser/app.browser.module.ts.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { AppModule } from '../app/app.module'
import { NgModule } from '@angular/core'
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
import { BrowserTransferStateModule, BrowserModule } from '@angular/platform-browser'
import { AppComponent } from '../app/app.component'

Expand All @@ -14,4 +13,3 @@ import { AppComponent } from '../app/app.component'
})
export class AppBrowserModule { }

platformBrowserDynamic().bootstrapModule(AppBrowserModule)
8 changes: 6 additions & 2 deletions src/templates/core/browser/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import * as browserModuleTemplate from './app.browser.module.ts.txt'
import * as browserJitEntryTemplate from './app.browser.entry.jit.ts.txt'
import * as browserAotEntryTemplate from './app.browser.entry.aot.ts.txt'

export {
browserModuleTemplate
}
browserModuleTemplate,
browserJitEntryTemplate,
browserAotEntryTemplate
}
7 changes: 6 additions & 1 deletion src/templates/declarations.ts.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
declare module "*.json" {
const value: any;
export default value;
}
}

declare module "*./app.browser.module.ngfactory" {
const value: any;
export { AppBrowserModuleNgFactory };
}
6 changes: 3 additions & 3 deletions src/templates/fusebox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ export const FUSEBOX_DEFAULTS = {
verbose: false,
browser: {
outputDir: '.dist/public/js',
browserModule: 'src/browser/app.browser.jit.entry.ts',
aotBrowserModule: '.aot/src/browser/app.browser.aot.entry.js',
browserModule: 'src/browser/app.browser.entry.jit.ts',
aotBrowserModule: '.aot/src/browser/app.browser.entry.aot.js',
prod: {
uglify: true,
treeshake: true
}
},
server: {
outputDir: '.dist',
serverModule: 'server/server.ts'
serverModule: 'src/server/server.ts'
}
}
2 changes: 1 addition & 1 deletion src/templates/tsconfig.aot.json.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"src"
],
"exclude": [
"src/browser/app.browser.jit.entry.ts"
"src/browser/app.browser.entry.jit.ts"
],
"angularCompilerOptions": {
"genDir": ".aot",
Expand Down