Skip to content

Commit c13c931

Browse files
Portugal, Marcelomportuga
Portugal, Marcelo
authored and
mportuga
committed
build(ui-grid): fix build task after file moves
Ensure the repository can still publish and work after re-organization of files.
1 parent ed0e017 commit c13c931

File tree

59 files changed

+89
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+89
-70
lines changed

‎grunt/concat.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ const getLanguages = p => fs.readdirSync(p).filter(f => fs.statSync(path.join(p,
66

77
function getFiles() {
88
const files = {
9-
'<%= dist %>/release/<%= pkg.name %>.js': ['src/js/core/bootstrap.js', 'src/js/**/*.js', 'src/features/*/js/**/*.js', '.tmp/template.js'],
10-
'<%= dist %>/release/<%= pkg.name %>.core.js': ['src/js/core/bootstrap.js', 'src/js/core/**/*.js', 'src/js/i18n/ui-i18n.js',
11-
'src/js/i18n/en.js', '.tmp/template.js']
9+
'<%= dist %>/release/<%= pkg.name %>.js': ['packages/core/src/js/bootstrap.js', 'packages/**/src/js/**/*.js', '.tmp/template.js'],
10+
'<%= dist %>/release/<%= pkg.name %>.core.js': ['src/js/core/bootstrap.js', 'packages/core/src/js/**/*.js', '.tmp/template.js']
1211
};
13-
const features = getDirectories('src/features/');
12+
const packages = getDirectories('packages/');
1413

15-
features.forEach((feat) => {
16-
files[`<%= dist %>/release/<%= pkg.name %>.${feat}.js`] = [`src/features/${feat}/js/**/*.js`];
17-
});
18-
19-
const languages = getLanguages('src/js/i18n/')
20-
.filter((lang) => lang !== 'en.js' && lang !== 'ui-i18n.js');
14+
packages.forEach((feat) => {
15+
if (feat === 'i18n') {
16+
const languages = getLanguages('packages/i18n/src/js/');
2117

22-
files['<%= dist %>/release/i18n/<%= pkg.name %>.language.all.js'] = languages.map((lang) => `src/js/i18n/${lang}`);
18+
files['<%= dist %>/release/i18n/<%= pkg.name %>.language.all.js'] = languages.map((lang) => `packages/i18n/src/js/${lang}`);
2319

24-
languages.forEach((lang) => {
25-
files[`<%= dist %>/release/i18n/<%= pkg.name %>.language.${lang}`] = [`src/js/i18n/${lang}`];
20+
languages.forEach((lang) => {
21+
files[`<%= dist %>/release/i18n/<%= pkg.name %>.language.${lang}`] = [`packages/i18n/src/js/${lang}`];
22+
});
23+
} else if (feat !== 'core') {
24+
files[`<%= dist %>/release/<%= pkg.name %>.${feat}.js`] = [`packages/${feat}/src/js/**/*.js`];
25+
}
2626
});
2727

2828
return files;

‎grunt/copy.js

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@ module.exports = function ( grunt ) {
2222
files: [
2323
{
2424
expand: true,
25-
cwd: 'src/font',
25+
cwd: 'packages/core/src/font',
2626
src: '**/*.eot',
2727
dest: '<%= dist %>/release/fonts'
2828
},
2929
{
3030
expand: true,
31-
cwd: 'src/font',
31+
cwd: 'packages/core/src/font',
3232
src: '**/*.svg',
3333
dest: '<%= dist %>/release/fonts'
3434
},
3535
{
3636
expand: true,
37-
cwd: 'src/font',
37+
cwd: 'packages/core/src/font',
3838
src: '**/*.ttf',
3939
dest: '<%= dist %>/release/fonts'
4040
},
4141
{
4242
expand: true,
43-
cwd: 'src/font',
43+
cwd: 'packages/core/src/font',
4444
src: '**/*.woff',
4545
dest: '<%= dist %>/release/fonts'
4646
}
@@ -70,15 +70,19 @@ module.exports = function ( grunt ) {
7070
files: [
7171
{
7272
expand: true,
73-
cwd: 'src/less',
73+
cwd: 'packages/core/src/less',
7474
src: '**/*.less',
7575
dest: '<%= dist %>/less'
7676
},
7777
{
7878
expand: true,
79-
cwd: 'src/features',
79+
flatten: true,
80+
cwd: 'packages',
8081
src: '**/*.less',
81-
dest: '<%= dist %>/less'
82+
dest: '<%= dist %>/less',
83+
filter: function(filepath) {
84+
return !filepath.includes('packages/core/src/less');
85+
}
8286
},
8387
{
8488
expand: true,
@@ -92,15 +96,19 @@ module.exports = function ( grunt ) {
9296
files: [
9397
{
9498
expand: true,
95-
cwd: 'src/less',
99+
cwd: 'packages/core/src/less',
96100
src: '**/*.less',
97101
dest: '<%= dist %>/release/less'
98102
},
99103
{
100104
expand: true,
101-
cwd: 'src/features',
105+
flatten: true,
106+
cwd: 'packages',
102107
src: '**/*.less',
103-
dest: '<%= dist %>/release/less'
108+
dest: '<%= dist %>/release/less',
109+
filter: function(filepath) {
110+
return !filepath.includes('packages/core/src/less');
111+
}
104112
}
105113
]
106114
},

‎grunt/jscs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
files: {
3-
src: ['src/**/*.js', 'src/features/*/js/**/*.js', 'src/features/*/test/**/*.spec.js', 'test/**/*.spec.js'],
3+
src: ['packages/*/src/**/*.js', 'packages/*/test/**/*.spec.js', 'test/**/*.spec.js'],
44
},
55
options: {
66
config: '.jscs.json'

‎grunt/jshint.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ module.exports = {
6767
src: 'Gruntfile.js'
6868
},
6969
src_test: {
70-
src: ['src/**/*.js', 'src/features/*/js/**/*.js', 'src/features/*/test/**/*.spec.js', 'test/**/*.spec.js']
70+
src: ['packages/*/src/**/*.js', 'packages/*/test/**/*.spec.js', 'test/**/*.spec.js']
7171
}
7272
};

‎grunt/karma.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = function( grunt ){
1616
reporters: ['progress'],
1717
reportSlowerThan: 200,
1818
preprocessors: {
19-
'src/**/*.js': ['coverage'],
19+
'packages/**/*.js': ['coverage'],
2020
'**/*.html': ['ng-html2js']
2121
},
2222
ngHtml2JsPreprocessor: {

‎grunt/less.js

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,29 @@ module.exports = {
44
options: {
55
banner: '<%= banner %>'
66
},
7-
files: {
8-
'dist/release/<%= pkg.name %>.css': ['src/less/main.less', 'src/features/*/less/**/*.less', '.tmp/font/ui-grid-codes.css']
9-
}
7+
files: [
8+
{
9+
src: ['packages/core/src/less/main.less', 'packages/*/src/less/**/*.less', '.tmp/font/ui-grid-codes.css'],
10+
dest: 'dist/release/<%= pkg.name %>.css',
11+
filter: function(filepath) {
12+
return filepath === 'packages/core/src/less/main.less' || !filepath.includes('packages/core/src/less/');
13+
}
14+
}
15+
]
1016
},
1117
min: {
1218
options: {
1319
banner: '<%= banner %>',
1420
compress: true
1521
},
16-
files: {
17-
'dist/release/<%= pkg.name %>.min.css': ['src/less/main.less', 'src/features/*/less/**/*.less', '.tmp/font/ui-grid-codes.css']
18-
}
22+
files: [
23+
{
24+
src: ['packages/core/src/less/main.less', 'packages/*/src/less/**/*.less', '.tmp/font/ui-grid-codes.css'],
25+
dest: 'dist/release/<%= pkg.name %>.min.css',
26+
filter: function(filepath) {
27+
return filepath === 'packages/core/src/less/main.less' || !filepath.includes('packages/core/src/less/');
28+
}
29+
}
30+
]
1931
}
2032
};

‎grunt/ngtemplates.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
module.exports = {
22
'uigrid': {
33
// Look for templates in src and in feature template directories
4-
src: ['src/templates/**/*.html', 'src/features/*/templates/**/*.html'],
4+
src: ['packages/*/src/templates/**/*.html'],
55
dest: '.tmp/template.js',
66
options: {
77
module: 'ui.grid',
88
htmlmin: { collapseWhitespace: true, collapseBooleanAttributes: true },
99
// Strip .html extension
1010
url: function(url) {
11-
// Remove the src/templates/ prefix
12-
url = url.replace(/^src\/templates\//, '');
11+
// Remove the packages/feature/src/templates/ prefix
12+
url = url.replace(/^packages\/[^\/]+?\/src\/templates\/ui-grid/, 'ui-grid');
1313

1414
// Replace feature prefix with just 'ui-grid'
15-
url = url.replace(/^src\/features\/[^\/]+?\/templates/, 'ui-grid');
15+
url = url.replace(/^packages\/[^\/]+?\/src\/templates/, 'ui-grid');
1616

1717
// Remove the .html extension
1818
return url.replace('.html', '');

‎grunt/watch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = function( grunt, options ){
1010
},
1111

1212
ngtemplates: {
13-
// files: ['src/templates/**/*.html', 'src/features/*/templates/**/*.html'],
13+
// files: ['packages/*/src/templates/**/*.html'],
1414
files: '<%= ngtemplates.uigrid.src %>',
1515
tasks: ['ngtemplates']
1616
},

‎lib/grunt/utils.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ var util = module.exports = {
1414
},
1515

1616
testFiles: {
17-
unit: ['src/js/core/bootstrap.js', 'src/js/**/*.js', 'test/unit/**/*.spec.js', 'src/features/*/js/**/*.js', 'src/features/*/test/**/*.spec.js', '.tmp/template.js'],
18-
core_unit: ['src/js/core/bootstrap.js', 'src/js/**/*.js', 'test/unit/**/*.spec.js', 'src/features/*/js/**/*.js', '.tmp/template.js'],
17+
unit: ['packages/core/src/js/bootstrap.js', 'packages/core/src/js/**/*.js', 'packages/core/test/**/*.spec.js', 'packages/*/src/js/**/*.js', 'packages/*/test/**/*.spec.js', '.tmp/template.js'],
18+
core_unit: ['packages/core/src/js/bootstrap.js', 'packages/core/src/js/**/*.js', 'packages/core/test/**/*.spec.js', 'packages/*/src/js/**/*.js', '.tmp/template.js'],
1919
},
2020
testFilesFeature: function(featureName){
21-
var featurePattern = 'src/features/' + featureName +'/test/**/*.spec.js';
21+
var featurePattern = 'packages/' + featureName + '/test/**/*.spec.js';
2222

2323
return {
24-
unit: ['src/js/core/bootstrap.js', 'src/js/**/*.js', 'test/unit/**/*.spec.js', 'src/features/*/js/**/*.js', featurePattern, '.tmp/template.js'],
24+
unit: ['packages/core/src/js/bootstrap.js', 'packages/core/src/js/**/*.js', 'packages/core/test/**/*.spec.js', 'packages/*/src/js/**/*.js', featurePattern, '.tmp/template.js'],
2525
core_unit: util.testDependencies.unit.core_unit
2626
};
2727
},

‎packages/cellnav/src/less/cellNav.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '../../../less/variables';
1+
@import '../../../core/src/less/variables';
22

33
.ui-grid-cell-focus {
44
outline: 0;

0 commit comments

Comments
 (0)