diff --git a/packages/ionic-vanilla/demos/inside-shadow/index.html b/packages/core/demos/inside-shadow/index.html similarity index 100% rename from packages/ionic-vanilla/demos/inside-shadow/index.html rename to packages/core/demos/inside-shadow/index.html diff --git a/packages/ionic-vanilla/demos/components/item/basic.html b/packages/core/demos/item/basic.html similarity index 100% rename from packages/ionic-vanilla/demos/components/item/basic.html rename to packages/core/demos/item/basic.html diff --git a/packages/ionic-vanilla/demos/react/.gitignore b/packages/core/demos/react/.gitignore similarity index 100% rename from packages/ionic-vanilla/demos/react/.gitignore rename to packages/core/demos/react/.gitignore diff --git a/packages/ionic-vanilla/demos/react/README.md b/packages/core/demos/react/README.md similarity index 100% rename from packages/ionic-vanilla/demos/react/README.md rename to packages/core/demos/react/README.md diff --git a/packages/ionic-vanilla/demos/react/package.json b/packages/core/demos/react/package.json similarity index 100% rename from packages/ionic-vanilla/demos/react/package.json rename to packages/core/demos/react/package.json diff --git a/packages/ionic-vanilla/demos/react/public/favicon.ico b/packages/core/demos/react/public/favicon.ico similarity index 100% rename from packages/ionic-vanilla/demos/react/public/favicon.ico rename to packages/core/demos/react/public/favicon.ico diff --git a/packages/ionic-vanilla/demos/react/public/index.html b/packages/core/demos/react/public/index.html similarity index 100% rename from packages/ionic-vanilla/demos/react/public/index.html rename to packages/core/demos/react/public/index.html diff --git a/packages/ionic-vanilla/demos/react/public/ionic.web.js b/packages/core/demos/react/public/ionic.web.js similarity index 100% rename from packages/ionic-vanilla/demos/react/public/ionic.web.js rename to packages/core/demos/react/public/ionic.web.js diff --git a/packages/ionic-vanilla/demos/react/src/App.css b/packages/core/demos/react/src/App.css similarity index 100% rename from packages/ionic-vanilla/demos/react/src/App.css rename to packages/core/demos/react/src/App.css diff --git a/packages/ionic-vanilla/demos/react/src/App.js b/packages/core/demos/react/src/App.js similarity index 100% rename from packages/ionic-vanilla/demos/react/src/App.js rename to packages/core/demos/react/src/App.js diff --git a/packages/ionic-vanilla/demos/react/src/App.test.js b/packages/core/demos/react/src/App.test.js similarity index 100% rename from packages/ionic-vanilla/demos/react/src/App.test.js rename to packages/core/demos/react/src/App.test.js diff --git a/packages/ionic-vanilla/demos/react/src/index.css b/packages/core/demos/react/src/index.css similarity index 100% rename from packages/ionic-vanilla/demos/react/src/index.css rename to packages/core/demos/react/src/index.css diff --git a/packages/ionic-vanilla/demos/react/src/index.js b/packages/core/demos/react/src/index.js similarity index 100% rename from packages/ionic-vanilla/demos/react/src/index.js rename to packages/core/demos/react/src/index.js diff --git a/packages/ionic-vanilla/demos/react/src/logo.svg b/packages/core/demos/react/src/logo.svg similarity index 100% rename from packages/ionic-vanilla/demos/react/src/logo.svg rename to packages/core/demos/react/src/logo.svg diff --git a/packages/ionic-vanilla/demos/components/slides/basic.html b/packages/core/demos/slider/index.html similarity index 100% rename from packages/ionic-vanilla/demos/components/slides/basic.html rename to packages/core/demos/slider/index.html diff --git a/packages/core/demos/test/index.html b/packages/core/demos/test/index.html new file mode 100644 index 0000000000..965dded569 --- /dev/null +++ b/packages/core/demos/test/index.html @@ -0,0 +1,18 @@ + + + + + Ionic Slides Basic + + + + + + + Item Icons + + + + + + diff --git a/packages/ionic-vanilla/demos/universal/app.js b/packages/core/demos/universal/app.js similarity index 100% rename from packages/ionic-vanilla/demos/universal/app.js rename to packages/core/demos/universal/app.js diff --git a/packages/ionic-vanilla/demos/universal/package.json b/packages/core/demos/universal/package.json similarity index 100% rename from packages/ionic-vanilla/demos/universal/package.json rename to packages/core/demos/universal/package.json diff --git a/packages/ionic-vanilla/demos/universal/readme.md b/packages/core/demos/universal/readme.md similarity index 100% rename from packages/ionic-vanilla/demos/universal/readme.md rename to packages/core/demos/universal/readme.md diff --git a/packages/ionic-vanilla/demos/user-component/index.html b/packages/core/demos/user-component/index.html similarity index 100% rename from packages/ionic-vanilla/demos/user-component/index.html rename to packages/core/demos/user-component/index.html diff --git a/packages/ionic-vanilla/demos/components/icon/items.html b/packages/core/demos/vanilla/icon/index.html similarity index 100% rename from packages/ionic-vanilla/demos/components/icon/items.html rename to packages/core/demos/vanilla/icon/index.html diff --git a/packages/ionic-vanilla/demos/vanilla/index.html b/packages/core/demos/vanilla/index.html similarity index 100% rename from packages/ionic-vanilla/demos/vanilla/index.html rename to packages/core/demos/vanilla/index.html diff --git a/packages/core/package.json b/packages/core/package.json index cea9efb411..8814084203 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -4,9 +4,9 @@ "description": "Base components for Ionic", "main": "dist/manifest.json", "scripts": { - "build": "npm run clean && npm run copy.vendor && stencil collection", - "clean": "rm -Rf ./dist", - "copy.vendor": "mkdir -p ./dist/vendor && cp -Rf ./src/vendor ./dist", + "build": "npm run copy.vendor && stencil build --prod", + "dev": "npm run copy.vendor && stencil build --watch --debug", + "copy.vendor": "mkdir -p ./collection/vendor && cp -Rf ./src/vendor ./collection", "link.stencil": "npm link @stencil/core", "test": "jest" }, diff --git a/packages/core/src/components/badge/badge.spec.tsx.save b/packages/core/src/components/badge/badge.spec.tsx.save new file mode 100644 index 0000000000..1ce3d89815 --- /dev/null +++ b/packages/core/src/components/badge/badge.spec.tsx.save @@ -0,0 +1,21 @@ +import { componentTest } from '@stencil/core'; + +const mount = componentTest.mount; + +describe('', () => { + it('contains a slot', () => { + const wrapper = mount(); + expect(wrapper.find('slot')).to.have.length(1); + }); + + it('renders slot components as direct children', () => { + const wrapper = mount( + + 5 Why hello there + + ); + + expect(wrapper.contains(5, 'Why', 'hello', 'there')).to.equal(true); + }) +}); + diff --git a/packages/ionic-vanilla/demos/components/button/basic.html b/packages/core/src/components/button/test/basic.html similarity index 100% rename from packages/ionic-vanilla/demos/components/button/basic.html rename to packages/core/src/components/button/test/basic.html diff --git a/packages/ionic-vanilla/demos/components/button/toolbar.html b/packages/core/src/components/button/test/toolbar.html similarity index 100% rename from packages/ionic-vanilla/demos/components/button/toolbar.html rename to packages/core/src/components/button/test/toolbar.html diff --git a/packages/ionic-vanilla/demos/components/grid/basic.html b/packages/core/src/components/grid/test/basic.html similarity index 100% rename from packages/ionic-vanilla/demos/components/grid/basic.html rename to packages/core/src/components/grid/test/basic.html diff --git a/packages/ionic-vanilla/demos/components/icon/basic.html b/packages/core/src/components/icon/test/basic.html similarity index 100% rename from packages/ionic-vanilla/demos/components/icon/basic.html rename to packages/core/src/components/icon/test/basic.html diff --git a/packages/core/src/components/icon/test/items.html b/packages/core/src/components/icon/test/items.html new file mode 100644 index 0000000000..d552e6f24e --- /dev/null +++ b/packages/core/src/components/icon/test/items.html @@ -0,0 +1,179 @@ + + + + + + Ionic + + + + + + + + + + + + + + + + Icons + + + + + + + + + + + + + dynamicColor name="home" + + + + + + + name="home" is-active="true" + + + + + + + dynamicProp is-active="false" + + + + + + + dynamicAttr is-active="false" + + + + + + + name="md-home" is-active="true" + + + + + + + name="ios-home" is-active="true" + + + + + + + name="ios-home" + + + + + + + name="ios-home-outline" + + + + + + + name="ios-home-outline" is-active="false" + + + + + + + name="md-home" + + + + + + + name="logo-twitter" + + + + + + + ios="logo-apple" md="logo-android" + + + + + + + ios="md-color-filter" md="ios-color-filter" + + + + + + + ios="md-color-filter" md="ios-color-filter" is-active="false" + + + + + + + name="null" + + + + + + + name="home" hidden="true" + + + + + + + + + + + + diff --git a/packages/core/src/components/item/test/basic.html b/packages/core/src/components/item/test/basic.html new file mode 100644 index 0000000000..931331d069 --- /dev/null +++ b/packages/core/src/components/item/test/basic.html @@ -0,0 +1,70 @@ + + + + + Ionic Slides Basic + + + + + + + + Button Icons + + + Default + + + + + + + + + + + + Item Icons + + + + + + Item No Size Button + Start Button + End Button + + + + Item Outline Button + Start Button + End Button + + + + Item Large Button + Start Button + + + + Item Large Button + End Button + + + + Item Small Button + Start Button + End Button + + + + Item Default Button + Start Button + End Button + + + + + + diff --git a/packages/ionic-vanilla/demos/components/segment/basic.html b/packages/core/src/components/segment/test/basic.html similarity index 100% rename from packages/ionic-vanilla/demos/components/segment/basic.html rename to packages/core/src/components/segment/test/basic.html diff --git a/packages/core/src/components/slides/test/basic.html b/packages/core/src/components/slides/test/basic.html new file mode 100644 index 0000000000..e418f65ba5 --- /dev/null +++ b/packages/core/src/components/slides/test/basic.html @@ -0,0 +1,33 @@ + + + + + Ionic Slides Basic + + + + + + + + +

