This repository has been archived by the owner on Jul 30, 2018. It is now read-only.
Using loader from grunt-dojo2 and tslib from shim #103
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
rorticus
commented
Nov 7, 2017
| ], | ||
| "browser": { | ||
| "loader": { | ||
| "script": "./node_modules/grunt-dojo2/lib/intern/internLoader.js", |
There was a problem hiding this comment.
intern doesn't let us specify loader options without specifying the loader script, so we need to reference the loader in grunt-dojo2 manually in order for the packages below to take affect.
rorticus
force-pushed
the
shim-helpers
branch
from
db5f331
to
6c0e9cb
Compare
mwistrand
suggested changes
Nov 7, 2017
tests/support/mocks/common/main.ts
Outdated
| @@ -8,7 +8,7 @@ const locales = [ | |||
|
|
|||
| const hasHostNode = has('host-node'); | |||
| const pathSeparator = hasHostNode ? require('path').sep : '/'; | |||
| const bundlePath = `tests${pathSeparator}support${pathSeparator}mocks${pathSeparator}common${pathSeparator}main`; | |||
| const bundlePath = hasHostNode ? `${__dirname}${pathSeparator}/main` : '_build/tests/support/mocks/common/main'; | |||
There was a problem hiding this comment.
The / after ${pathSeparator} needs to be removed for tests to pass on Windows ;).
tests/support/mocks/common/party.ts
Outdated
| @@ -5,7 +5,7 @@ import has from '@dojo/core/has'; | |||
| // this case, `node_modules/@dojo/loader/loader.min.js'. Is there a better, less hacky way to handle this? | |||
| const hasHostNode = has('host-node'); | |||
| const pathSeparator = hasHostNode ? require('path').sep : '/'; | |||
| const basePath = hasHostNode ? `..${pathSeparator}_build${pathSeparator}` : ''; | |||
| const basePath = hasHostNode ? `${__dirname}${pathSeparator}..${pathSeparator}..${pathSeparator}..${pathSeparator}..${pathSeparator}` : `_/build${pathSeparator}`; | |||
There was a problem hiding this comment.
This would be much better as path.resolve(__dirname, '../../../../') (and the path separator will be converted automatically).
rorticus
force-pushed
the
shim-helpers
branch
from
dd0b883
to
0b81b72
Compare
kitsonk
approved these changes
Nov 14, 2017
mwistrand
approved these changes
Nov 14, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Updating to use intern loader from grunt-dojo2, and tslib from shim PR, dojo/shim#114 .