Skip to content

Fix 'next' branch#148

Merged
jdalrymple merged 1 commit into
jdalrymple:nextfrom
evolution-gaming:fix-next-branch
Aug 14, 2018
Merged

Fix 'next' branch#148
jdalrymple merged 1 commit into
jdalrymple:nextfrom
evolution-gaming:fix-next-branch

Conversation

@pablobirukov

@pablobirukov pablobirukov commented Aug 14, 2018

Copy link
Copy Markdown
Contributor

#137, #89

  • change target for modern env from es2017 to es6 (async/await should be transpiled to downlevel js)
  • import correct 'wait' fn
  • export 'wait'
  • fix src/services/Projects.ts (likely was broken after wrong conflict resolution, 699ec9a)

* change target for modern env from es2017 to es6 (async/await should be transpiled to downlevel js)
* import correct 'wait' fn
* export 'wait'
* fix src/services/Projects.ts (likely was broken after wrong conflict resolution)
Comment thread src/services/Projects.ts
`projects/${pId}/uploads`,
{
file: {
value: content,

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea this got messed up in a merge at some point. Eventually i want to remove the dependency on Fs for browser compatibility.

@jdalrymple jdalrymple merged commit ca185e3 into jdalrymple:next Aug 14, 2018
jdalrymple pushed a commit that referenced this pull request Aug 15, 2018
* change target for modern env from es2017 to es6 (async/await should be transpiled to downlevel js)
* import correct 'wait' fn
* export 'wait'
* fix src/services/Projects.ts (likely was broken after wrong conflict resolution)
jdalrymple pushed a commit that referenced this pull request Aug 15, 2018
* change target for modern env from es2017 to es6 (async/await should be transpiled to downlevel js)
* import correct 'wait' fn
* export 'wait'
* fix src/services/Projects.ts (likely was broken after wrong conflict resolution)
jdalrymple pushed a commit that referenced this pull request Aug 15, 2018
* change target for modern env from es2017 to es6 (async/await should be transpiled to downlevel js)
* import correct 'wait' fn
* export 'wait'
* fix src/services/Projects.ts (likely was broken after wrong conflict resolution)
jdalrymple pushed a commit that referenced this pull request Aug 16, 2018
* change target for modern env from es2017 to es6 (async/await should be transpiled to downlevel js)
* import correct 'wait' fn
* export 'wait'
* fix src/services/Projects.ts (likely was broken after wrong conflict resolution)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants