Skip to content

Commit f81e888

Browse files
Portugal, MarceloPortugal, Marcelo
Portugal, Marcelo
authored and
Portugal, Marcelo
committed
chore(dev_flow): Synchronizing dev flow with master branch.
1 parent 46ac292 commit f81e888

15 files changed

+322
-186
lines changed

‎grunt/aliases.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = function (grunt, options) {
1010
'default': ['before-test', 'test:single', 'after-test'],
1111

1212
// Build with no testing
13-
'build': ['ngtemplates', 'concat', 'uglify', 'fontello', 'less', 'ngdocs', 'copy:site', 'copy:less_customizer',],
13+
'build': ['ngtemplates', 'concat', 'uglify', 'less', 'ngdocs', 'copy:font_dist', 'copy:site', 'copy:less_customizer',],
1414

1515
// Auto-test tasks for development
1616
'autotest:unit': ['karmangular:start'],
@@ -53,10 +53,10 @@ module.exports = function (grunt, options) {
5353
var currentTag = semver.clean( util.getCurrentTag() );
5454

5555
if (currentTag) {
56-
baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
56+
baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
5757
}
5858
else {
59-
baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'gh-pages:ui-grid-site'];
59+
baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release'];
6060
}
6161

6262
return baseTasks;

‎grunt/copy.js

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,62 @@ module.exports = function ( grunt ) {
1818
}
1919
]
2020
},
21+
font_dist: {
22+
files: [
23+
{
24+
expand: true,
25+
cwd: 'src/font',
26+
src: '**/*.eot',
27+
dest: '<%= dist %>/release/'
28+
},
29+
{
30+
expand: true,
31+
cwd: 'src/font',
32+
src: '**/*.svg',
33+
dest: '<%= dist %>/release/'
34+
},
35+
{
36+
expand: true,
37+
cwd: 'src/font',
38+
src: '**/*.ttf',
39+
dest: '<%= dist %>/release/'
40+
},
41+
{
42+
expand: true,
43+
cwd: 'src/font',
44+
src: '**/*.woff',
45+
dest: '<%= dist %>/release/'
46+
}
47+
]
48+
},
49+
font_cut_release: {
50+
files: [
51+
{
52+
expand: true,
53+
cwd: '<%= dist %>/release/',
54+
src: '**/*.eot',
55+
dest: '<%= dist %>/release/' + currentTag
56+
},
57+
{
58+
expand: true,
59+
cwd: '<%= dist %>/release/',
60+
src: '**/*.svg',
61+
dest: '<%= dist %>/release/' + currentTag
62+
},
63+
{
64+
expand: true,
65+
cwd: '<%= dist %>/release/',
66+
src: '**/*.ttf',
67+
dest: '<%= dist %>/release/' + currentTag
68+
},
69+
{
70+
expand: true,
71+
cwd: '<%= dist %>/release/',
72+
src: '**/*.woff',
73+
dest: '<%= dist %>/release/' + currentTag
74+
}
75+
]
76+
},
2177
less_customizer: {
2278
files: [
2379
{

‎grunt/cut-release.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module.exports = {
33
cleanup: true,
44
keepUnstable: false,
55
stableTasks: [
6+
'copy:font_cut_release',
67
'copy:less_cut_release'
78
]
89
},

‎grunt/font-config.json

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
{
2+
"name": "29f50de8e70e0efa40c762200582c08b",
3+
"css_prefix_text": "ui-grid-icon-",
4+
"css_use_suffix": false,
5+
"hinting": true,
6+
"units_per_em": 1000,
7+
"ascent": 850,
8+
"glyphs": [
9+
{
10+
"uid": "5d2d07f112b8de19f2c0dbfec3e42c05",
11+
"css": "spin5",
12+
"code": 60001,
13+
"src": "fontelico"
14+
},
15+
{
16+
"uid": "9dd9e835aebe1060ba7190ad2b2ed951",
17+
"css": "search",
18+
"code": 50002,
19+
"src": "fontawesome"
20+
},
21+
{
22+
"uid": "12f4ece88e46abd864e40b35e05b11cd",
23+
"css": "ok",
24+
"code": 50018,
25+
"src": "fontawesome"
26+
},
27+
{
28+
"uid": "5211af474d3a9848f67f945e2ccaf143",
29+
"css": "cancel",
30+
"code": 50003,
31+
"src": "fontawesome"
32+
},
33+
{
34+
"uid": "1a5cfa186647e8c929c2b17b9fc4dac1",
35+
"css": "plus-squared",
36+
"code": 50000,
37+
"src": "fontawesome"
38+
},
39+
{
40+
"uid": "f755a58fb985eeb70bd47d9b31892a34",
41+
"css": "minus-squared",
42+
"code": 50001,
43+
"src": "fontawesome"
44+
},
45+
{
46+
"uid": "e82cedfa1d5f15b00c5a81c9bd731ea2",
47+
"css": "info-circled",
48+
"code": 50004,
49+
"src": "fontawesome"
50+
},
51+
{
52+
"uid": "c1f1975c885aa9f3dad7810c53b82074",
53+
"css": "lock",
54+
"code": 50005,
55+
"src": "fontawesome"
56+
},
57+
{
58+
"uid": "657ab647f6248a6b57a5b893beaf35a9",
59+
"css": "lock-open",
60+
"code": 50006,
61+
"src": "fontawesome"
62+
},
63+
{
64+
"uid": "d35a1d35efeb784d1dc9ac18b9b6c2b6",
65+
"css": "pencil",
66+
"code": 50007,
67+
"src": "fontawesome"
68+
},
69+
{
70+
"uid": "559647a6f430b3aeadbecd67194451dd",
71+
"css": "menu",
72+
"code": 50019,
73+
"src": "fontawesome"
74+
},
75+
{
76+
"uid": "2d6150442079cbda7df64522dc24f482",
77+
"css": "down-dir",
78+
"code": 50008,
79+
"src": "fontawesome"
80+
},
81+
{
82+
"uid": "80cd1022bd9ea151d554bec1fa05f2de",
83+
"css": "up-dir",
84+
"code": 50009,
85+
"src": "fontawesome"
86+
},
87+
{
88+
"uid": "9dc654095085167524602c9acc0c5570",
89+
"css": "left-dir",
90+
"code": 50010,
91+
"src": "fontawesome"
92+
},
93+
{
94+
"uid": "fb1c799ffe5bf8fb7f8bcb647c8fe9e6",
95+
"css": "right-dir",
96+
"code": 50011,
97+
"src": "fontawesome"
98+
},
99+
{
100+
"uid": "d870630ff8f81e6de3958ecaeac532f2",
101+
"css": "left-open",
102+
"code": 50012,
103+
"src": "fontawesome"
104+
},
105+
{
106+
"uid": "399ef63b1e23ab1b761dfbb5591fa4da",
107+
"css": "right-open",
108+
"code": 50013,
109+
"src": "fontawesome"
110+
},
111+
{
112+
"uid": "e4dde1992f787163e2e2b534b8c8067d",
113+
"css": "angle-down",
114+
"code": 50014,
115+
"src": "fontawesome"
116+
},
117+
{
118+
"uid": "594e9271c08ff732c04b3bf3117b9040",
119+
"css": "indent-left",
120+
"code": 59392,
121+
"src": "fontawesome"
122+
},
123+
{
124+
"uid": "4d2dfc45d8176b1f26aed973fa84a91e",
125+
"css": "indent-right",
126+
"code": 59393,
127+
"src": "fontawesome"
128+
},
129+
{
130+
"uid": "4109c474ff99cad28fd5a2c38af2ec6f",
131+
"css": "filter",
132+
"code": 50015,
133+
"src": "fontawesome"
134+
},
135+
{
136+
"uid": "0cd2582b8c93719d066ee0affd02ac78",
137+
"css": "sort-alt-up",
138+
"code": 50016,
139+
"src": "fontawesome"
140+
},
141+
{
142+
"uid": "27b13eff5eb0ca15e01a6e65ffe6eeec",
143+
"css": "sort-alt-down",
144+
"code": 50017,
145+
"src": "fontawesome"
146+
}
147+
]
148+
}

‎grunt/fontello.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,18 @@ module.exports = {
22
options: {
33
sass: false
44
},
5+
dev: {
6+
options: {
7+
config : 'grunt/font-config.json',
8+
fonts : 'src/font',
9+
styles : '.tmp/font',
10+
scss : false
11+
// force : true
12+
}
13+
},
514
dist: {
615
options: {
7-
config : 'src/font/config.json',
16+
config : 'grunt/font-config.json',
817
fonts : 'dist/release',
918
styles : '.tmp/font',
1019
scss : false

‎grunt/shell.js

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,39 @@
1-
module.exports = {
2-
// selenium no longer used
3-
selenium: {
4-
command: './selenium/start',
5-
options: {
6-
async: true
7-
}
8-
},
9-
'protractor-install': {
10-
command: 'node ./node_modules/protractor/bin/webdriver-manager update'
11-
},
12-
'protractor-start': {
13-
command: 'node ./node_modules/protractor/bin/webdriver-manager start',
14-
options: {
15-
// apparently webdriver/selenium writes lots of trash on stderr, and the real output on stdout. No idea why....
16-
stderr: false,
17-
async: true,
18-
execOptions: {
1+
module.exports = function() {
2+
var webdriverManagerPath = './node_modules/protractor/bin/webdriver-manager';
3+
var bowerPath = './node_modules/bower/bin/bower';
4+
5+
if(process.platform === 'win32') {
6+
webdriverManagerPath = '.\\node_modules\\protractor\\bin\\webdriver-manager';
7+
bowerPath = '.\\node_modules\\bower\\bin\\bower';
8+
}
9+
10+
return {
11+
// selenium no longer used
12+
selenium: {
13+
command: './selenium/start',
14+
options: {
15+
async: true
16+
}
17+
},
18+
'protractor-install': {
19+
command: 'node ' + webdriverManagerPath + ' update'
20+
},
21+
'protractor-start': {
22+
command: 'node ' + webdriverManagerPath + ' start',
23+
options: {
24+
// apparently webdriver/selenium writes lots of trash on stderr, and the real output on stdout. No idea why....
25+
stderr: false,
26+
async: true,
27+
execOptions: {
1928
maxBuffer: 400*1024 // or whatever other large value you want
29+
}
2030
}
31+
},
32+
'bower-install': {
33+
command: 'node ' + bowerPath + ' install'
34+
},
35+
'hooks-install': {
36+
command: 'npm run init'
2137
}
22-
},
23-
'bower-install': {
24-
command: 'node ./node_modules/bower/bin/bower install'
25-
},
26-
'hooks-install': {
27-
command: 'npm run init'
28-
}
38+
};
2939
};

‎package.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"canonical-path": "0.0.2",
3737
"coveralls": "^2.11.1",
3838
"cz-conventional-changelog": "^1.1.5",
39-
"ghooks": "^1.0.3",
4039
"grunt": "~0.4",
4140
"grunt-angular-templates": "~0.5",
4241
"grunt-bump": "^0.7.0",
@@ -50,14 +49,15 @@
5049
"grunt-contrib-uglify": "~0.2",
5150
"grunt-contrib-watch": "~0.5",
5251
"grunt-conventional-changelog": "~1.0.0",
53-
"grunt-fontello": "~0.1",
52+
"grunt-fontello": "^0.3.3",
5453
"grunt-gh-pages": "~0.9.0",
5554
"grunt-jscs": "^0.7.1",
5655
"grunt-karma": "~0.8",
5756
"grunt-newer": "~1.1.0",
5857
"grunt-ngdocs": "https://github.com/c0bra/grunt-ngdocs/tarball/0.2.7-custom3",
59-
"grunt-protractor-runner": "~2.0.0",
58+
"grunt-protractor-runner": "4.0.0",
6059
"grunt-shell-spawn": "~0.3.0",
60+
"husky": "^0.13.2",
6161
"jit-grunt": "^0.8.0",
6262
"jshint-stylish": "^0.2.0",
6363
"karma": "~0.12",
@@ -66,14 +66,18 @@
6666
"karma-firefox-launcher": "~0.1",
6767
"karma-ie-launcher": "^0.1.5",
6868
"karma-jasmine": "^0.3.7",
69-
"karma-phantomjs-launcher": "~0.1",
69+
"karma-phantomjs-launcher": "^1.0.0",
7070
"karma-requirejs": "~0.2",
7171
"karma-sauce-launcher": "^1.0.0",
7272
"karma-script-launcher": "~0.1",
7373
"load-grunt-config": "~0.16.0",
7474
"marked": "~0.2",
75-
"protractor": "~2.1.0",
76-
"selenium-webdriver": "~2.46.0",
75+
"phantomjs-prebuilt": "^2.1.4",
76+
"protractor": "~4.0.14",
77+
"protractor-accessibility-plugin": "^0.3.0",
78+
"requirejs": "^2.3.3",
79+
"selenium-server-standalone-jar": "2.45.0",
80+
"selenium-webdriver": "~2.53.0",
7781
"semver": "~2.2.1",
7882
"shelljs": "~0.2.6",
7983
"time-grunt": "~1.1.0",

0 commit comments

Comments
 (0)