Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
efe1bd7
Generate and use source maps for debugging uglified code
ehoogerbeets Oct 25, 2018
bf67dbd
Fix the version check unit test
ehoogerbeets Oct 26, 2018
5d2017c
Generate and use source maps for debugging uglified code
ehoogerbeets Oct 25, 2018
79c74e6
Fix the version check unit test
ehoogerbeets Oct 26, 2018
98556dc
Increase the js heap space so travis doesn't puke when running webpack
ehoogerbeets Oct 26, 2018
60f92ed
Increase the java heap space even more
ehoogerbeets Oct 26, 2018
65aefcb
Use the heap size in the build.xml instead of the travis yml
ehoogerbeets Oct 26, 2018
d8d4348
Merge branch 'debugMode' of github.com:iLib-js/iLib into debugMode
ehoogerbeets Oct 11, 2019
8d967e0
Merge branch 'development' into debugMode
ehoogerbeets Oct 11, 2019
6ec5c37
Fixed some merge problems
ehoogerbeets Oct 11, 2019
a14c053
Try using base or url with uglify
ehoogerbeets Oct 15, 2019
578c39b
Merge branch 'development' into debugMode
ehoogerbeets Nov 7, 2019
c2b73be
Try using uglify-js2 instead
ehoogerbeets Nov 7, 2019
d0b454d
Revert a file that was accidentally compressed
ehoogerbeets Nov 11, 2019
3e95323
Closer to getting uglify/source maps working
ehoogerbeets Nov 12, 2019
65729f9
Got the source map output correct with grunt
ehoogerbeets Nov 13, 2019
77503ff
Modify the dist target to place things in the right place
ehoogerbeets Nov 13, 2019
abd7aa7
Merge branch 'debugMode' of github.com:iLib-js/iLib into debugMode
ehoogerbeets Nov 13, 2019
6e6e770
Don't need to copy the src dir separately
ehoogerbeets Nov 13, 2019
6dfad84
Some clean-up
ehoogerbeets Nov 26, 2019
438fd76
Merge branch 'debugMode' of github.com:iLib-js/iLib into debugMode
ehoogerbeets Nov 26, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ install:
- rm -rf node_modules
- npm install
- export PATH=$PWD/node_modules/.bin:$PATH
- export NODE_OPTIONS="--max-old-space-size=3072"
- export NODE_OPTIONS="--max-old-space-size=4096"
- export TZ=America/Los_Angeles
script:
# [Error] module QtQuick is not installed
Expand Down
1 change: 1 addition & 0 deletions docs/ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ part of the locale specifier if it has a very common/default value
* For languages that are written in multiple scripts, but where one is dominant, the script is only included when it is not the default/dominant one
* Most languages are only ever written in one script, so the script is left out
* Updated the script info to UCD 12.0.0, and the likely locale info to CLDR 35.1
* Added source maps to the npm package so that you can debug into the original ilib code easily

Bug Fixes:
* Fixed unit test failures which occur on QT 5.12
Expand Down
126 changes: 126 additions & 0 deletions js/Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
/**
* Gruntfile.js - build the ilib javascript project
*
* @license
* Copyright © 2019, JEDLSoft
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
*
* See the License for the specific language governing permissions and
* limitations under the License.
*/

module.exports = function(grunt) {
require('load-grunt-tasks')(grunt);

// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
mkdir: {
prepare: {
options: {
create: [
'locale',
'output',
'output/reports',
'output/js',
'output/dyncode',
'output/dyncode/lib',
'output/dyncode/src/lib',
'output/test',
'output/jsdoc'
]
}
}
},
copy: {
src: {
files: [{
cwd:"lib",
src: [
"**/*.js",
"!**/ilib.js",
'!**/ilib-*.js',
'!externs.js',
'!datefmtstr.js',
'!ilib-stubs*',
"!**/metafiles/*"
],
dest: 'output/dyncode/src/lib',
expand: true
},{
cwd:"lib",
src: [
"ilib-node*",
"ilib-qt*",
"ilib-webpack*",
"ilib-unpack.js",
"ilib-web.js"
],
dest: 'output/dyncode/src/lib',
expand: true
},{
src: [
"index.js"
],
dest: 'output/dyncode/src',
expand: true
}]
}
},
replace: {
version: {
src: [
"lib/ilib.js"
],
dest: "output/dyncode/src/lib/ilib.js",
replacements: [{
from: '// !macro ilibVersion',
to: '"<%= pkg.version %>"'
}]
}
},
uglify: {
lib: {
options: {
banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n',
mangle: false,
sourceMap: true,
output: {
comments: "/(\!data|\!loadLocaleData|\!defineLocaleData|\!macro|eslint-)/"
}
},
files: [{
expand: true,
cwd: 'output/dyncode/src',
src: [
'**/*.js'
],
dest: 'output/dyncode'
}]
}
},
clean: {
dist: ['lib']
}
});

// Load the plugin that provides the "uglify" task.
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-mkdir');

// Default task(s).
// grunt.registerTask('default', ['uglify']);
// grunt.registerMultiTask('mkdir', ['mkdir']);
// grunt.registerMultiTask('copy', ['copy']);
grunt.registerTask('uglifypkg', ['mkdir:prepare', 'copy:src', 'replace:version', 'uglify:lib']);
};
1 change: 1 addition & 0 deletions js/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ CLOSURECOMP=${basedir}/../tools/google-closure-compiler.r20150920
WEBPACKDIR=${basedir}/../node_modules/webpack
uglify.location=${basedir}/../node_modules/uglify-js
webpack.command=${basedir}/../node_modules/.bin/webpack
webpack.heap.size=4096
Loading