[OC-60] Oc client browser #534
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
matteofigus
requested changes
Jul 10, 2017
| @@ -3,4 +3,4 @@ script. | |||
| oc.conf = oc.conf || {}; | |||
| oc.conf.templates = oc.conf.templates || []; | |||
| oc.conf.templates = oc.conf.templates.concat(!{JSON.stringify(templates)}); | |||
| script(src=staticPath+"src/oc-client.min.js", type="text/javascript") | |||
| script(src="https://unpkg.com/oc-client-browser@1.0.0/dist/oc-client.min.js", type="text/javascript") | |||
There was a problem hiding this comment.
I think we should update the oc's build script so that this version (1.0.0) comes from a require('oc-client-browser/package').version.
added 11 commits
July 10, 2017 16:04
nickbalestra
commented
Jul 10, 2017
appveyor.yml
Outdated
| @@ -24,4 +24,4 @@ install: | |||
| build: off | |||
|
|
|||
| test_script: | |||
| - cmd: grunt test | |||
| - cmd: grunt | |||
There was a problem hiding this comment.
If appveyor rely on npm test by default, then this could also be cleaned up further
tasks/build.js
Outdated
| grunt.log[err ? 'error' : 'ok']( | ||
| err ? err : 'Client has been built and packaged' | ||
| const done = this.async(); | ||
| const version = ocClientBrowser.version; |
There was a problem hiding this comment.
version is not needed anymore here
|
Fixes #438 |
matteofigus
approved these changes
Jul 11, 2017
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.
Blocking PR that need to be published:
Fixes and final cleanup oc-client-browser#5
Removed what has been moved to oc-client-browser
Rely on oc-client-browser through CDN for the OC client component
Rely on oc-client-browser through NPM for the node client