Chore/angular 2 upgrade #140
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zakhenry
commented
Nov 14, 2016
| @@ -49,10 +47,10 @@ | |||
| "@types/proxyquire": "^1.3.26", | |||
| "@types/socket.io": "^1.4.26", | |||
| "@types/validator": "^4.5.26", | |||
| "@xiphiaz/vantage": "^1.7.2", | |||
| "angular2-universal": "^2.1.0-rc.1", | |||
| export * from './browser'; | ||
| export * from './common'; | ||
| export * from './server'; | ||
| // export * from './browser'; |
| @@ -36,3 +37,17 @@ export const CORE_PROVIDERS: ProviderDefinition[] = [ | |||
| {provide: Server, useClass: ExpressServer}, | |||
| {provide: Logger, useClass: ConsoleLogger}, | |||
| ]; | |||
|
|
|||
| // | |||
| @@ -14,6 +12,9 @@ import { ExpressServer } from './servers/express.server'; | |||
| import * as dotenv from 'dotenv'; | |||
| import * as path from 'path'; | |||
| import * as _ from 'lodash'; | |||
| // import { ProviderDefinition } from './bootstrap/bootstrap'; | |||
| import { RemoteCliMock } from './remoteCli.service.mock'; | ||
| import { AuthServiceMock } from './auth.service.mock'; | ||
| import { AuthService } from './auth.service'; | ||
| import * as chalk from 'chalk'; | ||
|
|
||
| import Spy = jasmine.Spy; | ||
|
|
||
| describe('Remote CLI Commands', () => { | ||
| xdescribe('Remote CLI Commands', () => { |
| import alias = require('~vantage/index'); | ||
| export = alias; | ||
| } | ||
| declare module 'vantage' |
There was a problem hiding this comment.
Move into src/server/services/remoteCli.service.ts
…s into chore/angular-2-upgrade * 'chore/angular-2-upgrade' of github.com:ubiquits/ubiquits: Automated version bump [ci skip] Update index.md
…of common to avoid import crossover, fixed polyfills
…const to fix issues of builds breaking for cross source tests
|
Changes Unknown when pulling ba28d05 on chore/angular-2-upgrade into * on master*. |
|
Changes Unknown when pulling 6608432 on chore/angular-2-upgrade into * on master*. |
|
Changes Unknown when pulling 663aaed on chore/angular-2-upgrade into * on master*. |
|
Changes Unknown when pulling ab3b9c7 on chore/angular-2-upgrade into * on master*. |
…ection pooling due to bug.
|
Changes Unknown when pulling d8ecda1 on chore/angular-2-upgrade into ** on master**. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This project uses semver, please check the scope of this pr: