From ecd7f728691473b9c54948191256eab02824f07f Mon Sep 17 00:00:00 2001 From: "Portugal, Marcelo" Date: Mon, 27 Mar 2017 11:14:06 -0400 Subject: [PATCH 1/8] chore(Sauce_Connect): Updating scripts that connect to sauce labs. --- .travis.yml | 1 + lib/grunt/utils.js | 24 ++++++++++++------------ lib/sauce/sauce_connect_block.sh | 2 +- lib/sauce/sauce_connect_setup.sh | 14 +++++++------- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5d1eac69f..b7bfabdb0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,4 +62,5 @@ after_failure: - ./travis_print_logs.sh after_script: + - killall -9 sc - ./travis_print_logs.sh diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js index 1200b7eb23..cdbd8e71fc 100644 --- a/lib/grunt/utils.js +++ b/lib/grunt/utils.js @@ -126,18 +126,18 @@ var util = module.exports = { platform: 'Windows 8.1', version: '11' }, - 'SL_Android_4': { - base: 'SauceLabs', - browserName: 'android', - platform: 'Linux', - version: '4.0' - }, - 'SL_Android_4.3': { - base: 'SauceLabs', - browserName: 'android', - platform: 'Linux', - version: '4.3' - }, + // 'SL_Android_4': { + // base: 'SauceLabs', + // browserName: 'android', + // platform: 'Linux', + // version: '4.0' + // }, + // 'SL_Android_4.3': { + // base: 'SauceLabs', + // browserName: 'android', + // platform: 'Linux', + // version: '4.3' + // }, 'SL_Linux_Opera': { base: 'SauceLabs', browserName: 'opera', diff --git a/lib/sauce/sauce_connect_block.sh b/lib/sauce/sauce_connect_block.sh index 5504d91349..914158fb9c 100644 --- a/lib/sauce/sauce_connect_block.sh +++ b/lib/sauce/sauce_connect_block.sh @@ -6,4 +6,4 @@ then while [ ! -f $SAUCE_CONNECT_READY_FILE ]; do sleep .5 done -fi \ No newline at end of file +fi diff --git a/lib/sauce/sauce_connect_setup.sh b/lib/sauce/sauce_connect_setup.sh index 7c8b16cdf6..767fe27947 100644 --- a/lib/sauce/sauce_connect_setup.sh +++ b/lib/sauce/sauce_connect_setup.sh @@ -12,15 +12,15 @@ set -e # before_script: # - curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash -# Skip this if we're un a pull request, we won't be able to connect +# Skip this if we're on a pull request, we won't be able to connect if [ $TRAVIS_PULL_REQUEST != "false" ] then exit 0 fi -CONNECT_URL="http://saucelabs.com/downloads/Sauce-Connect-latest.zip" +CONNECT_URL="https://saucelabs.com/downloads/sc-4.4.5-linux.tar.gz" CONNECT_DIR="/tmp/sauce-connect-$RANDOM" -CONNECT_DOWNLOAD="Sauce_Connect.zip" +CONNECT_DOWNLOAD="sc-4.4.5-linux.tar.gz" if [ -z "$LOGS_DIR" ] then @@ -35,8 +35,8 @@ CONNECT_STDERR="$LOGS_DIR/sauce-connect.stderr" # Get Connect and start it mkdir -p $CONNECT_DIR cd $CONNECT_DIR -curl $CONNECT_URL -o $CONNECT_DOWNLOAD 2> /dev/null 1> /dev/null -unzip $CONNECT_DOWNLOAD > /dev/null +wget $CONNECT_URL 1> /dev/null +tar -xvzf $CONNECT_DOWNLOAD --strip 1 rm $CONNECT_DOWNLOAD # Don't think we need this with a secure env var @@ -58,5 +58,5 @@ echo "Starting Sauce Connect in the background, logging into:" echo " $CONNECT_LOG" echo " $CONNECT_STDOUT" echo " $CONNECT_STDERR" -java -jar Sauce-Connect.jar $ARGS $SAUCE_USERNAME $SAUCE_ACCESS_KEY \ - --logfile $CONNECT_LOG 2> $CONNECT_STDERR 1> $CONNECT_STDOUT & \ No newline at end of file +./bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS \ + --logfile $CONNECT_LOG & From ed58ebbff5161caedbf621fa751e814ad4be3e9e Mon Sep 17 00:00:00 2001 From: Marcelo Sauerbrunn Portugal Date: Mon, 27 Mar 2017 11:26:18 -0700 Subject: [PATCH 2/8] fix(6017): Fixes ui-grid-viewport scroll issue in chrome v56 (#6125) Chrome v56 introduced a new feature called "scroll anchoring" which causes the scroll position to update if element content above the current scroll position has changed. Since ui-grid-viewport updates the margin of the first line whenever a user is scrolling, scroll anchoring will cause it to get into a scroll loop and scroll indefinitely (i.e. scroll to the end of the grid). Credit to @Joel-Kornbluh --- src/less/body.less | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/less/body.less b/src/less/body.less index 264ed90420..8d943a377b 100644 --- a/src/less/body.less +++ b/src/less/body.less @@ -18,6 +18,10 @@ overflow-y: scroll; -webkit-overflow-scrolling: touch; + // overflow-anchor is a new feature/bug in chrome 56. See https://www.chromestatus.com/feature/5700102471548928 + // It causes ui-grid-viewport to scroll indefinitely. See https://github.com/angular-ui/ui-grid/issues/6017 + overflow-anchor: none; + &:focus { outline: none !important; } @@ -73,4 +77,4 @@ right: 0; opacity: 0.66; } -} \ No newline at end of file +} From 46ac29221e1cde15cbaf70d63c1ab90aada7cc98 Mon Sep 17 00:00:00 2001 From: "Portugal, Marcelo" Date: Mon, 27 Mar 2017 14:41:54 -0400 Subject: [PATCH 3/8] chore(karma.sauce): Adding better logging for karma sauce. --- lib/grunt/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js index cdbd8e71fc..9e953f6039 100644 --- a/lib/grunt/utils.js +++ b/lib/grunt/utils.js @@ -261,7 +261,7 @@ var util = module.exports = { background: false, singleRun: true, // reporters: ['saucelabs', 'coverage'], - reporters: ['saucelabs'], + reporters: ['dots', 'saucelabs'], browsers: c // preprocessors: { // 'src/**/!(*.spec)+(.js)': ['coverage'] From f81e888a0b157d9760a7e7272304c6f383139c8a Mon Sep 17 00:00:00 2001 From: "Portugal, Marcelo" Date: Mon, 27 Mar 2017 15:39:55 -0400 Subject: [PATCH 4/8] chore(dev_flow): Synchronizing dev flow with master branch. --- grunt/aliases.js | 6 +- grunt/copy.js | 56 ++++++++++++++ grunt/cut-release.js | 1 + grunt/font-config.json | 148 +++++++++++++++++++++++++++++++++++++ grunt/fontello.js | 11 ++- grunt/shell.js | 60 ++++++++------- package.json | 16 ++-- src/font/config.json | 148 ------------------------------------- src/font/fontello.eot | Bin 0 -> 10336 bytes src/font/fontello.svg | 56 ++++++++++++++ src/font/fontello.ttf | Bin 0 -> 10168 bytes src/font/fontello.woff | Bin 0 -> 5720 bytes src/font/fontello.woff2 | Bin 0 -> 4844 bytes test/protractor.ci.conf.js | 4 +- test/protractor.conf.js | 2 +- 15 files changed, 322 insertions(+), 186 deletions(-) create mode 100644 grunt/font-config.json delete mode 100644 src/font/config.json create mode 100644 src/font/fontello.eot create mode 100644 src/font/fontello.svg create mode 100644 src/font/fontello.ttf create mode 100644 src/font/fontello.woff create mode 100644 src/font/fontello.woff2 diff --git a/grunt/aliases.js b/grunt/aliases.js index e927f7ce68..e1c1e4b6a7 100644 --- a/grunt/aliases.js +++ b/grunt/aliases.js @@ -10,7 +10,7 @@ module.exports = function (grunt, options) { 'default': ['before-test', 'test:single', 'after-test'], // Build with no testing - 'build': ['ngtemplates', 'concat', 'uglify', 'fontello', 'less', 'ngdocs', 'copy:site', 'copy:less_customizer',], + 'build': ['ngtemplates', 'concat', 'uglify', 'less', 'ngdocs', 'copy:font_dist', 'copy:site', 'copy:less_customizer',], // Auto-test tasks for development 'autotest:unit': ['karmangular:start'], @@ -53,10 +53,10 @@ module.exports = function (grunt, options) { var currentTag = semver.clean( util.getCurrentTag() ); if (currentTag) { - baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish']; + baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'update-bower-json', 'gh-pages:bower', 'npm-publish']; } else { - baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'gh-pages:ui-grid-site']; + baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release']; } return baseTasks; diff --git a/grunt/copy.js b/grunt/copy.js index 7a895f1898..9e4c68a15f 100644 --- a/grunt/copy.js +++ b/grunt/copy.js @@ -18,6 +18,62 @@ module.exports = function ( grunt ) { } ] }, + font_dist: { + files: [ + { + expand: true, + cwd: 'src/font', + src: '**/*.eot', + dest: '<%= dist %>/release/' + }, + { + expand: true, + cwd: 'src/font', + src: '**/*.svg', + dest: '<%= dist %>/release/' + }, + { + expand: true, + cwd: 'src/font', + src: '**/*.ttf', + dest: '<%= dist %>/release/' + }, + { + expand: true, + cwd: 'src/font', + src: '**/*.woff', + dest: '<%= dist %>/release/' + } + ] + }, + font_cut_release: { + files: [ + { + expand: true, + cwd: '<%= dist %>/release/', + src: '**/*.eot', + dest: '<%= dist %>/release/' + currentTag + }, + { + expand: true, + cwd: '<%= dist %>/release/', + src: '**/*.svg', + dest: '<%= dist %>/release/' + currentTag + }, + { + expand: true, + cwd: '<%= dist %>/release/', + src: '**/*.ttf', + dest: '<%= dist %>/release/' + currentTag + }, + { + expand: true, + cwd: '<%= dist %>/release/', + src: '**/*.woff', + dest: '<%= dist %>/release/' + currentTag + } + ] + }, less_customizer: { files: [ { diff --git a/grunt/cut-release.js b/grunt/cut-release.js index 9cef2bc545..016b7348eb 100644 --- a/grunt/cut-release.js +++ b/grunt/cut-release.js @@ -3,6 +3,7 @@ module.exports = { cleanup: true, keepUnstable: false, stableTasks: [ + 'copy:font_cut_release', 'copy:less_cut_release' ] }, diff --git a/grunt/font-config.json b/grunt/font-config.json new file mode 100644 index 0000000000..864006b576 --- /dev/null +++ b/grunt/font-config.json @@ -0,0 +1,148 @@ +{ + "name": "29f50de8e70e0efa40c762200582c08b", + "css_prefix_text": "ui-grid-icon-", + "css_use_suffix": false, + "hinting": true, + "units_per_em": 1000, + "ascent": 850, + "glyphs": [ + { + "uid": "5d2d07f112b8de19f2c0dbfec3e42c05", + "css": "spin5", + "code": 60001, + "src": "fontelico" + }, + { + "uid": "9dd9e835aebe1060ba7190ad2b2ed951", + "css": "search", + "code": 50002, + "src": "fontawesome" + }, + { + "uid": "12f4ece88e46abd864e40b35e05b11cd", + "css": "ok", + "code": 50018, + "src": "fontawesome" + }, + { + "uid": "5211af474d3a9848f67f945e2ccaf143", + "css": "cancel", + "code": 50003, + "src": "fontawesome" + }, + { + "uid": "1a5cfa186647e8c929c2b17b9fc4dac1", + "css": "plus-squared", + "code": 50000, + "src": "fontawesome" + }, + { + "uid": "f755a58fb985eeb70bd47d9b31892a34", + "css": "minus-squared", + "code": 50001, + "src": "fontawesome" + }, + { + "uid": "e82cedfa1d5f15b00c5a81c9bd731ea2", + "css": "info-circled", + "code": 50004, + "src": "fontawesome" + }, + { + "uid": "c1f1975c885aa9f3dad7810c53b82074", + "css": "lock", + "code": 50005, + "src": "fontawesome" + }, + { + "uid": "657ab647f6248a6b57a5b893beaf35a9", + "css": "lock-open", + "code": 50006, + "src": "fontawesome" + }, + { + "uid": "d35a1d35efeb784d1dc9ac18b9b6c2b6", + "css": "pencil", + "code": 50007, + "src": "fontawesome" + }, + { + "uid": "559647a6f430b3aeadbecd67194451dd", + "css": "menu", + "code": 50019, + "src": "fontawesome" + }, + { + "uid": "2d6150442079cbda7df64522dc24f482", + "css": "down-dir", + "code": 50008, + "src": "fontawesome" + }, + { + "uid": "80cd1022bd9ea151d554bec1fa05f2de", + "css": "up-dir", + "code": 50009, + "src": "fontawesome" + }, + { + "uid": "9dc654095085167524602c9acc0c5570", + "css": "left-dir", + "code": 50010, + "src": "fontawesome" + }, + { + "uid": "fb1c799ffe5bf8fb7f8bcb647c8fe9e6", + "css": "right-dir", + "code": 50011, + "src": "fontawesome" + }, + { + "uid": "d870630ff8f81e6de3958ecaeac532f2", + "css": "left-open", + "code": 50012, + "src": "fontawesome" + }, + { + "uid": "399ef63b1e23ab1b761dfbb5591fa4da", + "css": "right-open", + "code": 50013, + "src": "fontawesome" + }, + { + "uid": "e4dde1992f787163e2e2b534b8c8067d", + "css": "angle-down", + "code": 50014, + "src": "fontawesome" + }, + { + "uid": "594e9271c08ff732c04b3bf3117b9040", + "css": "indent-left", + "code": 59392, + "src": "fontawesome" + }, + { + "uid": "4d2dfc45d8176b1f26aed973fa84a91e", + "css": "indent-right", + "code": 59393, + "src": "fontawesome" + }, + { + "uid": "4109c474ff99cad28fd5a2c38af2ec6f", + "css": "filter", + "code": 50015, + "src": "fontawesome" + }, + { + "uid": "0cd2582b8c93719d066ee0affd02ac78", + "css": "sort-alt-up", + "code": 50016, + "src": "fontawesome" + }, + { + "uid": "27b13eff5eb0ca15e01a6e65ffe6eeec", + "css": "sort-alt-down", + "code": 50017, + "src": "fontawesome" + } + ] +} \ No newline at end of file diff --git a/grunt/fontello.js b/grunt/fontello.js index d44b552897..e122268cdc 100644 --- a/grunt/fontello.js +++ b/grunt/fontello.js @@ -2,9 +2,18 @@ module.exports = { options: { sass: false }, + dev: { + options: { + config : 'grunt/font-config.json', + fonts : 'src/font', + styles : '.tmp/font', + scss : false + // force : true + } + }, dist: { options: { - config : 'src/font/config.json', + config : 'grunt/font-config.json', fonts : 'dist/release', styles : '.tmp/font', scss : false diff --git a/grunt/shell.js b/grunt/shell.js index 61ba92f41f..be9b02b465 100644 --- a/grunt/shell.js +++ b/grunt/shell.js @@ -1,29 +1,39 @@ -module.exports = { - // selenium no longer used - selenium: { - command: './selenium/start', - options: { - async: true - } - }, - 'protractor-install': { - command: 'node ./node_modules/protractor/bin/webdriver-manager update' - }, - 'protractor-start': { - command: 'node ./node_modules/protractor/bin/webdriver-manager start', - options: { - // apparently webdriver/selenium writes lots of trash on stderr, and the real output on stdout. No idea why.... - stderr: false, - async: true, - execOptions: { +module.exports = function() { + var webdriverManagerPath = './node_modules/protractor/bin/webdriver-manager'; + var bowerPath = './node_modules/bower/bin/bower'; + + if(process.platform === 'win32') { + webdriverManagerPath = '.\\node_modules\\protractor\\bin\\webdriver-manager'; + bowerPath = '.\\node_modules\\bower\\bin\\bower'; + } + + return { + // selenium no longer used + selenium: { + command: './selenium/start', + options: { + async: true + } + }, + 'protractor-install': { + command: 'node ' + webdriverManagerPath + ' update' + }, + 'protractor-start': { + command: 'node ' + webdriverManagerPath + ' start', + options: { + // apparently webdriver/selenium writes lots of trash on stderr, and the real output on stdout. No idea why.... + stderr: false, + async: true, + execOptions: { maxBuffer: 400*1024 // or whatever other large value you want + } } + }, + 'bower-install': { + command: 'node ' + bowerPath + ' install' + }, + 'hooks-install': { + command: 'npm run init' } - }, - 'bower-install': { - command: 'node ./node_modules/bower/bin/bower install' - }, - 'hooks-install': { - command: 'npm run init' - } + }; }; diff --git a/package.json b/package.json index d12538ac8a..80b6eb231b 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ "canonical-path": "0.0.2", "coveralls": "^2.11.1", "cz-conventional-changelog": "^1.1.5", - "ghooks": "^1.0.3", "grunt": "~0.4", "grunt-angular-templates": "~0.5", "grunt-bump": "^0.7.0", @@ -50,14 +49,15 @@ "grunt-contrib-uglify": "~0.2", "grunt-contrib-watch": "~0.5", "grunt-conventional-changelog": "~1.0.0", - "grunt-fontello": "~0.1", + "grunt-fontello": "^0.3.3", "grunt-gh-pages": "~0.9.0", "grunt-jscs": "^0.7.1", "grunt-karma": "~0.8", "grunt-newer": "~1.1.0", "grunt-ngdocs": "https://github.com/c0bra/grunt-ngdocs/tarball/0.2.7-custom3", - "grunt-protractor-runner": "~2.0.0", + "grunt-protractor-runner": "4.0.0", "grunt-shell-spawn": "~0.3.0", + "husky": "^0.13.2", "jit-grunt": "^0.8.0", "jshint-stylish": "^0.2.0", "karma": "~0.12", @@ -66,14 +66,18 @@ "karma-firefox-launcher": "~0.1", "karma-ie-launcher": "^0.1.5", "karma-jasmine": "^0.3.7", - "karma-phantomjs-launcher": "~0.1", + "karma-phantomjs-launcher": "^1.0.0", "karma-requirejs": "~0.2", "karma-sauce-launcher": "^1.0.0", "karma-script-launcher": "~0.1", "load-grunt-config": "~0.16.0", "marked": "~0.2", - "protractor": "~2.1.0", - "selenium-webdriver": "~2.46.0", + "phantomjs-prebuilt": "^2.1.4", + "protractor": "~4.0.14", + "protractor-accessibility-plugin": "^0.3.0", + "requirejs": "^2.3.3", + "selenium-server-standalone-jar": "2.45.0", + "selenium-webdriver": "~2.53.0", "semver": "~2.2.1", "shelljs": "~0.2.6", "time-grunt": "~1.1.0", diff --git a/src/font/config.json b/src/font/config.json deleted file mode 100644 index d82143d1a9..0000000000 --- a/src/font/config.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "name": "ui-grid", - "css_prefix_text": "ui-grid-icon-", - "css_use_suffix": false, - "hinting": true, - "units_per_em": 1000, - "ascent": 850, - "glyphs": [ - { - "uid": "5d2d07f112b8de19f2c0dbfec3e42c05", - "css": "spin5", - "code": 60001, - "src": "fontelico" - }, - { - "uid": "9dd9e835aebe1060ba7190ad2b2ed951", - "css": "search", - "code": 50002, - "src": "fontawesome" - }, - { - "uid": "12f4ece88e46abd864e40b35e05b11cd", - "css": "ok", - "code": 50018, - "src": "fontawesome" - }, - { - "uid": "5211af474d3a9848f67f945e2ccaf143", - "css": "cancel", - "code": 50003, - "src": "fontawesome" - }, - { - "uid": "1a5cfa186647e8c929c2b17b9fc4dac1", - "css": "plus-squared", - "code": 50000, - "src": "fontawesome" - }, - { - "uid": "f755a58fb985eeb70bd47d9b31892a34", - "css": "minus-squared", - "code": 50001, - "src": "fontawesome" - }, - { - "uid": "e82cedfa1d5f15b00c5a81c9bd731ea2", - "css": "info-circled", - "code": 50004, - "src": "fontawesome" - }, - { - "uid": "c1f1975c885aa9f3dad7810c53b82074", - "css": "lock", - "code": 50005, - "src": "fontawesome" - }, - { - "uid": "657ab647f6248a6b57a5b893beaf35a9", - "css": "lock-open", - "code": 50006, - "src": "fontawesome" - }, - { - "uid": "d35a1d35efeb784d1dc9ac18b9b6c2b6", - "css": "pencil", - "code": 50007, - "src": "fontawesome" - }, - { - "uid": "559647a6f430b3aeadbecd67194451dd", - "css": "menu", - "code": 50019, - "src": "fontawesome" - }, - { - "uid": "2d6150442079cbda7df64522dc24f482", - "css": "down-dir", - "code": 50008, - "src": "fontawesome" - }, - { - "uid": "80cd1022bd9ea151d554bec1fa05f2de", - "css": "up-dir", - "code": 50009, - "src": "fontawesome" - }, - { - "uid": "9dc654095085167524602c9acc0c5570", - "css": "left-dir", - "code": 50010, - "src": "fontawesome" - }, - { - "uid": "fb1c799ffe5bf8fb7f8bcb647c8fe9e6", - "css": "right-dir", - "code": 50011, - "src": "fontawesome" - }, - { - "uid": "d870630ff8f81e6de3958ecaeac532f2", - "css": "left-open", - "code": 50012, - "src": "fontawesome" - }, - { - "uid": "399ef63b1e23ab1b761dfbb5591fa4da", - "css": "right-open", - "code": 50013, - "src": "fontawesome" - }, - { - "uid": "e4dde1992f787163e2e2b534b8c8067d", - "css": "angle-down", - "code": 50014, - "src": "fontawesome" - }, - { - "uid": "594e9271c08ff732c04b3bf3117b9040", - "css": "indent-left", - "code": 59392, - "src": "fontawesome" - }, - { - "uid": "4d2dfc45d8176b1f26aed973fa84a91e", - "css": "indent-right", - "code": 59393, - "src": "fontawesome" - }, - { - "uid": "4109c474ff99cad28fd5a2c38af2ec6f", - "css": "filter", - "code": 50015, - "src": "fontawesome" - }, - { - "uid": "0cd2582b8c93719d066ee0affd02ac78", - "css": "sort-alt-up", - "code": 50016, - "src": "fontawesome" - }, - { - "uid": "27b13eff5eb0ca15e01a6e65ffe6eeec", - "css": "sort-alt-down", - "code": 50017, - "src": "fontawesome" - } - ] -} \ No newline at end of file diff --git a/src/font/fontello.eot b/src/font/fontello.eot new file mode 100644 index 0000000000000000000000000000000000000000..e57da0026d226f255ecb5c7c857b32cc7740ed39 GIT binary patch literal 10336 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 + + +Copyright (C) 2017 by original authors @ fontello.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/font/fontello.ttf b/src/font/fontello.ttf new file mode 100644 index 0000000000000000000000000000000000000000..f81df2bb1df736d7ee1e5eb00f32c55dbb1f10aa GIT binary patch literal 10168 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 DAZ+9! literal 0 HcmV?d00001 diff --git a/src/font/fontello.woff b/src/font/fontello.woff new file mode 100644 index 0000000000000000000000000000000000000000..eb28f33ed3bc389ec70e869ad9d011253c72c806 GIT binary patch literal 5720 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 Date: Mon, 27 Mar 2017 15:53:51 -0400 Subject: [PATCH 5/8] chore: Release v3.2.10 --- CHANGELOG.md | 8 ++++++++ bower.json | 2 +- package.json | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07dbf0fa69..96f07fe4e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ + +### v3.2.10 (2017-03-27) + + +#### Bug Fixes + +* **#6017:** Fixes ui-grid-viewport scroll issue in chrome v56. Credit to @Joel-Kornbluh ([cc8afa8](https://github.com/angular-ui/ui-grid/pull/6125/commits/cc8afa88d2facd70f37653b6d8fabb926996fbbb)) + ### v3.2.9 (2016-09-21) diff --git a/bower.json b/bower.json index f3e7032495..1415e27909 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "angular-ui-grid", - "version": "3.2.9", + "version": "3.2.10", "homepage": "http://ui-grid.info", "repository": { "type": "git", diff --git a/package.json b/package.json index 80b6eb231b..1a96fda231 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ui-grid", - "version": "3.2.9", + "version": "3.2.10", "description": "A data grid for Angular", "directories": { "test": "test" From 53b9e33a8771a81e86d0d56b38a1eb6cd880c230 Mon Sep 17 00:00:00 2001 From: "Portugal, Marcelo" Date: Tue, 28 Mar 2017 15:23:45 -0400 Subject: [PATCH 6/8] fix(6130): Renaming font files to match icon.less expectation. Credit to @eugenehuanggy for finding the source of this problem. #6130 --- src/font/{fontello.eot => ui-grid.eot} | Bin src/font/{fontello.svg => ui-grid.svg} | 0 src/font/{fontello.ttf => ui-grid.ttf} | Bin src/font/{fontello.woff => ui-grid.woff} | Bin src/font/{fontello.woff2 => ui-grid.woff2} | Bin 5 files changed, 0 insertions(+), 0 deletions(-) rename src/font/{fontello.eot => ui-grid.eot} (100%) rename src/font/{fontello.svg => ui-grid.svg} (100%) rename src/font/{fontello.ttf => ui-grid.ttf} (100%) rename src/font/{fontello.woff => ui-grid.woff} (100%) rename src/font/{fontello.woff2 => ui-grid.woff2} (100%) diff --git a/src/font/fontello.eot b/src/font/ui-grid.eot similarity index 100% rename from src/font/fontello.eot rename to src/font/ui-grid.eot diff --git a/src/font/fontello.svg b/src/font/ui-grid.svg similarity index 100% rename from src/font/fontello.svg rename to src/font/ui-grid.svg diff --git a/src/font/fontello.ttf b/src/font/ui-grid.ttf similarity index 100% rename from src/font/fontello.ttf rename to src/font/ui-grid.ttf diff --git a/src/font/fontello.woff b/src/font/ui-grid.woff similarity index 100% rename from src/font/fontello.woff rename to src/font/ui-grid.woff diff --git a/src/font/fontello.woff2 b/src/font/ui-grid.woff2 similarity index 100% rename from src/font/fontello.woff2 rename to src/font/ui-grid.woff2 From ca78bba2f521fe2771cfbd60599609d5235c5787 Mon Sep 17 00:00:00 2001 From: "Portugal, Marcelo" Date: Tue, 28 Mar 2017 15:59:51 -0400 Subject: [PATCH 7/8] chore: Release v3.2.11 --- CHANGELOG.md | 8 ++++++++ bower.json | 2 +- package.json | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96f07fe4e9..4d5edfbaaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ + +### v3.2.11 (2017-03-28) + + +#### Bug Fixes + +* **6130:** Renaming font files to match icon.less expectation. ([53b9e33a](http://github.com/angular-ui/ng-grid/commit/53b9e33a8771a81e86d0d56b38a1eb6cd880c230)) + ### v3.2.10 (2017-03-27) diff --git a/bower.json b/bower.json index 1415e27909..b05ad20c1f 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "angular-ui-grid", - "version": "3.2.10", + "version": "3.2.11", "homepage": "http://ui-grid.info", "repository": { "type": "git", diff --git a/package.json b/package.json index 1a96fda231..e67983821f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ui-grid", - "version": "3.2.10", + "version": "3.2.11", "description": "A data grid for Angular", "directories": { "test": "test" From d5a179a3d26b97550f7ae6f76f0f6eeba406b0ac Mon Sep 17 00:00:00 2001 From: "Portugal, Marcelo" Date: Tue, 4 Apr 2017 12:17:22 -0400 Subject: [PATCH 8/8] fix(5776): Fixing bower.json and package.json configuration. --- grunt/copy.js | 28 ---------------------------- grunt/cut-release.js | 1 - lib/grunt/plugins.js | 21 +++++++++++++++++---- package.json | 1 + 4 files changed, 18 insertions(+), 33 deletions(-) diff --git a/grunt/copy.js b/grunt/copy.js index 9e4c68a15f..6b070f6a62 100644 --- a/grunt/copy.js +++ b/grunt/copy.js @@ -46,34 +46,6 @@ module.exports = function ( grunt ) { } ] }, - font_cut_release: { - files: [ - { - expand: true, - cwd: '<%= dist %>/release/', - src: '**/*.eot', - dest: '<%= dist %>/release/' + currentTag - }, - { - expand: true, - cwd: '<%= dist %>/release/', - src: '**/*.svg', - dest: '<%= dist %>/release/' + currentTag - }, - { - expand: true, - cwd: '<%= dist %>/release/', - src: '**/*.ttf', - dest: '<%= dist %>/release/' + currentTag - }, - { - expand: true, - cwd: '<%= dist %>/release/', - src: '**/*.woff', - dest: '<%= dist %>/release/' + currentTag - } - ] - }, less_customizer: { files: [ { diff --git a/grunt/cut-release.js b/grunt/cut-release.js index 016b7348eb..9cef2bc545 100644 --- a/grunt/cut-release.js +++ b/grunt/cut-release.js @@ -3,7 +3,6 @@ module.exports = { cleanup: true, keepUnstable: false, stableTasks: [ - 'copy:font_cut_release', 'copy:less_cut_release' ] }, diff --git a/lib/grunt/plugins.js b/lib/grunt/plugins.js index d6c85865cd..4b69032345 100644 --- a/lib/grunt/plugins.js +++ b/lib/grunt/plugins.js @@ -9,6 +9,7 @@ var reader = require('../../node_modules/grunt-ngdocs/src/reader.js'); var projectPath = path.resolve(__dirname, '../..'); var pkg = require(path.resolve(projectPath, 'package.json')); +var bwr = require(path.resolve(projectPath, 'bower.json')); module.exports = function(grunt) { @@ -289,6 +290,13 @@ module.exports = function(grunt) { done(); }); + // Copies a file into the release directory + function copyIntoRelease(tagggedReleaseDir, filePath) { + var file = path.resolve(projectPath, filePath); + + shell.cp('-f', file, tagggedReleaseDir); + } + // Create the bower.json file grunt.registerTask('update-bower-json', function () { var currentTag = semver.clean( util.getVersion() ); @@ -304,8 +312,13 @@ module.exports = function(grunt) { }); // Copy a README file - var readme = path.resolve(projectPath, 'misc/publish/README.md'); - shell.cp('-f', readme, taggedReleaseDir); + copyIntoRelease(taggedReleaseDir, 'misc/publish/README.md'); + + // Copy a CHANGELOG file + copyIntoRelease(taggedReleaseDir, 'CHANGELOG.md'); + + // Copy a index.js file + copyIntoRelease(taggedReleaseDir, 'misc/publish/index.js'); var bowerJsonFile = path.join(taggedReleaseDir, 'bower.json'); var pkgJsonFile = path.join(taggedReleaseDir, 'package.json'); @@ -313,7 +326,7 @@ module.exports = function(grunt) { var json = { 'name': 'angular-ui-grid', 'description': pkg.description, - 'main': releaseFiles, + 'main': bwr.main, 'ignore': [], 'dependencies': { 'angular': '>=1.2.16 1.4.x' @@ -329,7 +342,7 @@ module.exports = function(grunt) { // For package.json json.version = currentTag; - json.main = "ui-grid.js"; + json.main = pkg.main; json.files = releaseFiles; fs.writeFileSync(pkgJsonFile, JSON.stringify(json, null, 2)); diff --git a/package.json b/package.json index e67983821f..3e767fd889 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "directories": { "test": "test" }, + "main": "index.js", "scripts": { "init": "validate-commit-msg", "test": "grunt",