Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: basisjs/basisjs-tools-build
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.12.0
Choose a base ref
...
head repository: basisjs/basisjs-tools-build
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 8 commits
  • 5 files changed
  • 2 contributors

Commits on Nov 8, 2017

  1. typo

    lahmatiy committed Nov 8, 2017
    Copy the full SHA
    ddb6035 View commit details

Commits on Nov 13, 2017

  1. Copy the full SHA
    42be25f View commit details
  2. 1.12.1

    lahmatiy committed Nov 13, 2017
    Copy the full SHA
    4cbc1ad View commit details
  3. Copy the full SHA
    216e207 View commit details

Commits on Dec 22, 2017

  1. Support svg inlining

    smelukov authored Dec 22, 2017
    Copy the full SHA
    da40a20 View commit details

Commits on Jan 16, 2018

  1. Copy the full SHA
    7dec41e View commit details
  2. Copy the full SHA
    0475fbc View commit details
  3. 1.12.2

    lahmatiy committed Jan 16, 2018
    Copy the full SHA
    177018a View commit details
Showing with 16 additions and 12 deletions.
  1. +0 −1 .travis.yml
  2. +10 −1 HISTORY.md
  3. +2 −2 lib/build/res/base64.js
  4. +0 −4 lib/common/files.js
  5. +4 −4 package.json
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -2,5 +2,4 @@ language: node_js
sudo: false
script: "npm run travis"
node_js:
- "0.12"
- "node"
11 changes: 10 additions & 1 deletion HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
## 1.12.2 (January 16, 2018)

- Fixed data URI inlining to inline SVG resouces
- Fixed infinite recursion on CSS minification

## 1.12.1 (November 13, 2017)

- Fixed issue with `mime` that breaks a build

## 1.12.0 (November 8, 2017)

- Replaced `uglify-js` to `uglify-es`
- Added posibility to config JavaScript minifier with `--js-pack-options` CLI option or `jsPackOptions` field in config file
- Added posibility to config JavaScript minifier with `--js-pack-config` CLI option or `jsPackConfig` field in config file
- Fixed exception handling when command run in child process and exception is connected with dependencies
- Update dependencies

4 changes: 2 additions & 2 deletions lib/build/res/base64.js
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ function unsupportedLink(link){

for (var i = flow.files.queue.length - 1, file; file = flow.files.queue[i]; i--)
{
if (file.type == 'image')
if (file.type == 'image' || file.type == 'svg')
{
fconsole.start(file.relpath);

@@ -35,7 +35,7 @@ function unsupportedLink(link){
//

var fileBase64Content = new Buffer(file.content, 'binary').toString('base64');
var mimeType = mime.lookup(file.relpath);
var mimeType = mime.getType(file.relpath);

// replace refences
fconsole.start('Replace references in css');
4 changes: 0 additions & 4 deletions lib/common/files.js
Original file line number Diff line number Diff line change
@@ -173,10 +173,6 @@ File.prototype = {

if (token)
{
if (!token.links)
token.links = [];
token.links.push(link);

if (file.warn)
{
var loc = token.loc || '';
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "basisjs-tools-build",
"title": "Basis.js build tools",
"version": "1.12.0",
"version": "1.12.2",
"homepage": "https://github.com/basisjs/basisjs-tools",
"description": "Build tools for basis.js framework",
"author": "Roman Dvornov <rdvornov@gmail.com>",
@@ -38,17 +38,17 @@
"travis": "npm run lint-and-test"
},
"dependencies": {
"basisjs-tools-ast": "~1.6.0",
"basisjs-tools-ast": "~1.6.1",
"basisjs-tools-config": "~1.1.0",
"chalk": "^2.3.0",
"clap": "^1.2.3",
"es6-promise-polyfill": "^1.2.0",
"fixed-width-string": "^1.0.0",
"mime": "~2.0.3",
"mime": "^2.0.5",
"minimatch": "^3.0.2",
"resolve": "^1.1.7",
"seedrandom": "~2.4.2",
"uglify-es": "~3.1.8"
"uglify-es": "^3.1.10"
},
"devDependencies": {
"eslint": "^2.2.0",