chore(build): rename ionic directory to src and update all references…

… in the build process.

.scss-lint.yml

@@ -3,11 +3,11 @@
 # See config at https://github.com/brigade/scss-lint/blob/master/config/default.yml
 
 exclude:
-  - 'ionic/components/slides/**'
-  - 'ionic/components/show-hide-when/**'
-  - 'ionic/components.*.scss'
-  - 'ionic/util/*.scss'
-  - 'ionic/platform/cordova.*.scss'
+  - 'src/components/slides/**'
+  - 'src/components/show-hide-when/**'
+  - 'src/components.*.scss'
+  - 'src/util/*.scss'
+  - 'src/platform/cordova.*.scss'
 
 
 linters:

demos/app.ios.scss

@@ -1 +1 @@
-@import "../ionic/ionic.ios";
+@import "../src/ionic.ios";

demos/app.md.scss

@@ -1 +1 @@
-@import "../ionic/ionic.md";
+@import "../src/ionic.md";

demos/output.ios.scss

@@ -33,4 +33,4 @@ $colors: (
   bright:     #FFC125
 );
 
-@import "../ionic/ionic.ios";
+@import "../src/ionic.ios";

demos/output.md.scss

@@ -33,4 +33,4 @@ $colors: (
   bright:     #FFC125
 );
 
-@import "../ionic/ionic.md";
+@import "../src/ionic.md";

gulpfile.js

