Merge pull request #290 from bitovi/default-steal

Remove custom steal build setup
bitovi · Jun 28, 2018 · ed9a105 · ed9a105
2 parents 2a74c38 + fda0f8a
commit ed9a105
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 34 deletions.
diff --git a/lib/configured/configured_test.js b/lib/configured/configured_test.js
@@ -63,7 +63,7 @@ describe("lib/configured", function() {
 			});
 	});
 
-	it(".geneateProject is able to read the documentjs.json without versions and build a site", function() {
+	it(".generateProject is able to read the documentjs.json without versions and build a site", function() {
 		return rmdir(path.join(__dirname, "test", "api"))
 			.then(function() {
 				return configured.generateProject({
@@ -77,7 +77,7 @@ describe("lib/configured", function() {
 			});
 	});
 
-	it(".geneateProject is able to take a docObject instead of reading one", function() {
+	it(".generateProject is able to take a docObject instead of reading one", function() {
 		return rmdir(path.join(tmpPath, "example_project"))
 			.then(function() {
 				return configured.generateProject({

diff --git a/lib/generators/html/build/make_package_json.js b/lib/generators/html/build/make_package_json.js
@@ -3,8 +3,12 @@ module.exports = function makePackageJson(options) {
 		name: "docs",
 		version: "1.0.0",
 		main: "static.js",
-		system: {
+		steal: {
 			npmAlgorithm: "flat",
+			plugins: [
+				"steal-less",
+				"steal-stache"
+			],
 			meta: {
 				jquery: {
 					exports: "jQuery"
@@ -17,10 +21,11 @@ module.exports = function makePackageJson(options) {
 			"can-map": "^3.0.7",
 			"can-stache": "^3.0.24",
 			"can-util": "^3.6.1",
-			jquery: "~1.11.0",
-			steal: "0.16.X",
-			"steal-stache": "^3.0.7",
-			"steal-tools": "0.16.X"
+			"jquery": "~1.11.0",
+			"steal": "^1.12.3",
+			"steal-less": "^1.3.1",
+			"steal-stache": "^3.1.3",
+			"steal-tools": "^1.11.9",
 		}
 	};
 };
diff --git a/lib/generators/html/write/static_dist.js b/lib/generators/html/write/static_dist.js
@@ -23,9 +23,7 @@ var fss = require("../../../fs_extras.js"),
  */
 module.exports = function(options) {
 	var source = path.join("site", "static", "dist", buildHash(options));
-	var dest = options.devBuild
-		? options.dest
-		: path.join(options.dest, "static");
+	var dest = options.dest;
 
 	return mkdirs(dest).then(function() {
 		if (options.debug) {

diff --git a/package.json b/package.json
@@ -31,9 +31,10 @@
     "mocha": "^5.2.0",
     "qunit-mocha-ui": "*",
     "rimraf": "2.1",
-    "steal": "0.16.X",
-    "steal-stache": "^3.0.7",
-    "steal-tools": "0.16.X",
+    "steal": "^1.12.3",
+    "steal-less": "^1.3.1",
+    "steal-stache": "^3.1.3",
+    "steal-tools": "^1.11.9",
     "zombie": "^4.2.1"
   },
   "dependencies": {

diff --git a/site/default/static/build.js b/site/default/static/build.js
@@ -26,8 +26,7 @@ module.exports = function(options, folders) {
 			.build(
 				{
 					main: "static",
-					config: path.join(__dirname, "package.json!npm"),
-					bundlesPath: path.join(__dirname, "bundles")
+					config: path.join(__dirname, "package.json!npm")
 				},
 				{
 					minify: options.minifyBuild === false ? false : true,
@@ -42,21 +41,9 @@ module.exports = function(options, folders) {
 
 				// copy everything to DIST
 				return Q.all([
-					fsExtras
-						.mkdirs(path.join(folders.dist, "bundles"))
-						.then(function() {
-							return fsExtras.copy(
-								path.join(folders.build, "bundles"),
-								path.join(folders.dist, "bundles")
-							);
-						}),
-					fsExtras.copyFrom(
-						path.join(
-							require.resolve("steal"),
-							"..",
-							"steal.production.js"
-						),
-						path.join(folders.dist, "steal.production.js")
+					fsExtras.copy(
+						path.join(folders.build, "dist"),
+						path.join(folders.dist, "dist")
 					),
 					fsExtras.copy(
 						path.join(folders.build, "package.json"),

diff --git a/site/default/templates/layout.mustache b/site/default/templates/layout.mustache
@@ -22,7 +22,7 @@
 	<meta name="description" content="">
 	<meta name="author" content="">
 	{{^devBuild}}
-		<link rel="stylesheet" type="text/css" href="./static/bundles/static.css">
+		<link rel="stylesheet" type="text/css" href="./dist/bundles/static.css">
 	{{/devBuild}}
 	<!--[if lt IE 9]>
 	<script type="text/javascript" src="static/html5shiv.js"></script>
@@ -85,9 +85,7 @@
 		</script>
 		<script type="text/javascript"
 				data-main="static"
-				data-config="package.json!npm"
-				data-bundles-path="./static/bundles"
-				src="./static/steal.production.js">
+				src="./dist/steal.production.js">
 		</script>
 	{{/if}}
 </body>