Skip to content

Commit

Permalink
Merge branch 'release/0.3.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
mathiasrw committed Jan 23, 2017
2 parents 03fa7c0 + a76e963 commit 544d20b
Show file tree
Hide file tree
Showing 16 changed files with 388 additions and 361 deletions.
12 changes: 9 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
# Changelog

_0.3.6 "???" (xx.01.2017)_
_0.3.7 "Niau" (xx.02.2017)_

* ...



### 0.3.6 "Hipu" (24.01.2017)

* Addded: Support for "use strict"
* Update: Better and faster deep compare of objects
* Fix: Select.toString() had bugs



### 0.3.5 "Maiao" (22.12.2016)
* Added: Import data through AngularJS controllers
Expand Down
33 changes: 31 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,13 @@ Here's a list of modules that alasql requires
#### Webpack
Use the built-in IgnorePlugin
There are several ways to handled alasql with webpack
##### IgnorePlugin
Ideal when you want to control which modules you want to import.
```js
var IgnorePlugin = require("webpack").IgnorePlugin;
Expand All @@ -541,6 +547,29 @@ module.exports = {
};
```
##### module.noParse
As of alasql 0.3.5, you can simply tell webpack not to parse alasql, which avoids all the dynamic require warnings and avoids using eval/clashing with CSP with script-loader.
[Read the webpack docs about noParse](https://webpack.github.io/docs/configuration.html#module-noparse)
```js
...
//Don't parse alasql
{module:noParse:[/alasql/]}
```
##### script-loader
If both of the solutions above fail to meet your requirements, you can load alasql with [script-loader](https://github.com/webpack/script-loader).
```js
//Load alasql in the global scope with script-loader
import "script!alasql"
```
This can cause issues if you have a CSP that doesn't allow eval.
#### Browserify
Read up on [excluding](https://github.com/substack/browserify-handbook#excluding), [ignoring](https://github.com/substack/browserify-handbook#ignoring), and [shimming](https://github.com/substack/browserify-handbook#shimming)
Expand Down Expand Up @@ -667,4 +696,4 @@ and other people for useful tools, which make our work much easier.
----
<a href="http://alasql.org"><img src="https://cloud.githubusercontent.com/assets/1063454/14003946/d6e5c076-f156-11e5-8238-e62d2a8d20dc.png" align="right" alt="AlaSQL logo"/></a>
© 2014-2016, Andrey Gershun ([email protected]) & M. Rangel Wulff ([email protected])
© 2014-2016, Andrey Gershun ([email protected]) & M. Rangel Wulff ([email protected])
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@
"bin",
"lib"
],
"version": "0.3.5"
"version": "0.3.6"
}
4 changes: 2 additions & 2 deletions dist/alasql-worker.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! AlaSQL v0.3.5 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT
//! AlaSQL v0.3.6 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT
/*
@module alasql
@version 0.3.5
@version 0.3.6
AlaSQL - JavaScript SQL database
© 2014-2016 Andrey Gershun & Mathias Rangel Wulff
Expand Down
2 changes: 1 addition & 1 deletion dist/alasql-worker.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 544d20b

Please sign in to comment.