javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 11:41:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(build): move back to rxjs instead of es6 rxjs

Browse Source
This commit is contained in:
Dan Bucholtz
2016-09-19 16:22:00 -05:00
parent c337f0abed
commit da4970e176
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
package.json
View File

@ -34,7 +34,7 @@
"@angular/platform-browser-dynamic": "^2.0.0",
"@angular/platform-server": "^2.0.0",
"ionicons": "3.0.0",
"rxjs-es": "5.0.0-beta.12"
"rxjs": "5.0.0-beta.12"
},
"devDependencies": {
"@angular/compiler-cli": "0.6.2",
@ -43,9 +43,11 @@
"@types/hammerjs": "^2.0.30",
"@types/jasmine": "^2.2.31",
"@types/merge2": "0.0.28",
"@types/node": "^6.0.34",
"@types/mkdirp": "0.3.28",
"@types/node": "6.0.34",
"@types/protractor": "^1.5.17",
"@types/run-sequence": "0.0.27",
"@types/semver": "5.3.29",
"canonical-path": "0.0.2",
"connect": "^3.3.4",
"core-js": "2.4.1",
@ -90,13 +92,12 @@
"remap-istanbul": "^0.6.4",
"request": "2.53.0",
"resolve-bin": "^0.4.0",
"rollup": "0.35.11",
"rollup-plugin-commonjs": "4.1.0",
"rollup": "0.36.0",
"rollup-plugin-commonjs": "5.0.4",
"rollup-plugin-multi-entry": "2.0.1",
"rollup-plugin-node-resolve": "2.0.0",
"rollup-plugin-uglify": "1.0.1",
"run-sequence": "^1.1.0",
"rxjs": "5.0.0-beta.12",
"sassdoc": "^2.1.20",
"semver": "^5.0.1",
"serve-static": "^1.9.2",
@ -106,7 +107,7 @@
"tslint": "^3.15.1",
"tslint-ionic-rules": "0.0.5",
"typescript": "rc",
"uglify": "^0.1.5",
"uglify": "0.1.5",
"vinyl": "^1.2.0",
"webpack": "^2.1.0-beta.20",
"webpack-dev-server": "^1.14.1",

4
scripts/gulp/tasks/release.ts
View File

@ -93,12 +93,10 @@ task('release.preparePackageJsonTemplate', () => {
// copy source dependencies versions to the template's peerDependencies
// only copy dependencies that show up as peerDependencies in the template
for (let dependency in sourcePackageJSON.dependencies) {
// if the dependency is in both, AND the value of the entry is empty, copy it over
if (dependency in templatePackageJSON.dependencies && templatePackageJSON.dependencies[dependency] === '') {
templatePackageJSON.dependencies[dependency] = sourcePackageJSON.dependencies[dependency];
} else if (dependency === 'rxjs') {
const value = sourcePackageJSON.dependencies[dependency];
templatePackageJSON.dependencies['rxjs-es'] = value;
}
}

2
scripts/npm/package.json
View File

@ -19,6 +19,6 @@
"@angular/platform-browser": "",
"@angular/platform-browser-dynamic": "",
"@angular/platform-server": "",
"rxjs-es": ""
"rxjs": ""
}
}