Permalink
Browse files

Refactored how nested and wildcard bundles are fetched. Fixes #28

  • Loading branch information...
1 parent 1ba3d30 commit 4e3db7d7d9f624fd29ce51e57a4b06ba6459e778 @laktek committed Sep 30, 2012
View
@@ -4,35 +4,35 @@
2. Clone the forked repository:
- `git clone git@github.com:YOUR_USER/punch.git && cd punch`
+ git clone git@github.com:YOUR_USER/punch.git && cd punch
3. Install the development version of the package, along with the dependencies.
- `npm link`
+ npm link
4. Verify existing tests pass:
- `npm test`
+ npm test
5. Read the [Code Style Guide](https://github.com/laktek/punch/wiki/Code-Style-Guide).
6. Create a topic branch:
- `git checkout -b feature`
+ git checkout -b feature
7. **Make your changes.** (It helps a lot if you write tests first.)
8. Verify that tests still pass:
- `npm spec`
+ npm spec
9. Run JSHint to make sure you're code didn't introduce any inconsistencies:
- `jshint lib/*`
+ jshint lib/*
10. Push the changes to your fork:
- `git push -u YOUR_USER feature`
+ git push -u YOUR_USER feature
11. Send a [pull request](https://github.com/laktek/punch/pulls) describing your changes.
View
@@ -18,10 +18,14 @@
},
"bundles" : {
+ "/assets/page.js": [
+ "/assets/js/site.js",
+ "/assets/js/sample.coffee"
+ ],
+
"/assets/all.js" : [
"/assets/js/jquery.1.8.js",
- "/assets/js/site.js",
- "/assets/js/sample.coffee"
+ "/assets/page.js"
],
"/assets/all.css" : [
View
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en-US">
-<head>
- <title>About Page</title>
- <link rel="stylesheet" type="text/css" media="screen" href="/assets/all.css">
-</head>
-
-<body>
-
-
- <p>This is the main layout</p>
- <h1>About Page</h1>
-
- <p>
- About Body content.
- </p>
-
- <p>This is a global value, which is available to all pages</p>
-
- <script src="/assets/all.js"></script>
-</body>
-</html>

Large diffs are not rendered by default.

Oops, something went wrong.
Deleted file not rendered

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,10 +0,0 @@
-(function() {
- var square;
-
- square = function(x) {
- return x * x;
- };
-
- $("body").append("<p>Added from CoffeeScript - " + (square(2)) + "<p>");
-
-}).call(this);
@@ -1,2 +0,0 @@
-$("body").append("Added from site JS");
-
Oops, something went wrong.

0 comments on commit 4e3db7d

Please sign in to comment.