-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
As explained in issue #1844 and in issue webpack/webpack#15007 (comment), the way we used the `browser`-field was wrong. The main reason for using the `browser`-field is the requirement of `require('fs')` in the main-entry-file. The workaround for this was using `require('handlebars/lib/handlebars')`, but now it will also work via `require('handlebars')` for bundlers that respect the `browser`-field. The `"./runtime"`-config was removed, because it didn't have any effect. In order to detect regressions, the webpack-integration test was extended to test with different webpack versions. Fixes #1174 Closes #1844
- Loading branch information
Showing
5 changed files
with
70 additions
and
20 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,15 @@ | ||
{ | ||
"name": "webpack-test", | ||
"description": "Various tests with Handlebars and Webpack", | ||
"description": "Various tests with Handlebars and multiple webpack versions", | ||
"version": "1.0.0", | ||
"main": "index.js", | ||
"scripts": { | ||
"build": "webpack --config webpack.config.js", | ||
"test": "node dist/main.js" | ||
}, | ||
"private": true, | ||
"keywords": [], | ||
"author": "", | ||
"license": "ISC", | ||
"dependencies": {}, | ||
"devDependencies": { | ||
"dependencies": { | ||
"handlebars": "file:../../..", | ||
"handlebars-loader": "^1.7.1", | ||
"webpack": "^4.39.3", | ||
"webpack-cli": "^3.3.7" | ||
"handlebars-loader": "^1.7.1" | ||
} | ||
} |
5 changes: 5 additions & 0 deletions
5
tests/integration/webpack-test/src/handlebars-esm-import-test.js
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
import Handlebars from 'handlebars/lib/handlebars'; | ||
import { assertEquals } from './lib/assert'; | ||
|
||
const template = Handlebars.compile('Author: {{author}}'); | ||
assertEquals(template({ author: 'Yehuda' }), 'Author: Yehuda'); |
43 changes: 43 additions & 0 deletions
43
tests/integration/webpack-test/src/handlebars-runtime-test.js
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
import * as Handlebars from 'handlebars/runtime'; | ||
import { assertEquals } from './lib/assert'; | ||
|
||
const template = Handlebars.template({ | ||
compiler: [8, '>= 4.3.0'], | ||
main: function(container, depth0, helpers, partials, data) { | ||
var helper, | ||
lookupProperty = | ||
container.lookupProperty || | ||
function(parent, propertyName) { | ||
if (Object.prototype.hasOwnProperty.call(parent, propertyName)) { | ||
return parent[propertyName]; | ||
} | ||
return undefined; | ||
}; | ||
|
||
return ( | ||
'Author: ' + | ||
container.escapeExpression( | ||
((helper = | ||
(helper = | ||
lookupProperty(helpers, 'author') || | ||
(depth0 != null ? lookupProperty(depth0, 'author') : depth0)) != | ||
null | ||
? helper | ||
: container.hooks.helperMissing), | ||
typeof helper === 'function' | ||
? helper.call(depth0 != null ? depth0 : container.nullContext || {}, { | ||
name: 'author', | ||
hash: {}, | ||
data: data, | ||
loc: { | ||
start: { line: 1, column: 8 }, | ||
end: { line: 1, column: 18 } | ||
} | ||
}) | ||
: helper) | ||
) | ||
); | ||
}, | ||
useData: true | ||
}); | ||
assertEquals(template({ author: 'Yehuda' }), 'Author: Yehuda'); |
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