Skip to content

Commit

Permalink
Merge pull request #163 from iLib-js/development
Browse files Browse the repository at this point in the history
Merge to master to create bug fix release 14.1.2
  • Loading branch information
ehoogerbeets authored Dec 3, 2018
2 parents 039d8ef + d0875d9 commit 42571a0
Show file tree
Hide file tree
Showing 174 changed files with 856 additions and 9,248 deletions.
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/BUG_REPORT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: 🐛 Bug report
about: File a bug report

---

### Category

[ ] iLib build
[ ] Feature
[ ] Other

### Description
[//]: # (Describe the bug. Explain what happened and what you expected to happen.)

### Environment
[//]: # (Describe the relevant environment, e.g. node/npm version, browser version.)


### Reproduction Code
[//]: # (Provide source code that demonstrates the bug and/or exact steps to reproduce.)

### Comments and Screen Shots
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/FEATURE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: 💭 Feature Request
about: Request a new feature or modification of an existing one

---

### Category

[ ] New component
[ ] New feature for existing component
[ ] Modification of existing component or feature
[ ] New locale
[ ] Other

### Description
[//]: # (Describe the feature and how you expect it to work)

### Alternative Approaches
[//]: # (Are there any other solutions you considered? Why were those not acceptable?)

### Comments

6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/SUPPORT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
name: 😵 Support

---

If you found a :bug:, open a [bug ticket](https://github.com/iLib-js/iLib/issues), instead.
27 changes: 27 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
### Checklist

* [ ] At least one test case is included for this feature or bug fix.
* [ ] `ReleaseNotes` has added or is not needed.
* [ ] This PR has passed all of the test cases on `Nodejs` and `Chrome Browser`.
* [ ] This PR has passed all of the test cases on `QT/QML`.
* [ ] This is an API breaking change.
* [ ] Requires a major version change.


### Issue Resolved / Feature Added
[//]: # (Describe the issue resolved or feature added by this pull request)

### Resolution
[//]: # (Does the code work as intended?)
[//]: # (What is the impact of this change and *why* was it made?)

### Additional Considerations
[//]: # (How should the change be tested?)
[//]: # (Are there any outstanding questions?)
[//]: # (Were any side-effects caused by the change?)


### Comments

### Links
[//]: # (Related issues, references)
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ node_js:
- "6"
- "8"
- "9"
- "10"
env:
- CXX=g++-4.8
before_install:
Expand Down
35 changes: 4 additions & 31 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@

module.exports = function(grunt) {
require('jit-grunt')(grunt, {
replace: 'grunt-text-replace'
});

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
mkdir: {
Expand Down Expand Up @@ -74,14 +78,6 @@ module.exports = function(grunt) {
command: 'cd js; ../node_modules/http-server/bin/http-server -p 9090 -o'
},
run_webpack: {
/*
<arg value="--env.assembly=@{assembly}"/>
<arg value="--env.size=@{size}"/>
<arg value="--env.compilation=@{compilation}"/>
<arg value="--env.locales=@{locales}"/>
<arg value="--env.target=@{target}"/>
<arg value="--env.ilibRoot=${build.base}"/>
*/
command: options => './js/runWebpack.sh ' + options,
}
},
Expand Down Expand Up @@ -176,36 +172,13 @@ module.exports = function(grunt) {
}
}
},
/*'closure-compiler': {
run: {
// Target-specific file lists and/or options go here.
closurePath: 'tools/google-closure-compiler.r20150920',
js: 'js/output/js/full-assembled-uncompiled-web/ilib-full.js',
jsOutputFile: 'js/output/js/full-assembled-uncompiled-web/ilib-full-closure.js',
maxBuffer: 1000,
options: {
compilation_level: 'SIMPLE_OPTIMIZATIONS'
}
},
},*/
watch: {
scripts: {
files: [],
taskes: []
}
}
});
grunt.loadNpmTasks('grunt-mkdir');
grunt.loadNpmTasks('grunt-move');
grunt.loadNpmTasks('grunt-md5sum');
grunt.loadNpmTasks('grunt-shell');
grunt.loadNpmTasks('grunt-text-replace');
grunt.loadNpmTasks('grunt-jsdoc');

grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-contrib-uglify');

grunt.registerTask('build_jsonWork', ['mkdir:prepare', 'replace:pkgVersion','shell:copy_pkgJson','shell:mkli', 'shell:touch_localeinfoStamp', 'shell:compressJson', 'shell:touch_compressJsonStamp', 'shell:gen_manifest_locale']);
grunt.registerTask('build_copyJson', ['mkdir:export', 'copy:export_locale']);
Expand Down
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

version=14.1.1
version=14.1.2
14 changes: 14 additions & 0 deletions docs/ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
Release Notes for Version 14
============================

Build 004
-------
Published as version 14.1.2
* Adopt a `JIT` plugin loader for grunt. Load time of Grunt does not slow down even if there are many plugins. instead of `grunt.loadNpmTasks`.

Bug Fixes:
* Fix a few problems that prevented ilib from running on node version 10. Now version 10 is supported.
* When the Intl object was available and the code extracted the time zone name from it, it used
to overwrite that name with some default data. Now it uses the name properly.
* Fixed some unit tests that were not testing async operation properly.
* Many of the countries of the world were missing data about the correct name of their top-level
administrative regions. These have been filled in now, and the names are returned properly from
AddressFmt.getFormatInfo()

Build 003
-------
Published as version 14.1.1
Expand Down
25 changes: 25 additions & 0 deletions js/data/locale/und/AD/address.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"formats": {
"default": "{streetAddress}\n{postalCode} {locality}\n{country}",
"nocountry": "{streetAddress}\n{postalCode} {locality}"
},

"startAt": "end",
"fields": [
{
"name": "locality",
"line": "last",
"pattern": "([A-zÀÁÂÄÇÈÉÊËÌÍÎÏÒÓÔÙÚÛàáâçèéêëìíîïòóôùúû\\.\\-' ]+)([Cc][Ee][Dd][Ee][Xx]\\s+[0-9]+)?$",
"matchGroup": 1
},
{
"name": "postalCode",
"line": "startAtLast",
"pattern": "[0-9]{5}",
"matchGroup": 0
}
],
"fieldNames": {
"region": "Parish"
}
}
5 changes: 5 additions & 0 deletions js/data/locale/und/AG/address.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"fieldNames": {
"region": "Parish"
}
}
5 changes: 4 additions & 1 deletion js/data/locale/und/AM/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,8 @@
"line": "startAtLast",
"pattern": "[0-9]{4}"
}
]
],
"fieldNames": {
"region": "Oblast"
}
}
2 changes: 1 addition & 1 deletion js/data/locale/und/AU/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@
],
"fieldNames": {
"postalCode": "Post Code",
"region": "State"
"region": "State or Territory"
}
}
5 changes: 5 additions & 0 deletions js/data/locale/und/BB/address.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"fieldNames": {
"region": "Parish"
}
}
5 changes: 5 additions & 0 deletions js/data/locale/und/BD/address.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"fieldNames": {
"region": "Division"
}
}
5 changes: 5 additions & 0 deletions js/data/locale/und/BN/address.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"fieldNames": {
"region": "District"
}
}
5 changes: 5 additions & 0 deletions js/data/locale/und/BS/address.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"fieldNames": {
"region": "District"
}
}
5 changes: 5 additions & 0 deletions js/data/locale/und/BT/address.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"fieldNames": {
"region": "District"
}
}
5 changes: 5 additions & 0 deletions js/data/locale/und/BW/address.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"fieldNames": {
"region": "District"
}
}
5 changes: 5 additions & 0 deletions js/data/locale/und/BZ/address.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"fieldNames": {
"region": "District"
}
}
5 changes: 4 additions & 1 deletion js/data/locale/und/CG/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@
"line": "startAtLast",
"pattern": "([A-zÀÁÈÉÌÍÑÒÓÙÚÜàáèéìíñòóùúü\\.\\-']+)$"
}
]
],
"fieldNames": {
"region": "Department"
}
}
5 changes: 5 additions & 0 deletions js/data/locale/und/DM/address.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"fieldNames": {
"region": "Parish"
}
}
2 changes: 1 addition & 1 deletion js/data/locale/und/EG/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@
}
],
"fieldNames": {
"region": "Governate"
"region": "Governorate"
}
}
5 changes: 5 additions & 0 deletions js/data/locale/und/ER/address.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"fieldNames": {
"region": "Region"
}
}
5 changes: 4 additions & 1 deletion js/data/locale/und/ES/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,5 +158,8 @@
"line": "startAtLast",
"pattern": "[0-9]{5}\\s*-?"
}
]
],
"fieldNames": {
"region": "Autonomous Community"
}
}
5 changes: 4 additions & 1 deletion js/data/locale/und/ET/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,8 @@
"pattern": "(([A-z]+)? ?[A-z]+)$",
"matchGroup": 1
}
]
],
"fieldNames": {
"region": "State"
}
}
5 changes: 4 additions & 1 deletion js/data/locale/und/FI/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@
"line": "last",
"pattern": "(FI-)?[0-9]{5}"
}
]
],
"fieldNames": {
"region": "County"
}
}
1 change: 1 addition & 0 deletions js/data/locale/und/GB/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
}
],
"fieldNames": {
"region": "Region",
"postalCode": "Post Code",
"locality": "Town"
}
Expand Down
5 changes: 5 additions & 0 deletions js/data/locale/und/GD/address.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"fieldNames": {
"region": "Parish"
}
}
5 changes: 4 additions & 1 deletion js/data/locale/und/GE/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,8 @@
}


]
],
"fieldNames": {
"region": "County"
}
}
5 changes: 4 additions & 1 deletion js/data/locale/und/GH/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@
}


]
],
"fieldNames": {
"region": "Region"
}
}
5 changes: 4 additions & 1 deletion js/data/locale/und/GM/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@
"matchGroup": 1
}

]
],
"fieldNames": {
"region": "Region"
}
}
5 changes: 4 additions & 1 deletion js/data/locale/und/GN/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@
"Guinée forestière"
]
}
]
],
"fieldNames": {
"region": "Prefecture"
}
}
5 changes: 4 additions & 1 deletion js/data/locale/und/GR/address.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@
"line": "last",
"pattern": "^[0-9]{3} [0-9]{2}$"
}
]
],
"fieldNames": {
"region": "Region"
}
}
Loading

0 comments on commit 42571a0

Please sign in to comment.