@@ -86,9 +86,9 @@ gulp.task('watch', ['build'], function() {
 
 function watchTask(task){
   watch([
-      'ionic/**/*.ts',
-      '!ionic/components/*/test/**/*',
-      '!ionic/util/test/*'
+      'src/**/*.ts',
+      '!src/components/*/test/**/*',
+      '!src/util/test/*'
     ],
     function(file) {
       if (file.event === "unlink") {
@@ -99,7 +99,7 @@ function watchTask(task){
     }
   );
 
-  watch('ionic/**/*.scss', function() {
+  watch('src/**/*.scss', function() {
     gulp.start('sass');
   });
 
@@ -201,7 +201,7 @@ gulp.task('bundle.system', function(){
   var tsResult = tsCompile(getTscOptions('es6'), 'system')
     .pipe(babel(babelOptions));
 
-  var swiper = gulp.src('ionic/components/slides/swiper-widget.system.js');
+  var swiper = gulp.src('src/components/slides/swiper-widget.system.js');
 
   return merge([tsResult, swiper])
     .pipe(remember('system'))
@@ -246,13 +246,13 @@ gulp.task('transpile', function(){
 function tsCompile(options, cacheName){
   return gulp.src([
       'typings/main.d.ts',
-      'ionic/**/*.ts',
-      '!ionic/**/*.d.ts',
-      '!ionic/components/*/test/**/*',
-      '!ionic/util/test/*',
-      '!ionic/config/test/*',
-      '!ionic/platform/test/*',
-      '!ionic/**/*.spec.ts'
+      'src/**/*.ts',
+      '!src/**/*.d.ts',
+      '!src/components/*/test/**/*',
+      '!src/util/test/*',
+      '!src/config/test/*',
+      '!src/platform/test/*',
+      '!src/**/*.spec.ts'
     ])
     .pipe(cache(cacheName, { optimizeMemory: true }))
     .pipe(tsc(options, undefined, tscReporter));
@@ -267,10 +267,10 @@ gulp.task('sass', function() {
   var minifyCss = require('gulp-minify-css');
 
   gulp.src([
-    'ionic/ionic.ios.scss',
-    'ionic/ionic.md.scss',
-    'ionic/ionic.wp.scss',
-    'ionic/ionic.scss'
+    'src/ionic.ios.scss',
+    'src/ionic.md.scss',
+    'src/ionic.wp.scss',
+    'src/ionic.scss'
   ])
   .pipe(sass({
       includePaths: [__dirname + '/node_modules/ionicons/dist/scss/'],
@@ -312,7 +312,7 @@ gulp.task('sass.themes', function() {
  */
 gulp.task('fonts', function() {
   gulp.src([
-    'ionic/fonts/*.+(ttf|woff|woff2)',
+    'src/fonts/*.+(ttf|woff|woff2)',
     'node_modules/ionicons/dist/fonts/*.+(ttf|woff|woff2)'
    ])
     .pipe(gulp.dest('dist/fonts'));
@@ -323,9 +323,9 @@ gulp.task('fonts', function() {
  */
 gulp.task('copy.scss', function() {
   return gulp.src([
-      'ionic/**/*.scss',
-      '!ionic/components/*/test/**/*',
-      '!ionic/util/test/*'
+      'src/**/*.scss',
+      '!src/components/*/test/**/*',
+      '!src/util/test/*'
     ])
     .pipe(gulp.dest('dist'));
 });
@@ -337,9 +337,9 @@ gulp.task('lint.scss', function() {
   var scsslint = require('gulp-scss-lint');
 
   return gulp.src([
-      'ionic/**/*.scss',
-      '!ionic/components/*/test/**/*',
-      '!ionic/util/test/*'
+      'src/**/*.scss',
+      '!src/components/*/test/**/*',
+      '!src/util/test/*'
     ])
     .pipe(scsslint())
     .pipe(scsslint.failReporter());
@@ -363,8 +363,8 @@ gulp.task('copy.libs', function() {
 
   // for swiper-widget
   var libs = gulp.src([
-      'ionic/**/*.js',
-      'ionic/**/*.d.ts'
+      'src/**/*.js',
+      'src/**/*.d.ts'
     ])
     .pipe(gulp.dest('dist'));
 
@@ -383,7 +383,7 @@ gulp.task('copy.libs', function() {
 gulp.task('watch.e2e', ['e2e'], function() {
   watchTask('bundle.system');
 
-  watch('ionic/components/*/test/**/*', function(file) {
+  watch('src/components/*/test/**/*', function(file) {
     gulp.start('e2e.build');
   });
 });
@@ -419,8 +419,8 @@ gulp.task('e2e.build', function() {
 
   // Get each test folder with gulp.src
   var tsResult = gulp.src([
-      'ionic/components/*/test/*/**/*.ts',
-      '!ionic/components/*/test/*/**/*.spec.ts'
+      'src/components/*/test/*/**/*.ts',
+      '!src/components/*/test/*/**/*.spec.ts'
     ])
     .pipe(cache('e2e.ts'))
     .pipe(tsc(getTscOptions(), undefined, tscReporter))
@@ -431,8 +431,8 @@ gulp.task('e2e.build', function() {
     .pipe(gulpif(/e2e.js$/, createPlatformTests()))
 
   var testFiles = gulp.src([
-      'ionic/components/*/test/*/**/*',
-      '!ionic/components/*/test/*/**/*.ts'
+      'src/components/*/test/*/**/*',
+      '!src/components/*/test/*/**/*.ts'
     ])
     .pipe(cache('e2e.files'))
 
@@ -461,7 +461,7 @@ gulp.task('e2e.build', function() {
   function createPlatformTests(file) {
     return through2.obj(function(file, enc, next) {
       var self = this;
-      var relativePath = path.dirname(file.path.replace(/^.*?ionic(\/|\\)components(\/|\\)/, ''));
+      var relativePath = path.dirname(file.path.replace(/^.*?src(\/|\\)components(\/|\\)/, ''));
       relativePath = relativePath.replace('/test/', '/');
       var contents = file.contents.toString();
       platforms.forEach(function(platform) {
@@ -486,7 +486,7 @@ gulp.task('e2e.build', function() {
  * Builds Ionic unit tests to dist/tests.
  */
 gulp.task('tests', function() {
-  return gulp.src('ionic/**/test/**/*.spec.ts')
+  return gulp.src('src/**/test/**/*.spec.ts')
     .pipe(cache('tests'))
     .pipe(tsc(getTscOptions(), undefined, tscReporter))
     .pipe(rename(function(file) {
@@ -497,7 +497,7 @@ gulp.task('tests', function() {
 });
 
 gulp.task('watch.tests', ['tests'], function(){
-  watch('ionic/**/test/**/*.spec.ts', function(){
+  watch('src/**/test/**/*.spec.ts', function(){
     gulp.start('tests');
   });
 });
@@ -983,8 +983,8 @@ gulp.task('validate', function(done) {
 gulp.task('tslint', function() {
   var tslint = require('gulp-tslint');
   return gulp.src([
-      'ionic/**/*.ts',
-      '!ionic/**/test/**/*',
+      'src/**/*.ts',
+      '!src/**/test/**/*',
     ]).pipe(tslint())
       .pipe(tslint.report('verbose'));
 });

scripts/build/config.js

@@ -2,13 +2,13 @@
 module.exports = {
   dist: 'dist',
   src: {
-    spec: ['ionic/**/test/*.spec.js'],
-    js: ['ionic/**/*.js'],
+    spec: ['src/**/test/*.spec.js'],
+    js: ['src/**/*.js'],
 
     // Get all the non-js files and main.js
-    e2e: ['ionic/components/*/test/*/**/*'],
-    html: 'ionic/**/*.html',
-    scss: 'ionic/**/*.scss',
+    e2e: ['src/components/*/test/*/**/*'],
+    html: 'src/**/*.html',
+    scss: 'src/**/*.scss',
   },
 
   scripts: [

scripts/demos/index.template.html

@@ -18,19 +18,5 @@
   </ion-app>
 
   <script src="bundle.js"></script>
-  <!-- <script src="../../js/ionic.bundle.js"></script>
-
-  <script>
-    System.config({
-      "paths": {
-        "*": "*.js",
-        "ionic/*": "ionic/*",
-        "angular2/*": "angular2/*",
-        "rx": "rx"
-      }
-    })
-    System.import("index");
-  </script> -->
-
 </body>
 </html>

scripts/docs/dgeni-config.js

@@ -94,13 +94,13 @@ module.exports = function(currentVersion) {
     docTypes: ['class', 'var', 'function', 'let'],
     getOutputPath: function(doc) {
       // strip ionic from path root
-      var docPath = doc.fileInfo.relativePath.replace(/^ionic\//, '');
+      var docPath = doc.fileInfo.relativePath.replace(/^src\//, '');
       // remove filename since we have multiple docTypes per file
       docPath = docPath.substring(0, docPath.lastIndexOf('/') + 1);
       docPath += doc.name + '/index.md';
       var path = config.v2DocsDir + '/' + (versionData.current.folder || '') +
                      '/api/' +  docPath;
-      path = path.replace('/home/ubuntu/ionic/ionic', '')
+                     path = path.replace('/home/ubuntu/ionic/src', '')
                     return path;
     }
   }];
@@ -115,7 +115,7 @@ module.exports = function(currentVersion) {
 
   readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../..'));
   readTypeScriptModules.sourceFiles = [
-    'ionic/index.ts'
+    'src/index.ts'
   ];
 })
 

scripts/docs/gulp-tasks.js

@@ -55,7 +55,7 @@ module.exports = function(gulp, flags) {
       });
     }
 
-    return gulp.src('ionic/**/*.scss')
+    return gulp.src('src/**/*.scss')
       .pipe(es.map(function(file, callback) {
         var contents = file.contents.toString();
         var variableLine, variableName, defaultValue, multiline;

scripts/docs/processors/jekyll.js

@@ -19,7 +19,7 @@ module.exports = function jekyll(renderDocsProcessor) {
       docs.forEach(function(doc, i) {
         docs[i].URL = doc.outputPath.replace('docs/v2//','docs/v2/')
                                     .replace('/index.md','')
-                                    .replace('//home/ubuntu/ionic/ionic', '')
+                                    .replace('//home/ubuntu/ionic/src', '')
                                     .replace('//', '/');
         if (docs[i].relativePath) {
           docs[i].relativePath = doc.relativePath

scripts/e2e/ionic.ios.dark.scss

@@ -1,6 +1,6 @@
 
 // For E2E dark theme tests
 
-@import "../../ionic/themes/dark.ios.scss";
+@import "../../src/themes/dark.ios.scss";
 
-@import "../../ionic/ionic.ios.scss";
+@import "../../src/ionic.ios.scss";

scripts/e2e/ionic.md.dark.scss

@@ -1,6 +1,6 @@
 
 // For E2E dark theme tests
 
-@import "../../ionic/themes/dark.md.scss";
+@import "../../src/themes/dark.md.scss";
 
-@import "../../ionic/ionic.md.scss";
+@import "../../src/ionic.md.scss";

scripts/e2e/ionic.wp.dark.scss

@@ -1,6 +1,6 @@
 
 // For E2E dark theme tests
 
-@import "../../ionic/themes/dark.wp.scss";
+@import "../../src/themes/dark.wp.scss";
 
-@import "../../ionic/ionic.wp.scss";
+@import "../../src/ionic.wp.scss";

scripts/e2e/webpack.config.js

@@ -1,8 +1,8 @@
 module.exports = {
   externals: [
     {
-      'ionic/ionic': {
-        commonjs2: 'ionic/ionic'
+      'src/ionic': {
+        commonjs2: 'src/ionic'
       },
       '@angular/core': {
         commonjs2: ['angular2', 'core']

scripts/karma/karma.conf.js

@@ -25,7 +25,7 @@ module.exports = function(config) {
       'scripts/karma/test-main.js'
     ],
 
-    exclude: ['ionic/components/*/test/*/**/*'],
+    exclude: ['src/components/*/test/*/**/*'],
 
     logLevel: 'warn',
 

scripts/karma/system.config.js

@@ -1,7 +1,7 @@
 System.config({
   baseURL: '/base',
   map: {
-    'ionic-angular': 'ionic',
+    'ionic-angular': 'src',
     '@angular': 'node_modules/@angular',
   },
   packages: {

ionic/components/alert/test/dismiss/index.ts → src/components/alert/test/dismiss/index.ts

@@ -1,4 +1,4 @@
-import { Alert, Loading, NavController, App, Page } from '../../../../../ionic/index';
+import { Alert, Loading, NavController, App, Page } from '../../../../index';
 import { FORM_DIRECTIVES, FormBuilder, ControlGroup, Validators } from '@angular/common';
 
 
@@ -161,4 +161,4 @@ class E2EApp {
   constructor() {
     this.root = E2EPage;
   }
-}
+}

ionic/components/datetime/test/datetime.spec.ts → src/components/datetime/test/datetime.spec.ts

@@ -1,5 +1,5 @@
-import {DateTime, Form, Picker, Config, NavController} from '../../../../ionic';
-import * as datetime from '../../../../ionic/util/datetime-util';
+import {DateTime, Form, Picker, Config, NavController} from '../../../../src';
+import * as datetime from '../../../../src/util/datetime-util';
 
 export function run() {