Skip to content

Commit cd17e46

Browse files
authored
Merge pull request #1145 from stealjs/es2015
Fix build of ES2015 code with forceES5 set to false
2 parents af8f092 + 625cb0d commit cd17e46

File tree

4 files changed

+43
-2
lines changed

4 files changed

+43
-2
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"through2": "^3.0.0",
4040
"tmp": "0.0.33",
4141
"traceur": "0.0.111",
42-
"transpile": "^2.7.0",
42+
"transpile": "^2.7.2",
4343
"urix": "^0.1.0",
4444
"winston": "^2.2.0",
4545
"ws": "^5.1.1",
@@ -105,7 +105,7 @@
105105
"test:exports-worker": "node test/exports_worker/exports.js && testee test/exports_worker/worker.html --browsers firefox --reporter Spec"
106106
},
107107
"engines": {
108-
"node": "4.x - 10.x"
108+
"node": "8.x - 10.x"
109109
},
110110
"system": {
111111
"npmDependencies": [

test/es2015_literals/config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
steal.config({
2+
forceES5: false,
3+
treeShaking: false
4+
});

test/es2015_literals/main.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
let name = "John";
2+
let time = "today";
3+
4+
export default `Hello ${name}, how are you ${time}?`;

test/multibuild_test.js

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2330,4 +2330,37 @@ describe("multi build", function(){
23302330
);
23312331
});
23322332
});
2333+
2334+
it("should build ES2015 when data.loader.forceES5 is false", function() {
2335+
var config = {
2336+
config: path.join(__dirname, "es2015_literals", "config.js"),
2337+
main: "main"
2338+
};
2339+
2340+
var options = {
2341+
minify: false,
2342+
quiet: true,
2343+
sourceMaps: false
2344+
};
2345+
2346+
return asap(rmdir)(path.join(__dirname, "es2015_literals", "dist"))
2347+
.then(function() {
2348+
return multiBuild(config, options);
2349+
})
2350+
.then(function() {
2351+
var main = path.join(
2352+
__dirname,
2353+
"es2015_literals",
2354+
"dist",
2355+
"bundles",
2356+
"main.js"
2357+
);
2358+
var actualJS = fs.readFileSync(main, "utf8");
2359+
2360+
assert(
2361+
actualJS.includes("`Hello ${ name }, how are you ${ time }?`"),
2362+
"source should include ES2015 string literals"
2363+
);
2364+
});
2365+
});
23332366
});

0 commit comments

Comments
 (0)