javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

upgrade angular

Browse Source
This commit is contained in:
Andrew
2015-04-25 11:27:36 -05:00
parent 9039297110
commit db75218201
116 changed files with 777 additions and 3970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
scripts/build/config.js
View File

@@ -2,43 +2,46 @@ module.exports = {
dist: 'dist',
distLib: 'dist/lib',
src: {
spec: ['src/**/test/*.spec.js'],
js: ['src/**/*.js', '!src/**/test/**/*.js'],
e2e: ['src/components/*/test/*/**/*'],
html: 'src/**/*.html',
scss: 'src/**/*.scss',
spec: ['ionic/**/test/*.spec.js'],
js: ['ionic/**/*.js', '!src/**/test/**/*.js'],
// Get all the non-js files and main.js
e2e: ['ionic/components/*/test/**/*'],
html: 'ionic/**/*.html',
scss: 'ionic/**/*.scss',
},
dependencies: [
'node_modules/traceur/bin/traceur.js',
'node_modules/es6-module-loader/dist/es6-module-loader.js',
'node_modules/es6-module-loader/dist/es6-module-loader.js.map',
'node_modules/systemjs/dist/system.js',
'node_modules/systemjs/dist/system.js.map',
'node_modules/systemjs/dist/system.src.js',
'node_modules/zone.js/zone.js',
'node_modules/zone.js/long-stack-trace-zone.js',
'node_modules/hammerjs/hammer.js',
'node_modules/rx/dist/rx.all.js',
],
scripts: [
'traceur.js',
'es6-module-loader.js',
'system.js',
'zone.js',
'long-stack-trace-zone.js',
'hammer.js',
{
from: 'node_modules/gulp-traceur/node_modules/traceur/bin/traceur.js',
to: 'traceur.js',
}, {
from: 'node_modules/es6-module-loader/dist/es6-module-loader.src.js',
to: 'es6-module-loader.src.js'
}, {
from: 'node_modules/systemjs/dist/system.src.js',
to: 'system.src.js'
}, {
from: 'scripts/e2e/system-init.js',
to: 'system-init.js'
}, {
from: 'node_modules/angular2/node_modules/zone.js/zone.js',
to: 'zone.js'
}, {
from: 'node_modules/angular2/node_modules/zone.js/long-stack-trace-zone.js',
to: 'long-stack-trace-zone.js'
},
'angular2.js',
'ionic2.js',
],
traceurOptions: {
'sourceMaps': true,
'annotations': true,
'types': true,
'script': false,
'memberVariables': true,
'modules': 'instantiate'
sourceMaps: true,
annotations: true,
types: true,
memberVariables: true,
modules: 'instantiate',
},
protractorPort: 8876
}
};

4
scripts/e2e/e2e-publish.js
View File

@@ -38,7 +38,7 @@ module.exports = function(options) {
};
request.post({
url: 'http://' + options.domain + '/e2e/upload-url',
templateUrl: 'http://' + options.domain + '/e2e/upload-url',
formData: formData
},
function(err, httpResponse, body) {
@@ -61,7 +61,7 @@ module.exports = function(options) {
};
request.post({
url: uploadUrl,
templateUrl: uploadUrl,
formData: formData
},
function(err, httpResponse, body) {

23
scripts/e2e/index.template.html
View File

@@ -2,25 +2,18 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta charset="UTF-8" />
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no" />
<link rel="stylesheet" href="<%= PREFIX %>/css/ionic.css" />
<% buildConfig.scripts.forEach(function(src) { %>
<script src="<%= PREFIX %>/lib/<%= src %>"></script>
<% buildConfig.scripts.forEach(function(script) {
var src = script.to || script; %><script src="<%= PREFIX %>/lib/<%= src %>"></script>
<% }); %>
<script>
System.config({
baseURL: '<%= PREFIX %>/lib',
traceurOptions: <%= JSON.stringify(buildConfig.traceurOptions) %>,
map: {
'app': location.pathname.replace(/\/(index.html)?$/,''),
'rx/dist/rx.all': 'rx.all',
}
})
System.import('app/main');
</script>
<script src="main.js"></script>
</head>
<body ion-app>
</body>
<script>
System.import('app/main').catch(console.error.bind(console));
</script>
</html>

1
scripts/e2e/system-init.js Normal file
View File

@@ -0,0 +1 @@
// register(System);