Skip to content

Commit cfa123b

Browse files
kdinevkdinev
authored
Merge pull request #227 from dkamburov/master
Add rollup to distribute UMD bundle and change the test to refer the source files
2 parents 3f1567e + ba93db7 commit cfa123b

File tree

37 files changed

+90
-43
lines changed

37 files changed

+90
-43
lines changed

‎dist/npm/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"version": "1.0.9",
44
"description" : "A packaged version of Ignite UI components for Angular",
55
"license": "MIT",
6-
"typings": "igniteui.angular2.d.ts",
6+
"types": "igniteui.angular2.d.ts",
7+
"main": "bundles/igniteui.angular2.umd.js",
78
"repository": {
89
"type": "git",
910
"url": "https://github.com/IgniteUI/igniteui-angular2.git"

‎package.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@
4646
"@types/jasmine": "^2.5.36",
4747
"@types/reflect-metadata": "^0.0.5",
4848
"@types/ignite-ui": "^0.0.4",
49-
"@types/jquery": "2.0.47"
49+
"@types/jquery": "2.0.47",
50+
"rollup": "^0.52.1",
51+
"rollup-plugin-node-resolve": "^3.0.0",
52+
"rollup-plugin-commonjs": "^8.2.6",
53+
"rollup-plugin-angular": "^0.5.3",
54+
"rollup-plugin-typescript": "^0.8.1"
5055
},
5156
"scripts": {
5257
"postinstall": "npm prune",
@@ -59,7 +64,7 @@
5964
"build-aot": "ngc -p tsconfig-aot.json",
6065
"build-aot-samples": "ngc -p tsconfig-aot-samples.json",
6166
"bundle": "npm run build-aot && npm run prepare-dist",
62-
"prepare-dist": "cp src/igniteui.angular2.js dist/npm/index.js && cp src/igniteui.angular2.d.ts dist/npm/index.d.ts && cp src/igniteui.angular2.metadata.json dist/npm/index.metadata.json && cp src/igniteui.angular2.ts dist/npm/igniteui.angular2.ts && cp -R src/** dist/npm/",
67+
"prepare-dist": "rollup -c rollup.config.umd.js",
6368

6469
"pretest": "npm run bundle && npm run build",
6570
"test": "karma start tests/karma.conf.js && npm run remap-istanbul",

‎rollup.config.umd.js‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import resolve from 'rollup-plugin-node-resolve';
2+
import commonjs from 'rollup-plugin-commonjs';
3+
import angular from 'rollup-plugin-angular';
4+
import typescript from 'rollup-plugin-typescript';
5+
export default {
6+
entry: 'src/igniteui.angular2.ts',
7+
format: 'umd',
8+
moduleName: 'igniteui-angular2',
9+
sourceMap:true,
10+
external: [
11+
'@angular/core',
12+
],
13+
dest: "dist/npm/bundles/igniteui-angular2.umd.js",
14+
plugins: [
15+
angular(
16+
{
17+
preprocessors:{
18+
template:template => template
19+
}
20+
}
21+
),
22+
typescript({
23+
typescript:require('typescript')
24+
}),
25+
resolve({
26+
module: true,
27+
main: true
28+
}),
29+
commonjs({
30+
include: 'node_modules/**',
31+
})
32+
],
33+
onwarn: warning => {
34+
const skip_codes = [
35+
'THIS_IS_UNDEFINED',
36+
'MISSING_GLOBAL_NAME'
37+
];
38+
if (skip_codes.indexOf(warning.code) != -1) return;
39+
console.error(warning);
40+
}
41+
};

‎tests/karma.conf.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ module.exports = function(config){
5252
{ pattern: 'node_modules/@angular/**/*.js.map', included: false, watched: false },
5353

5454
// paths loaded via module imports
55-
{ pattern: 'dist/npm/**/*.*', included: false, watched: true },
56-
55+
{ pattern: 'src/**/*.*', included: false, watched: true },
56+
5757
// spec files need to be loaded in the shim file IN CONTEXT of the main module, don't include:
5858
{ pattern: 'tests/unit/**/*.js', included: false, watched: false },
5959
{ pattern: 'tests/unit/**/*.js.map', included: false, watched: false }
@@ -87,7 +87,7 @@ module.exports = function(config){
8787
reporters: ['progress', 'coverage'],
8888

8989
preprocessors: {
90-
'dist/npm/**/*.js': ['coverage']
90+
'src/**/*.js': ['coverage']
9191
},
9292

9393
coverageReporter: {

‎tests/unit/igbulletgraph/bulletgraph.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// modeled after https://github.com/angular/angular/blob/cee2318110eeea115e5f6fc5bfc814cbaa7d90d8/modules/angular2/test/common/directives/ng_for_spec.ts
22
import { TestBed } from '@angular/core/testing';
33
import { Component, ViewChild } from '@angular/core';
4-
import * as Infragistics from '../../../dist/npm/igniteui.angular2';
4+
import * as Infragistics from '../../../src/igniteui.angular2';
55

66
export function main() {
77

@@ -20,13 +20,13 @@ export function main() {
2020
template: template
2121
}
2222
});
23-
TestBed.compileComponents().then(() => {
23+
//TestBed.compileComponents().then(() => {
2424
let fixture = TestBed.createComponent(TestComponent);
2525
fixture.detectChanges();
2626
expect(fixture.debugElement.componentInstance.viewChild instanceof Infragistics.IgBulletGraphComponent)
2727
.toBe(true);
2828
done();
29-
});
29+
//});
3030
});
3131
});
3232
}

