Skip to content

Commit

Permalink
Merge pull request #113 from kaliberjs/version-update
Browse files Browse the repository at this point in the history
Version update - most imporantly Webpack 4
  • Loading branch information
klaasman committed Apr 18, 2018
2 parents 3f40e91 + 296118b commit b283a95
Show file tree
Hide file tree
Showing 28 changed files with 1,052 additions and 1,228 deletions.
12 changes: 5 additions & 7 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@
"@kaliber/build": "*"
},
"dependencies": {
"express-basic-auth": "^1.1.3",
"firebase": "^4.6.2",
"firebase-admin": "^5.5.1",
"express-basic-auth": "^1.1.4",
"firebase": "^4.12.1",
"firebase-admin": "^5.12.0",
"mjml": "^4.0.3",
"normalize.css": "^7.0.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"normalize.css": "^8.0.0",
"xml": "^1.0.1"
}
}
}
20 changes: 9 additions & 11 deletions example/src/test/test.html.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ import shared from '/partials/shared'
import '/partials/Test?universal'
import SharedComponent from '/partials/SharedComponent?universal'

export default function() {
return (
<html lang='en'>{head('test')}
<body>
{shared}
<SharedComponent />
Test
</body>
</html>
)
}
export default (
<html lang='en'>{head('test')}
<body>
{shared}
<SharedComponent />
Test
</body>
</html>
)
6 changes: 3 additions & 3 deletions library/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

Breaking changes:

- v0.0.51 - `chunk-manifest.json` changed. `*.entry.css` classnames are no longer hashed.
- v0.0.47 - Universal apps no longer have an extra `<div />` around the root-app-node and the script-tag.
- v0.0.44 - `*.entry.css` are now also hashed, use `css-manifest.json` to obtain the names
- v0.0.44 - `*.entry.css` filenames are now also hashed, use `css-manifest.json` to obtain the filenames
- v0.0.41 - `*.*.js` are no longer all treated as templates, by default only `.html.js`, `.txt.js` and `.json.js` are considered
- v0.0.40 - `src` is no longer treated as `node_modules`, use absolute paths (`/x`) to retrieve modules from subdirectories
- v0.0.40 - Javascripts are now hashes, they require an additional import to load
- v0.0.35 - Stylesheets are now hashes, they require an additional import to load


# Kaliber.js build

An opinionated zero configuration build stack with React, PostCSS, Babel and Webpack as major ingredients.
Expand Down Expand Up @@ -74,7 +74,7 @@ Ruby popularized 'convention over configuration', this library has a set of conv
- `src` - Source files live in the `src` directory.
- `target` - Compiled / processed files are stored in the `target` directory.
- `src/**/*.entry.js` - Compiled as a separate `.js` webpack entry.
- `src/**/*.entry.css` - Compiled as a separate `.css` webpack entry, for each CSS file a `.json` file is generated containing the class names.
- `src/**/*.entry.css` - Compiled as a separate `.css` webpack entry (*without* hashed classnames).
- `src/**/*.{type}.js` - Compiled as webpack entry using a renderer associated with the type.
- `{type}` refers to the renderer that is used
- `html` - Expects JSX to be returned from the template
Expand Down
Loading

0 comments on commit b283a95

Please sign in to comment.