Skip to content

Commit 84b4f32

Browse files
Portugal, Marcelomportuga
Portugal, Marcelo
authored andcommitted
fix(5776): Fixing bower.json and package.json configuration.
Fixing main section on bower.json and package.json. Adding index.js and CHANGELOG.md files to both, and removing weird version folder with the font files.
1 parent 5f15eab commit 84b4f32

File tree

6 files changed

+24
-34
lines changed

6 files changed

+24
-34
lines changed

grunt/aliases.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ module.exports = function (grunt, options) {
5151
baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'gh-pages:ui-grid-site', 'update-bower-json', 'gh-pages:bower', 'npm-publish'];
5252
}
5353
else {
54-
baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release', 'gh-pages:ui-grid-site'];
54+
baseTasks['release'] = ['clean', 'ngtemplates', 'build', 'copy:less_dist', 'cut-release'];
5555
}
5656

5757
return baseTasks;

grunt/copy.js

-28
Original file line numberDiff line numberDiff line change
@@ -46,34 +46,6 @@ module.exports = function ( grunt ) {
4646
}
4747
]
4848
},
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-
},
7749
less_customizer: {
7850
files: [
7951
{

grunt/cut-release.js

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module.exports = {
33
cleanup: true,
44
keepUnstable: false,
55
stableTasks: [
6-
'copy:font_cut_release',
76
'copy:less_cut_release'
87
]
98
},

lib/grunt/plugins.js

+17-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ var reader = require('../../node_modules/grunt-ngdocs/src/reader.js');
99

1010
var projectPath = path.resolve(__dirname, '../..');
1111
var pkg = require(path.resolve(projectPath, 'package.json'));
12+
var bwr = require(path.resolve(projectPath, 'bower.json'));
1213

1314
module.exports = function(grunt) {
1415

@@ -289,6 +290,13 @@ module.exports = function(grunt) {
289290
done();
290291
});
291292

293+
// Copies a file into the release directory
294+
function copyIntoRelease(taggedReleaseDir, filePath) {
295+
var file = path.resolve(projectPath, filePath);
296+
297+
shell.cp('-f', file, taggedReleaseDir);
298+
}
299+
292300
// Create the bower.json file
293301
grunt.registerTask('update-bower-json', function () {
294302
var currentTag = semver.clean( util.getVersion() );
@@ -304,16 +312,21 @@ module.exports = function(grunt) {
304312
});
305313

306314
// Copy a README file
307-
var readme = path.resolve(projectPath, 'misc/publish/README.md');
308-
shell.cp('-f', readme, taggedReleaseDir);
315+
copyIntoRelease(taggedReleaseDir, 'misc/publish/README.md');
316+
317+
// Copy a CHANGELOG file
318+
copyIntoRelease(taggedReleaseDir, 'CHANGELOG.md');
319+
320+
// Copy a index.js file
321+
copyIntoRelease(taggedReleaseDir, 'misc/publish/index.js');
309322

310323
var bowerJsonFile = path.join(taggedReleaseDir, 'bower.json');
311324
var pkgJsonFile = path.join(taggedReleaseDir, 'package.json');
312325

313326
var json = {
314327
'name': 'angular-ui-grid',
315328
'description': pkg.description,
316-
'main': releaseFiles,
329+
'main': bwr.main,
317330
'ignore': [],
318331
'dependencies': {
319332
'angular': '>=1.4.0 1.5.x'
@@ -329,7 +342,7 @@ module.exports = function(grunt) {
329342

330343
// For package.json
331344
json.version = currentTag;
332-
json.main = "ui-grid.js";
345+
json.main = pkg.main;
333346
json.files = releaseFiles;
334347

335348
fs.writeFileSync(pkgJsonFile, JSON.stringify(json, null, 2));

misc/tutorial/101_intro.ngdoc

+5
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ Steps:
3333
var app = angular.module('app', ['ui.grid']);
3434
</pre>
3535
</li>
36+
<li>Or using CommonJS
37+
<pre>
38+
var app = angular.module('app', [require('angular-ui-grid')]);
39+
</pre>
40+
</li>
3641
<li>
3742
Add a css style to your app css so the grid knows it's dimensions
3843
<pre>

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"directories": {
66
"test": "test"
77
},
8+
"main": "index.js",
89
"scripts": {
910
"init": "validate-commit-msg",
1011
"test": "grunt",

0 commit comments

Comments
 (0)