Skip to content

Commit c5e70e3

Browse files
committed
Upgrade bit-docs to steal 1.x
- Upgraded steal to 1.x - Added package override feature Closes #11
1 parent 11f558c commit c5e70e3

File tree

7 files changed

+10
-20
lines changed

7 files changed

+10
-20
lines changed

.DS_Store

-6 KB
Binary file not shown.

.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

.vscode/launch.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

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.steal = _.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,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"lodash": "~4.13.1",
3434
"md5": "2.1.0",
3535
"q": "^1.5.0",
36-
"steal-tools": "1.X",
36+
"steal-tools": "^1.8.0",
3737
"striptags": "^2.1.1",
3838
"unescape-html": "^1.0.0"
3939
},

site/default/static/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module.exports = function(options, folders){
4444
if(options.debug) {
4545
console.log("BUILD: Copying build to dist.");
4646
}
47-
47+
4848
staticDistPromises.push(fsx.copy(path.join(folders.build, "dist"), path.join(folders.dist)));
4949

5050
return Q.all(staticDistPromises);

site/default/static/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"author": "Bitovi",
1515
"license": "MIT",
1616
"dependencies": {
17-
"steal": "1.X",
18-
"steal-less": "1.X"
17+
"steal-less": "^1.2.0",
18+
"steal-tools": "^1.8.0"
1919
}
2020
}

0 commit comments

Comments
 (0)