Skip to content

Update steal to 1.x #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 16, 2017
Merged

Update steal to 1.x #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cd2dc41
upgrading to steal 1.x
leoj3n Apr 18, 2017
2c8a88d
change timeout
leoj3n Apr 18, 2017
3c4775b
Move steal-tools back to top-level package.json
leoj3n Apr 20, 2017
a44a3f4
increase timeout to 120000
leoj3n Apr 20, 2017
8aabb11
increase timeout to 240000
leoj3n Apr 20, 2017
9cca0c3
Add q dep
leoj3n Apr 20, 2017
11f558c
update location of steal.production.js
leoj3n Apr 20, 2017
91bc024
Upgrade bit-docs to steal 1.x
imaustink Aug 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ site/static/build/
site/static/dist/
site/templates/
test/tmp
.idea/
.idea/
.vscode
.DS_Store
74 changes: 32 additions & 42 deletions build/build_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,40 @@
require("./make_default_helpers_test");

var fs = require('fs');
var path = require('path');
var assert = require('assert');
var Q = require('q');
var rimraf = require('rimraf');
var getRenderer = require('./get_renderer');
var getPartials = require('./get_partials');
var build = require("./build");
var assert = require('assert');
var Q = require('q');
var path = require('path');
var rmdir = require('rimraf');
var fs = require('fs');

var rmdir = Q.denodeify(rimraf);
var read = Q.denodeify(fs.readFile);

describe("documentjs/lib/generators/html/build",function(){
require("./make_default_helpers_test");

describe("documentjs/lib/generators/html/build", function(){

beforeEach(function(done){
rmdir(path.join(__dirname,"..","site","static"), function(e){
rmdir(path.join(__dirname,"..","site","templates"), done);
beforeEach(function(){
return rmdir(path.join(__dirname, "..", "site", "static")).then(function(){
return rmdir(path.join(__dirname, "..", "site", "templates"));
});
});

it("get_renderer and get_partial work",function(done){
Q.all([
it("get_renderer and get_partial work", function(){
return Q.all([
getRenderer('build/test/templates'),
getPartials('build/test/templates')
]).then(function(results){

var renderer = results[0];

var result = renderer({subject: "World"});

assert.equal(result, "<html><h1>Hello World</h1></html>");
done();
},done).catch(done);
});
});

it("build.renderer build.templates build.helpers",function(done){

it("build.renderer build.templates build.helpers", function(){
var options = {
html: { templates: path.join(__dirname,"test","templates_with_helpers") },
html: { templates: path.join(__dirname, "test", "templates_with_helpers") },
dest: "XXXXYYYZZZ",
forceBuild: true,
pageConfig: {
Expand All @@ -53,13 +51,11 @@ describe("documentjs/lib/generators/html/build",function(){
};


Q.all([
return Q.all([
build.renderer(buildTemplatesPromise, options),
build.helpers(buildTemplatesPromise, {}, options, getCurrent)
]).then(function(results){

var renderer = results[0];

var result = renderer({
subject: "World",
src: "./index.js",
Expand All @@ -68,14 +64,13 @@ describe("documentjs/lib/generators/html/build",function(){
});

assert.equal(result, "<html><h1>HELLO World</h1>\n</html>");
done();
},done).catch(done);
});

});

it("Does ignoreTemplateRender",function(done){
it("Does ignoreTemplateRender", function(){
var options = {
html: {templates: path.join(__dirname,"test","render_body_option")},
html: {templates: path.join(__dirname, "test", "render_body_option")},
dest: "XXXXYYYZZZ",
forceBuild: true,
pageConfig: {
Expand All @@ -91,18 +86,15 @@ describe("documentjs/lib/generators/html/build",function(){
return data;
};

Q.all([
return Q.all([
build.renderer(buildTemplatesPromise, options),
build.helpers(buildTemplatesPromise, {}, options, getCurrent)
]).then(function(results){

var renderer = results[0];

var result = renderer({body: "{{message}} stuff"});

assert.equal(result, "<html><h1>{{message}} stuff</h1>\n<p>static</p></html>");
done();
},done).catch(done);
});

});

Expand All @@ -116,7 +108,7 @@ describe("documentjs/lib/generators/html/build",function(){
}
}
}).then(function(result){
return read(path.join(__dirname, "..", result.distFolder, "bundles","bit-docs-site","static.js"));
return read(path.join(__dirname, "..", result.distFolder, "bundles", "bit-docs-site", "static.js"));
}).then(function(res){
assert.ok(/can-component/.test(res), "got static.js with component");
});
Expand Down Expand Up @@ -154,9 +146,11 @@ describe("documentjs/lib/generators/html/build",function(){
});
});

it("makes linked content",function(done){
it("makes linked content", function(){
var options = {
html: { templates: path.join(__dirname,"test","escaped") },
html: {
templates: path.join(__dirname, "test", "escaped")
},
dest: "XXXXYYYZZZ",
forceBuild: true,
pageConfig: {
Expand All @@ -181,18 +175,14 @@ describe("documentjs/lib/generators/html/build",function(){
something: {name: "something", title: "<something/>"}
};


Q.all([
return Q.all([
build.renderer(buildTemplatesPromise, options),
build.helpers(buildTemplatesPromise, docMap, options, getCurrent)
]).then(function(results){

var renderer = results[0];

var result = renderer(docObject);

assert.equal(result, "<html><p>This is <a href=\"something.html\" title=\"something\"><something/></a></p>\n\n</html>");
done();
},done).catch(done);
});
});

});
4 changes: 3 additions & 1 deletion build/static_dist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ function addPackages(siteConfig, buildFolder) {
return readFile(path.join(fullBuildFolderPath, "package.json")).then(function(packageContents){
var json = JSON.parse(packageContents);

json = _.merge(json || {}, siteConfig.html.package);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure where ... but it would be good to document that .dependencies overwrites .package.

// Legacy support for dependency injection
json.dependencies = _.assign(json.dependencies || {},siteConfig.html.dependencies);

return writeFile( path.join(fullBuildFolderPath, "package.json"), JSON.stringify(json) ).then(function(){
Expand Down Expand Up @@ -158,7 +160,7 @@ function installPackages(options, buildFolder, distFolder, hash){
if(options.debug) {
console.log("BUILD: Getting build module");
}

var build = require("../site/static/build/"+hash+"/build.js");
return build(options,{
dist: distFolder,
Expand Down
Loading