Skip to content

Commit 4c57873

Browse files
committed
chore(build): move to rollup for e2e, move to es6 imports and type definitions
move to rollup for e2e, move to es6 imports and type definitions
1 parent bcec66c commit 4c57873

26 files changed

Lines changed: 233 additions & 442 deletions

‎package.json‎

Lines changed: 65 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -38,80 +38,83 @@
3838
},
3939
"devDependencies": {
4040
"@angular/compiler-cli": "0.6.2",
41-
"@types/glob": "^5.0.29",
42-
"@types/gulp": "^3.8.29",
43-
"@types/hammerjs": "^2.0.30",
44-
"@types/jasmine": "^2.2.31",
45-
"@types/merge2": "0.0.28",
46-
"@types/mkdirp": "0.3.28",
41+
"@types/connect": "3.4.30",
42+
"@types/del": "2.2.31",
43+
"@types/glob": "5.0.30",
44+
"@types/gulp": "3.8.32",
45+
"@types/gulp-watch": "4.1.29",
46+
"@types/hammerjs": "2.0.33",
47+
"@types/jasmine": "2.2.34",
48+
"@types/lodash": "4.14.35",
49+
"@types/merge2": "0.3.29",
50+
"@types/mkdirp": "0.3.29",
4751
"@types/node": "6.0.34",
48-
"@types/protractor": "^1.5.17",
49-
"@types/run-sequence": "0.0.27",
50-
"@types/semver": "5.3.29",
52+
"@types/protractor": "1.5.19",
53+
"@types/run-sequence": "0.0.28",
54+
"@types/semver": "5.3.30",
55+
"@types/serve-static": "1.7.31",
56+
"@types/through2": "2.0.29",
5157
"canonical-path": "0.0.2",
52-
"connect": "^3.3.4",
58+
"connect": "3.5.0",
5359
"core-js": "2.4.1",
54-
"cpr": "^0.4.1",
55-
"del": "^1.1.1",
56-
"dgeni": "^0.4.1",
57-
"dgeni-packages": "^0.10.18",
58-
"event-stream": "^3.3.1",
59-
"file-loader": "^0.9.0",
60-
"glob": "^7.0.6",
61-
"gulp": "^3.9.1",
62-
"gulp-autoprefixer": "^2.3.0",
63-
"gulp-clean-css": "^2.0.12",
64-
"gulp-concat": "^2.6.0",
65-
"gulp-git": "^1.11.2",
66-
"gulp-if": "^1.2.5",
67-
"gulp-remember": "^0.3.0",
68-
"gulp-rename": "~1.2.0",
69-
"gulp-sass": "^2.0.4",
70-
"gulp-scss-lint": "^0.3.9",
71-
"gulp-shell": "^0.4.0",
72-
"gulp-strip-debug": "^1.1.0",
73-
"gulp-tslint": "^5.0.0",
74-
"gulp-typescript": "^2.13.6",
75-
"gulp-util": "^3.0.6",
76-
"gulp-watch": "^4.2.4",
77-
"html-entities": "^1.1.3",
78-
"ionic-cz-conventional-changelog": "^1.0.0",
79-
"jasmine-core": "^2.4.1",
80-
"jasmine-node": "^1.14.5",
81-
"karma": "^1.1.1",
82-
"karma-browserstack-launcher": "^1.0.1",
83-
"karma-chrome-launcher": "^1.0.1",
84-
"karma-coverage": "^1.1.1",
85-
"karma-firefox-launcher": "^1.0.0",
86-
"karma-jasmine": "^1.0.2",
87-
"karma-sauce-launcher": "^1.0.0",
88-
"karma-sourcemap-loader": "^0.3.7",
89-
"merge2": "^0.3.6",
90-
"mkdirp": "^0.5.1",
60+
"cpr": "2.0.0",
61+
"del": "2.2.2",
62+
"dgeni": "0.4.2",
63+
"dgeni-packages": "0.16.0",
64+
"event-stream": "3.3.4",
65+
"file-loader": "0.9.0",
66+
"glob": "7.0.6",
67+
"gulp": "3.9.1",
68+
"gulp-autoprefixer": "3.1.1",
69+
"gulp-clean-css": "2.0.12",
70+
"gulp-concat": "2.6.0",
71+
"gulp-git": "1.11.3",
72+
"gulp-if": "2.0.1",
73+
"gulp-remember": "0.3.1",
74+
"gulp-rename": "1.2.2",
75+
"gulp-sass": "2.3.2",
76+
"gulp-scss-lint": "0.4.0",
77+
"gulp-shell": "0.5.2",
78+
"gulp-strip-debug": "1.1.0",
79+
"gulp-tslint": "6.1.1",
80+
"gulp-typescript": "2.13.6",
81+
"gulp-util": "3.0.7",
82+
"gulp-watch": "4.3.9",
83+
"html-entities": "1.2.0",
84+
"ionic-cz-conventional-changelog": "1.0.0",
85+
"jasmine-core": "2.5.2",
86+
"jasmine-node": "1.14.5",
87+
"karma": "1.3.0",
88+
"karma-chrome-launcher": "2.0.0",
89+
"karma-coverage": "1.1.1",
90+
"karma-jasmine": "1.0.2",
91+
"karma-sourcemap-loader": "0.3.7",
92+
"merge2": "1.0.2",
93+
"mkdirp": "0.5.1",
9194
"node-html-encoder": "0.0.2",
92-
"remap-istanbul": "^0.6.4",
93-
"request": "2.53.0",
94-
"resolve-bin": "^0.4.0",
95+
"remap-istanbul": "0.6.4",
96+
"request": "2.75.0",
97+
"resolve-bin": "0.4.0",
9598
"rollup": "0.36.0",
9699
"rollup-plugin-commonjs": "5.0.4",
97100
"rollup-plugin-multi-entry": "2.0.1",
98101
"rollup-plugin-node-resolve": "2.0.0",
99102
"rollup-plugin-uglify": "1.0.1",
100-
"run-sequence": "^1.1.0",
101-
"sassdoc": "^2.1.20",
102-
"semver": "^5.0.1",
103-
"serve-static": "^1.9.2",
104-
"systemjs": "^0.19.37",
105-
"through2": "^0.6.3",
106-
"ts-node": "^0.7.3",
107-
"tslint": "^3.15.1",
103+
"run-sequence": "1.2.2",
104+
"sassdoc": "2.1.20",
105+
"semver": "5.3.0",
106+
"serve-static": "1.11.1",
107+
"systemjs": "0.19.38",
108+
"through2": "2.0.1",
109+
"ts-node": "1.3.0",
110+
"tslint": "3.15.1",
108111
"tslint-ionic-rules": "0.0.5",
109112
"typescript": "rc",
110113
"uglify": "0.1.5",
111-
"vinyl": "^1.2.0",
112-
"webpack": "^2.1.0-beta.20",
113-
"webpack-dev-server": "^1.14.1",
114-
"yargs": "^3.6.0",
114+
"vinyl": "1.2.0",
115+
"webpack": "2.1.0-beta.20",
116+
"webpack-dev-server": "1.16.1",
117+
"yargs": "5.0.0",
115118
"zone.js": "0.6.21"
116119
},
117120
"config": {

‎scripts/demos/entry.ts‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎scripts/demos/index.html‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎scripts/demos/ngcConfig.json‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎scripts/demos/webpack.config.js‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎scripts/demos/webpackEntryPoints.json‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎scripts/e2e/index.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@
4343
document.body.classList.remove('rtl');
4444
}
4545
</script>
46-
<script src="/webpack-dev-server.js"></script>
47-
<script src="../../../../../../dist/ionic-angular/polyfills/polyfills.js"></script>
48-
<script src="../../../../vendor.js"></script>
49-
<script src="./index.js"></script>
46+
<script src="../../../../polyfills/polyfills.ng.js"></script>
47+
<script src="./app.bundle.js"></script>
5048
</body>
5149
</html>

‎scripts/e2e/ngcConfig.json‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎scripts/e2e/polyfills.js‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎scripts/e2e/vendor.js‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)