Released version 4.1.3, fixes for browserify

This commit is contained in:
jos 2015-03-17 20:25:50 +01:00
parent 6310063494
commit 053f4f5113
9 changed files with 1173 additions and 1477 deletions

View File

@ -3,6 +3,12 @@
https://github.com/josdejong/jsoneditor https://github.com/josdejong/jsoneditor
## 2015-03-17, version 4.1.3
- Fixed broken bundling with browserify: the `jsonlint` package was requiring
missing dependencies.
## 2015-03-15, version 4.1.2 ## 2015-03-15, version 4.1.2
- Fixed broken bower package 4.1.1. - Fixed broken bower package 4.1.1.

View File

@ -125,12 +125,12 @@ jsoneditor:
The source code of JSONEditor consists of CommonJS modules. To create a custom The source code of JSONEditor consists of CommonJS modules. To create a custom
bundle of the source code, [browserify](http://browserify.org/) can be used: bundle of the source code, [browserify](http://browserify.org/) can be used:
browserify ./index.js -o ./jsoneditor.custom.js -s JSONEditor --ignore-missing browserify ./index.js -o ./jsoneditor.custom.js -s JSONEditor
The Ace editor, used in mode `code`, accounts for about 75% of the total The Ace editor, used in mode `code`, accounts for about 75% of the total
size of the library. To exclude the Ace editor from the bundle: size of the library. To exclude the Ace editor from the bundle:
browserify ./index.js -o ./jsoneditor.custom.js -s JSONEditor --ignore-missing -x brace -x brace/mode/json -x brace/ext/searchbox browserify ./index.js -o ./jsoneditor.custom.js -s JSONEditor -x brace -x brace/mode/json -x brace/ext/searchbox
To minify the generated bundle, use [uglifyjs](https://github.com/mishoo/UglifyJS2): To minify the generated bundle, use [uglifyjs](https://github.com/mishoo/UglifyJS2):

View File

@ -1,6 +1,6 @@
{ {
"name": "jsoneditor", "name": "jsoneditor",
"version": "4.1.2", "version": "4.1.3",
"description": "A web-based tool to view, edit and format JSON", "description": "A web-based tool to view, edit and format JSON",
"tags": [ "tags": [
"json", "json",

2582
dist/jsoneditor.js vendored

File diff suppressed because one or more lines are too long

2
dist/jsoneditor.map vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{ {
"name": "jsoneditor", "name": "jsoneditor",
"version": "4.1.2", "version": "4.1.3",
"main": "./index", "main": "./index",
"description": "A web-based tool to view, edit and format JSON", "description": "A web-based tool to view, edit and format JSON",
"tags": [ "tags": [
@ -22,7 +22,7 @@
}, },
"dependencies": { "dependencies": {
"brace": "^0.4.1", "brace": "^0.4.1",
"jsonlint": "^1.6.2" "jsonlint": "josdejong/jsonlint#fb47330"
}, },
"devDependencies": { "devDependencies": {
"gulp": "^3.8.11", "gulp": "^3.8.11",

9
src/js/ace/index.js Normal file
View File

@ -0,0 +1,9 @@
// load brace
var ace = require('brace');
// load required ace modules
require('brace/mode/json');
require('brace/ext/searchbox');
require('./theme-jsoneditor');
module.exports = ace;

View File

@ -1,9 +1,6 @@
var ace; var ace;
try { try {
ace = require('brace'); ace = require('./ace');
require('brace/mode/json');
require('brace/ext/searchbox');
require('./ace/theme-jsoneditor');
} }
catch (err) { catch (err) {
// failed to load ace, no problem, we will fall back to plain text // failed to load ace, no problem, we will fall back to plain text