diff --git a/lerna.json b/lerna.json index 8161747e44..916011d1cc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,8 @@ { "lerna": "2.0.0-rc.5", "packages": [ - "packages/*" + "packages/*", + "packages/demos/*" ], "commands": { "bootstrap": { diff --git a/packages/angular/demo/.angular-cli.json b/packages/demos/angular/.angular-cli.json similarity index 100% rename from packages/angular/demo/.angular-cli.json rename to packages/demos/angular/.angular-cli.json diff --git a/packages/angular/demo/.editorconfig b/packages/demos/angular/.editorconfig similarity index 100% rename from packages/angular/demo/.editorconfig rename to packages/demos/angular/.editorconfig diff --git a/packages/angular/demo/.gitignore b/packages/demos/angular/.gitignore similarity index 100% rename from packages/angular/demo/.gitignore rename to packages/demos/angular/.gitignore diff --git a/packages/angular/demo/README.md b/packages/demos/angular/README.md similarity index 69% rename from packages/angular/demo/README.md rename to packages/demos/angular/README.md index 443dd367d8..f987973784 100644 --- a/packages/angular/demo/README.md +++ b/packages/demos/angular/README.md @@ -13,7 +13,7 @@ To use _this_ application perform the following commands from this directory: - `npm test` - to run the unit tests - `npm run e2e` - to run the end to end tests -See the `package.json` file for a complete list of script. The above are just the most common. +See the `package.json` file for a complete list of scripts. The above are just the most common. ## Running the Angular CLI @@ -24,8 +24,10 @@ This application installs the Angular CLI locally so you do not need to have it ## Testing Local Changes -In order to test local core changes, use `npm link` as such: +In order to test local changes they need to be copied into `node_modules` after the initial `npm i` 1. In `packages/core`, run `npm run build` -2. In `packages/core`, run `npm link` -3. In `packages/angular/demo`, run `npm link @ionic/core` +1. In `packages/demos/angular`, run `rm -rf node_modules/\@ionic/core/dist` +1. In `packages/demos/angular`, run `cp -r ../../core/dist node_modules/\@ionic/core/dist` + +Use a similar procedure if you want to test local changes to `@ionic/angular` diff --git a/packages/angular/demo/e2e/basic-inputs.e2e-spec.ts b/packages/demos/angular/e2e/basic-inputs.e2e-spec.ts similarity index 100% rename from packages/angular/demo/e2e/basic-inputs.e2e-spec.ts rename to packages/demos/angular/e2e/basic-inputs.e2e-spec.ts diff --git a/packages/angular/demo/e2e/basic-inputs.po.ts b/packages/demos/angular/e2e/basic-inputs.po.ts similarity index 100% rename from packages/angular/demo/e2e/basic-inputs.po.ts rename to packages/demos/angular/e2e/basic-inputs.po.ts diff --git a/packages/angular/demo/e2e/group-inputs.e2e-spec.ts b/packages/demos/angular/e2e/group-inputs.e2e-spec.ts similarity index 100% rename from packages/angular/demo/e2e/group-inputs.e2e-spec.ts rename to packages/demos/angular/e2e/group-inputs.e2e-spec.ts diff --git a/packages/angular/demo/e2e/group-inputs.po.ts b/packages/demos/angular/e2e/group-inputs.po.ts similarity index 100% rename from packages/angular/demo/e2e/group-inputs.po.ts rename to packages/demos/angular/e2e/group-inputs.po.ts diff --git a/packages/angular/demo/e2e/home.e2e-spec.ts b/packages/demos/angular/e2e/home.e2e-spec.ts similarity index 100% rename from packages/angular/demo/e2e/home.e2e-spec.ts rename to packages/demos/angular/e2e/home.e2e-spec.ts diff --git a/packages/angular/demo/e2e/home.po.ts b/packages/demos/angular/e2e/home.po.ts similarity index 100% rename from packages/angular/demo/e2e/home.po.ts rename to packages/demos/angular/e2e/home.po.ts diff --git a/packages/angular/demo/e2e/tsconfig.e2e.json b/packages/demos/angular/e2e/tsconfig.e2e.json similarity index 100% rename from packages/angular/demo/e2e/tsconfig.e2e.json rename to packages/demos/angular/e2e/tsconfig.e2e.json diff --git a/packages/angular/demo/karma.conf.js b/packages/demos/angular/karma.conf.js similarity index 100% rename from packages/angular/demo/karma.conf.js rename to packages/demos/angular/karma.conf.js diff --git a/packages/angular/demo/package-lock.json b/packages/demos/angular/package-lock.json similarity index 100% rename from packages/angular/demo/package-lock.json rename to packages/demos/angular/package-lock.json diff --git a/packages/angular/demo/package.json b/packages/demos/angular/package.json similarity index 97% rename from packages/angular/demo/package.json rename to packages/demos/angular/package.json index e88e0f95b6..fed82dccf3 100644 --- a/packages/angular/demo/package.json +++ b/packages/demos/angular/package.json @@ -1,5 +1,5 @@ { - "name": "demo", + "name": "@ionic/angular-demo", "version": "0.0.0", "license": "MIT", "scripts": { diff --git a/packages/angular/demo/protractor.conf.js b/packages/demos/angular/protractor.conf.js similarity index 100% rename from packages/angular/demo/protractor.conf.js rename to packages/demos/angular/protractor.conf.js diff --git a/packages/angular/demo/src/app/alert/alert-page.component.ts b/packages/demos/angular/src/app/alert/alert-page.component.ts similarity index 100% rename from packages/angular/demo/src/app/alert/alert-page.component.ts rename to packages/demos/angular/src/app/alert/alert-page.component.ts diff --git a/packages/angular/demo/src/app/alert/alert-routing.module.ts b/packages/demos/angular/src/app/alert/alert-routing.module.ts similarity index 100% rename from packages/angular/demo/src/app/alert/alert-routing.module.ts rename to packages/demos/angular/src/app/alert/alert-routing.module.ts diff --git a/packages/angular/demo/src/app/alert/alert.module.ts b/packages/demos/angular/src/app/alert/alert.module.ts similarity index 100% rename from packages/angular/demo/src/app/alert/alert.module.ts rename to packages/demos/angular/src/app/alert/alert.module.ts diff --git a/packages/angular/demo/src/app/app-routing.module.ts b/packages/demos/angular/src/app/app-routing.module.ts similarity index 100% rename from packages/angular/demo/src/app/app-routing.module.ts rename to packages/demos/angular/src/app/app-routing.module.ts diff --git a/packages/angular/demo/src/app/app.component.css b/packages/demos/angular/src/app/app.component.css similarity index 100% rename from packages/angular/demo/src/app/app.component.css rename to packages/demos/angular/src/app/app.component.css diff --git a/packages/angular/demo/src/app/app.component.html b/packages/demos/angular/src/app/app.component.html similarity index 100% rename from packages/angular/demo/src/app/app.component.html rename to packages/demos/angular/src/app/app.component.html diff --git a/packages/angular/demo/src/app/app.component.spec.ts b/packages/demos/angular/src/app/app.component.spec.ts similarity index 100% rename from packages/angular/demo/src/app/app.component.spec.ts rename to packages/demos/angular/src/app/app.component.spec.ts diff --git a/packages/angular/demo/src/app/app.component.ts b/packages/demos/angular/src/app/app.component.ts similarity index 100% rename from packages/angular/demo/src/app/app.component.ts rename to packages/demos/angular/src/app/app.component.ts diff --git a/packages/angular/demo/src/app/app.module.ts b/packages/demos/angular/src/app/app.module.ts similarity index 100% rename from packages/angular/demo/src/app/app.module.ts rename to packages/demos/angular/src/app/app.module.ts diff --git a/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page-routing.module.ts b/packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page-routing.module.ts similarity index 100% rename from packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page-routing.module.ts rename to packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page-routing.module.ts diff --git a/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.html b/packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.html similarity index 100% rename from packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.html rename to packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.html diff --git a/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.scss b/packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.scss similarity index 100% rename from packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.scss rename to packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.scss diff --git a/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.spec.ts b/packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.spec.ts similarity index 100% rename from packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.spec.ts rename to packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.spec.ts diff --git a/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.ts b/packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.ts similarity index 100% rename from packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.component.ts rename to packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.ts diff --git a/packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.module.ts b/packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page.module.ts similarity index 100% rename from packages/angular/demo/src/app/basic-inputs-page/basic-inputs-page.module.ts rename to packages/demos/angular/src/app/basic-inputs-page/basic-inputs-page.module.ts diff --git a/packages/angular/demo/src/app/group-inputs-page/group-inputs-page-routing.module.ts b/packages/demos/angular/src/app/group-inputs-page/group-inputs-page-routing.module.ts similarity index 100% rename from packages/angular/demo/src/app/group-inputs-page/group-inputs-page-routing.module.ts rename to packages/demos/angular/src/app/group-inputs-page/group-inputs-page-routing.module.ts diff --git a/packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.html b/packages/demos/angular/src/app/group-inputs-page/group-inputs-page.component.html similarity index 100% rename from packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.html rename to packages/demos/angular/src/app/group-inputs-page/group-inputs-page.component.html diff --git a/packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.scss b/packages/demos/angular/src/app/group-inputs-page/group-inputs-page.component.scss similarity index 100% rename from packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.scss rename to packages/demos/angular/src/app/group-inputs-page/group-inputs-page.component.scss diff --git a/packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.spec.ts b/packages/demos/angular/src/app/group-inputs-page/group-inputs-page.component.spec.ts similarity index 100% rename from packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.spec.ts rename to packages/demos/angular/src/app/group-inputs-page/group-inputs-page.component.spec.ts diff --git a/packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.ts b/packages/demos/angular/src/app/group-inputs-page/group-inputs-page.component.ts similarity index 100% rename from packages/angular/demo/src/app/group-inputs-page/group-inputs-page.component.ts rename to packages/demos/angular/src/app/group-inputs-page/group-inputs-page.component.ts diff --git a/packages/angular/demo/src/app/group-inputs-page/group-inputs-page.module.ts b/packages/demos/angular/src/app/group-inputs-page/group-inputs-page.module.ts similarity index 100% rename from packages/angular/demo/src/app/group-inputs-page/group-inputs-page.module.ts rename to packages/demos/angular/src/app/group-inputs-page/group-inputs-page.module.ts diff --git a/packages/angular/demo/src/app/home-page/home-page-routing.module.ts b/packages/demos/angular/src/app/home-page/home-page-routing.module.ts similarity index 100% rename from packages/angular/demo/src/app/home-page/home-page-routing.module.ts rename to packages/demos/angular/src/app/home-page/home-page-routing.module.ts diff --git a/packages/angular/demo/src/app/home-page/home-page.component.html b/packages/demos/angular/src/app/home-page/home-page.component.html similarity index 100% rename from packages/angular/demo/src/app/home-page/home-page.component.html rename to packages/demos/angular/src/app/home-page/home-page.component.html diff --git a/packages/angular/demo/src/app/home-page/home-page.component.scss b/packages/demos/angular/src/app/home-page/home-page.component.scss similarity index 100% rename from packages/angular/demo/src/app/home-page/home-page.component.scss rename to packages/demos/angular/src/app/home-page/home-page.component.scss diff --git a/packages/angular/demo/src/app/home-page/home-page.component.spec.ts b/packages/demos/angular/src/app/home-page/home-page.component.spec.ts similarity index 100% rename from packages/angular/demo/src/app/home-page/home-page.component.spec.ts rename to packages/demos/angular/src/app/home-page/home-page.component.spec.ts diff --git a/packages/angular/demo/src/app/home-page/home-page.component.ts b/packages/demos/angular/src/app/home-page/home-page.component.ts similarity index 100% rename from packages/angular/demo/src/app/home-page/home-page.component.ts rename to packages/demos/angular/src/app/home-page/home-page.component.ts diff --git a/packages/angular/demo/src/app/home-page/home-page.module.ts b/packages/demos/angular/src/app/home-page/home-page.module.ts similarity index 100% rename from packages/angular/demo/src/app/home-page/home-page.module.ts rename to packages/demos/angular/src/app/home-page/home-page.module.ts diff --git a/packages/angular/demo/src/assets/.gitkeep b/packages/demos/angular/src/assets/.gitkeep similarity index 100% rename from packages/angular/demo/src/assets/.gitkeep rename to packages/demos/angular/src/assets/.gitkeep diff --git a/packages/angular/demo/src/environments/environment.prod.ts b/packages/demos/angular/src/environments/environment.prod.ts similarity index 100% rename from packages/angular/demo/src/environments/environment.prod.ts rename to packages/demos/angular/src/environments/environment.prod.ts diff --git a/packages/angular/demo/src/environments/environment.ts b/packages/demos/angular/src/environments/environment.ts similarity index 100% rename from packages/angular/demo/src/environments/environment.ts rename to packages/demos/angular/src/environments/environment.ts diff --git a/packages/angular/demo/src/favicon.ico b/packages/demos/angular/src/favicon.ico similarity index 100% rename from packages/angular/demo/src/favicon.ico rename to packages/demos/angular/src/favicon.ico diff --git a/packages/angular/demo/src/index.html b/packages/demos/angular/src/index.html similarity index 100% rename from packages/angular/demo/src/index.html rename to packages/demos/angular/src/index.html diff --git a/packages/angular/demo/src/main.ts b/packages/demos/angular/src/main.ts similarity index 100% rename from packages/angular/demo/src/main.ts rename to packages/demos/angular/src/main.ts diff --git a/packages/angular/demo/src/polyfills.ts b/packages/demos/angular/src/polyfills.ts similarity index 100% rename from packages/angular/demo/src/polyfills.ts rename to packages/demos/angular/src/polyfills.ts diff --git a/packages/angular/demo/src/styles.scss b/packages/demos/angular/src/styles.scss similarity index 100% rename from packages/angular/demo/src/styles.scss rename to packages/demos/angular/src/styles.scss diff --git a/packages/angular/demo/src/test.ts b/packages/demos/angular/src/test.ts similarity index 100% rename from packages/angular/demo/src/test.ts rename to packages/demos/angular/src/test.ts diff --git a/packages/angular/demo/src/tsconfig.app.json b/packages/demos/angular/src/tsconfig.app.json similarity index 100% rename from packages/angular/demo/src/tsconfig.app.json rename to packages/demos/angular/src/tsconfig.app.json diff --git a/packages/angular/demo/src/tsconfig.spec.json b/packages/demos/angular/src/tsconfig.spec.json similarity index 100% rename from packages/angular/demo/src/tsconfig.spec.json rename to packages/demos/angular/src/tsconfig.spec.json diff --git a/packages/angular/demo/src/typings.d.ts b/packages/demos/angular/src/typings.d.ts similarity index 100% rename from packages/angular/demo/src/typings.d.ts rename to packages/demos/angular/src/typings.d.ts diff --git a/packages/angular/demo/testing/router-stubs.ts b/packages/demos/angular/testing/router-stubs.ts similarity index 100% rename from packages/angular/demo/testing/router-stubs.ts rename to packages/demos/angular/testing/router-stubs.ts diff --git a/packages/angular/demo/tsconfig.json b/packages/demos/angular/tsconfig.json similarity index 100% rename from packages/angular/demo/tsconfig.json rename to packages/demos/angular/tsconfig.json diff --git a/packages/angular/demo/tslint.json b/packages/demos/angular/tslint.json similarity index 100% rename from packages/angular/demo/tslint.json rename to packages/demos/angular/tslint.json