Skip to content

Commit f7eb204

Browse files
imaustinkimaustink
authored
Merge pull request #45 from bit-docs/11-update-steal-to-1.x
Update steal to 1.x
2 parents a15f701 + 91bc024 commit f7eb204

File tree

8 files changed

+182
-240
lines changed

8 files changed

+182
-240
lines changed

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ site/static/build/
44
site/static/dist/
55
site/templates/
66
test/tmp
7-
.idea/
7+
.idea/
8+
.vscode
9+
.DS_Store

‎build/build_test.js

Lines changed: 32 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,40 @@
1-
require("./make_default_helpers_test");
2-
1+
var fs = require('fs');
2+
var path = require('path');
3+
var assert = require('assert');
4+
var Q = require('q');
5+
var rimraf = require('rimraf');
36
var getRenderer = require('./get_renderer');
47
var getPartials = require('./get_partials');
58
var build = require("./build");
6-
var assert = require('assert');
7-
var Q = require('q');
8-
var path = require('path');
9-
var rmdir = require('rimraf');
10-
var fs = require('fs');
9+
10+
var rmdir = Q.denodeify(rimraf);
1111
var read = Q.denodeify(fs.readFile);
1212

13-
describe("documentjs/lib/generators/html/build",function(){
13+
require("./make_default_helpers_test");
14+
15+
describe("documentjs/lib/generators/html/build", function(){
1416

15-
beforeEach(function(done){
16-
rmdir(path.join(__dirname,"..","site","static"), function(e){
17-
rmdir(path.join(__dirname,"..","site","templates"), done);
17+
beforeEach(function(){
18+
return rmdir(path.join(__dirname, "..", "site", "static")).then(function(){
19+
return rmdir(path.join(__dirname, "..", "site", "templates"));
1820
});
1921
});
2022

21-
it("get_renderer and get_partial work",function(done){
22-
Q.all([
23+
it("get_renderer and get_partial work", function(){
24+
return Q.all([
2325
getRenderer('build/test/templates'),
2426
getPartials('build/test/templates')
2527
]).then(function(results){
26-
2728
var renderer = results[0];
28-
2929
var result = renderer({subject: "World"});
3030

3131
assert.equal(result, "<html><h1>Hello World</h1></html>");
32-
done();
33-
},done).catch(done);
32+
});
3433
});
3534

36-
it("build.renderer build.templates build.helpers",function(done){
37-
35+
it("build.renderer build.templates build.helpers", function(){
3836
var options = {
39-
html: { templates: path.join(__dirname,"test","templates_with_helpers") },
37+
html: { templates: path.join(__dirname, "test", "templates_with_helpers") },
4038
dest: "XXXXYYYZZZ",
4139
forceBuild: true,
4240
pageConfig: {
@@ -53,13 +51,11 @@ describe("documentjs/lib/generators/html/build",function(){
5351
};
5452

5553

56-
Q.all([
54+
return Q.all([
5755
build.renderer(buildTemplatesPromise, options),
5856
build.helpers(buildTemplatesPromise, {}, options, getCurrent)
5957
]).then(function(results){
60-
6158
var renderer = results[0];
62-
6359
var result = renderer({
6460
subject: "World",
6561
src: "./index.js",
@@ -68,14 +64,13 @@ describe("documentjs/lib/generators/html/build",function(){
6864
});
6965

7066
assert.equal(result, "<html><h1>HELLO World</h1>\n</html>");
71-
done();
72-
},done).catch(done);
67+
});
7368

7469
});
7570

76-
it("Does ignoreTemplateRender",function(done){
71+
it("Does ignoreTemplateRender", function(){
7772
var options = {
78-
html: {templates: path.join(__dirname,"test","render_body_option")},
73+
html: {templates: path.join(__dirname, "test", "render_body_option")},
7974
dest: "XXXXYYYZZZ",
8075
forceBuild: true,
8176
pageConfig: {
@@ -91,18 +86,15 @@ describe("documentjs/lib/generators/html/build",function(){
9186
return data;
9287
};
9388

94-
Q.all([
89+
return Q.all([
9590
build.renderer(buildTemplatesPromise, options),
9691
build.helpers(buildTemplatesPromise, {}, options, getCurrent)
9792
]).then(function(results){
98-
9993
var renderer = results[0];
100-
10194
var result = renderer({body: "{{message}} stuff"});
10295

10396
assert.equal(result, "<html><h1>{{message}} stuff</h1>\n<p>static</p></html>");
104-
done();
105-
},done).catch(done);
97+
});
10698

10799
});
108100

@@ -116,7 +108,7 @@ describe("documentjs/lib/generators/html/build",function(){
116108
}
117109
}
118110
}).then(function(result){
119-
return read(path.join(__dirname, "..", result.distFolder, "bundles","bit-docs-site","static.js"));
111+
return read(path.join(__dirname, "..", result.distFolder, "bundles", "bit-docs-site", "static.js"));
120112
}).then(function(res){
121113
assert.ok(/can-component/.test(res), "got static.js with component");
122114
});
@@ -154,9 +146,11 @@ describe("documentjs/lib/generators/html/build",function(){
154146
});
155147
});
156148

157-
it("makes linked content",function(done){
149+
it("makes linked content", function(){
158150
var options = {
159-
html: { templates: path.join(__dirname,"test","escaped") },
151+
html: {
152+
templates: path.join(__dirname, "test", "escaped")
153+
},
160154
dest: "XXXXYYYZZZ",
161155
forceBuild: true,
162156
pageConfig: {
@@ -181,18 +175,14 @@ describe("documentjs/lib/generators/html/build",function(){
181175
something: {name: "something", title: "<something/>"}
182176
};
183177

184-
185-
Q.all([
178+
return Q.all([
186179
build.renderer(buildTemplatesPromise, options),
187180
build.helpers(buildTemplatesPromise, docMap, options, getCurrent)
188181
]).then(function(results){
189-
190182
var renderer = results[0];
191-
192183
var result = renderer(docObject);
184+
193185
assert.equal(result, "<html><p>This is <a href=\"something.html\" title=\"something\"><something/></a></p>\n\n</html>");
194-
done();
195-
},done).catch(done);
186+
});
196187
});
197-
198188
});

‎build/static_dist.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ function addPackages(siteConfig, buildFolder) {
113113
return readFile(path.join(fullBuildFolderPath, "package.json")).then(function(packageContents){
114114
var json = JSON.parse(packageContents);
115115

116+
json = _.merge(json || {}, siteConfig.html.package);
117+
// Legacy support for dependency injection
116118
json.dependencies = _.assign(json.dependencies || {},siteConfig.html.dependencies);
117119

118120
return writeFile( path.join(fullBuildFolderPath, "package.json"), JSON.stringify(json) ).then(function(){
@@ -158,7 +160,7 @@ function installPackages(options, buildFolder, distFolder, hash){
158160
if(options.debug) {
159161
console.log("BUILD: Getting build module");
160162
}
161-
163+
162164
var build = require("../site/static/build/"+hash+"/build.js");
163165
return build(options,{
164166
dist: distFolder,

0 commit comments

Comments
 (0)