‎tests/unit/igcombo/combo.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { TestBed } from '@angular/core/testing';
33
import { Component, ViewChild } from '@angular/core';
44
import { FormsModule } from '@angular/forms';
5-
import * as Infragistics from '../../../dist/npm/igniteui.angular2';
5+
import * as Infragistics from '../../../src/igniteui.angular2';
66
import { Northwind } from "../../../samples/data/northwind";
77

88
export function main() {

‎tests/unit/igdatachart/chart.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// modeled after https://github.com/angular/angular/blob/cee2318110eeea115e5f6fc5bfc814cbaa7d90d8/modules/angular2/test/common/directives/ng_for_spec.ts
22
import { TestBed } from '@angular/core/testing';
33
import { Component, ViewChild } from '@angular/core';
4-
import * as Infragistics from '../../../dist/npm/igniteui.angular2';
4+
import * as Infragistics from '../../../src/igniteui.angular2';
55

66
export function main() {
77
describe('Infragistics Angular2 DataChart and Zoombar', () => {

‎tests/unit/igdialog/dialog.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// modeled after https://github.com/angular/angular/blob/cee2318110eeea115e5f6fc5bfc814cbaa7d90d8/modules/angular2/test/common/directives/ng_for_spec.ts
22
import { TestBed } from '@angular/core/testing';
33
import { Component, ViewChild } from '@angular/core';
4-
import * as Infragistics from '../../../dist/npm/igniteui.angular2';
4+
import * as Infragistics from '../../../src/igniteui.angular2';
55

66
export function main() {
77
describe('Infragistics Angular2 Dialog', () => {

‎tests/unit/igdoughnutchart/doughnutchart.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// modeled after https://github.com/angular/angular/blob/cee2318110eeea115e5f6fc5bfc814cbaa7d90d8/modules/angular2/test/common/directives/ng_for_spec.ts
22
import { TestBed } from '@angular/core/testing';
33
import { Component, ViewChild } from '@angular/core';
4-
import * as Infragistics from '../../../dist/npm/igniteui.angular2';
4+
import * as Infragistics from '../../../src/igniteui.angular2';
55

66
export function main() {
77
describe('Infragistics Angular2 DoughnutChart', () => {

‎tests/unit/igeditors/editors.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { TestBed } from '@angular/core/testing';
33
import {Component, ViewChild, TemplateRef} from '@angular/core';
44
import { FormsModule } from '@angular/forms';
5-
import * as Infragistics from '../../../dist/npm/igniteui.angular2';
5+
import * as Infragistics from '../../../src/igniteui.angular2';
66

77

88
export function main() {

0 commit comments

Comments
 (0)