14 Commits

Author SHA1 Message Date
4cd5834cfd Merge branch 'master' into v4
# Conflicts:
#	.scss-lint.yml
#	README.md
#	scripts/gulp/tasks/e2e.dev.ts
#	scripts/gulp/util.ts
#	src/components/action-sheet/action-sheet-component.ts
#	src/components/card/card.ios.scss
#	src/components/card/card.md.scss
#	src/components/card/card.wp.scss
#	src/components/card/test/map/main.html
#	src/components/card/test/social/main.html
#	src/components/slides/slides.scss
#	src/components/slides/slides.ts
#	src/components/toggle/toggle.ios.scss
#	src/components/toggle/toggle.ts
#	src/themes/ionic.mixins.scss
2017-06-12 13:33:33 -04:00
ad40b3b86b chore(scripts): normalize paths and include typeRoots for Windows (#11933)
Short description of what this resolves:

Allows our e2e tests to run on a Windows machine

Changes proposed in this pull request:

Normalize paths using path.join()
Add typeRoots to the root tsconfig file
Change the spawnedCommand based on the OS
Fixes: #11551
2017-06-05 18:57:05 -04:00
897ab203ab fix(): change e2e.prod so that it copies the core files. 2017-05-19 16:25:37 -05:00
4003b6f62b chore(): ensure scripts match v4 2017-05-18 11:39:58 -05:00
ee3d943116 chore(gulp): add a new task that opens the built prod e2e test 2017-04-28 13:55:24 -04:00
fbed3c5b04 chore(e2e): catch errors from app-scripts to continue
also return empty array so that if the exact folder isn’t matched it
won’t continue to filter and run tests. For example, if you pass
`--f=toolbar/color` it will error because that doesn't exist, but still
tries to run `toolbar/colors`.
2017-03-17 11:06:46 -04:00
ae56039ba1 chore(e2e): log an error if the test doesn't exist, add concurrency arg
- If the e2e test doesn’t exist then throw an error
- Don’t log anything if no tests are being built
- Add concurrency arg to change the number of tests being ran at once
2017-03-16 15:56:43 -04:00
c90fcb07e7 chore(e2e): add --dev option to e2e.prod to speed up builds for faster but less thorough verification 2017-03-09 12:13:36 -06:00
0d32e5e791 chore(gulp): updates to build process to use app-scripts for watch/build
updates to build process to use app-scripts for watch/build
2017-03-02 14:28:15 -06:00
555519da62 chore(deps): update to Angular 2.4.8
* chore(angular): update to latest stable angular

* chore(deps): update app-scripts

* chore(deps): sw-toolbox

* chore(deps): bump to 1.1.1 app-scripts

* chore(deps): abc order sw-toolbox

* chore(deps): update to angular 2.4.8

* chore(build): pass appNgModule path to app-scripts, make run AoT instead of Prod when using --debug

pass appNgModule path to app-scripts, make run AoT instead of Prod when using --debug
2017-02-21 16:43:38 -06:00
c8c90572bc chore(scripts): update e2e prod build to work with ionic-app-scripts (#10083)
* chore(e2e): WIP to add files needed for app-scripts

* chore(e2e): WIP one e2e test building but with errors

* chore(e2e): move e2e.prod to working with app-scripts

move shared functions into util, add support for debug flag when
running e2e.prod / demos.prod which gets passed to app-scripts

* chore(build): fix app-scripts build for all e2e and demos

* chore(e2e): update ionic-angular import path

* chore(build): update dev paths to work with prod

* chore(e2e): get watch working with e2e prod

* docs(scripts): update README for running e2e and demos

closes #8411
closes #10023
2017-01-19 11:09:57 -05:00
d252fa49e5 chore(e2e): rename app-module.ts to app.module.ts for consistency
references #10023
2017-01-13 15:16:24 -05:00
b69eed5220 chore(demos): update demos build task to use app-scripts (#9830)
* chore(build): WIP getting ionic working with app-scripts

the tsconfig file change is just for testing, this will need to be
undone

* chore(demos): update tsconfig and gitignore for demos

update tsconfig and gitinogre for demos

* chore(build): WIP check in progress with building with app-scripts

this only works with demos/action-sheet currently

* refactor(demos): add custom copy config

add custom copy config

* chore(tsconfig): revert root tsconfig

* chore(demos): change import paths

* chore(demos): move sass config, add new tsconfig, update template

* chore(scripts): update demos tasks to use app scripts with folder name

tweak the createTempTsConfig function to include a path to read from,
move getFolderInfo into util to share

at this point you should be able to run `gulp demos.prod` with a folder
e.g. `--f=alert` and open the index of that test to see it. Doesn’t
work yet with all of the tests at once. Need to have ran `gulp
release.prepareReleasePackage` first.

* chore(build): WIP working on getting all of the demos building

* chore(demos): update demos task for app-scripts build

* chore(demos): fix tslint errors thrown by app-scripts

* chore(demos): get the demos working with fonts and variable file

* chore(demos): add watch task to the new prod task

* chore(demos): remove old demos.prod file and rename new one to it

* chore(npm): remove build npm script

* chore(demos): only log component name in url if one was passed
2017-01-03 10:23:14 -06:00
d93070a7d5 chore(gulp): update e2e and snapshot (#8846)
* chore(e2e): add livereload server and clean task for e2e

* chore(e2e): refactor to use gulp connect and open

* chore(e2e): WIP remove open, add formatting, add reload task

* wip(e2e): use SystemJS for faster dev e2e rebuilds

* chore(e2e): wip removing old gulp file, old e2e task

update template for e2e and port number

* chore(e2e): wip add SystemJS for dev build of e2e, use those tasks instead

* chore(e2e): uncomment out range components

* chore(e2e): wip fix paths for the e2e tempate

* chore(scripts): update README back to the old way

* chore(e2e): code cleanup

* chore(e2e): split tasks into dev and prod, put common tasks in e2e

* chore(e2e): rename e2e templates and add to readme

* chore(e2e): fix dev build so it will work with snapshot

* chore(snapshot): get snapshot working with dev and prod builds
2016-10-21 23:59:20 +02:00