Slide 1

+ + + +

Slide 2

+ + + +

Slide 3

+ + + + + + diff --git a/packages/core/stencil.config.js b/packages/core/stencil.config.js index 7e3ed2ed4c..07f8aa599c 100644 --- a/packages/core/stencil.config.js +++ b/packages/core/stencil.config.js @@ -1,6 +1,9 @@ exports.config = { + namespace: 'ionic', src: 'src', dest: 'dist', + collection: true, + collectionDest: 'collection', bundles: [ { components: ['ion-app', 'ion-content', 'ion-footer', 'ion-header', 'ion-navbar', 'ion-page', 'ion-title', 'ion-toolbar'] }, { components: ['ion-avatar', 'ion-badge', 'ion-thumbnail'] }, @@ -15,5 +18,6 @@ exports.config = { { components: ['ion-slides', 'ion-slide'] }, { components: ['ion-spinner'] }, { components: ['ion-toggle'] } - ] + ], + preamble: '(C) Ionic Vanilla https://ionicframework.com - MIT License' }; diff --git a/packages/ionic-vanilla/package.json b/packages/ionic-vanilla/package.json deleted file mode 100644 index 0f515a475f..0000000000 --- a/packages/ionic-vanilla/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@ionic/vanilla", - "version": "0.0.1", - "description": "Base components for Ionic", - "main": "dist/index.js", - "scripts": { - "build": "npm run clean && npm run prod", - "clean": "rm -Rf ./dist", - "dev": "stencil build", - "link.stencil": "npm link @stencil/core", - "prod": "stencil build --prod", - "test": "jest" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/ionic-team/ionic.git" - }, - "dependencies": { - "@ionic/core": "0.0.1" - }, - "devDependencies":{ - "@stencil/core": "0.0.1" - }, - "author": "Ionic Team", - "license": "MIT", - "bugs": { - "url": "https://github.com/ionic-team/ionic/issues" - }, - "homepage": "https://github.com/ionic-team/ionic#readme" -} diff --git a/packages/ionic-vanilla/stencil.config.js b/packages/ionic-vanilla/stencil.config.js deleted file mode 100644 index 0c585e2c24..0000000000 --- a/packages/ionic-vanilla/stencil.config.js +++ /dev/null @@ -1,8 +0,0 @@ -exports.config = { - namespace: 'Ionic', - dest: 'dist', - collections: [ - '@ionic/core' - ], - preamble: '(C) Ionic Vanilla https://ionicframework.com - MIT License' -};