Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple components #72

Merged
merged 12 commits into from
Apr 2, 2017
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
server/components
server/routes
shared/routes/Repl/examples.js
File renamed without changes.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ public/main.css
public/guide.json
public/examples
public/blog
public/codemirror*
public/rollup.browser.js
shared/components/guide-summary.json
shared/routes/Repl/examples.js
server/components
Expand Down
2 changes: 1 addition & 1 deletion client/service-worker.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const CACHE_NAME = `cache-v__CACHEVERSION__`;
const urlsToCache = __MANIFEST__;
const urlsToCache = __MANIFEST__; // eslint-disable-line no-undef

self.addEventListener( 'install', event => {
event.waitUntil(
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 2 additions & 1 deletion examples/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
"line-chart",
"area-chart",
"bar-chart",
"self-references"
"self-references",
"nested-components"
]
12 changes: 12 additions & 0 deletions examples/nested-components/App.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<p>This is a top-level element.</p>
<Nested/>

<script>
import Nested from './Nested.html';

export default {
components: {
Nested
}
};
</script>
1 change: 1 addition & 0 deletions examples/nested-components/Nested.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>And this is a nested component.</p>
3 changes: 3 additions & 0 deletions examples/nested-components/example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"title": "Nested components"
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"predeploy:ci": "npm run prep",
"stage": "now",
"deploy": "now && now alias",
"deploy:ci": "now --token $NOW_TOKEN && now alias --token $NOW_TOKEN"
"deploy:ci": "now --token $NOW_TOKEN && now alias --token $NOW_TOKEN",
"lint": "eslint server client shared"
},
"repository": {
"type": "git",
Expand All @@ -36,6 +37,7 @@
"clean-css": "^4.0.8",
"compression": "^1.6.2",
"eslint": "^3.17.1",
"eslint-plugin-html": "^2.0.1",
"eslint-plugin-import": "^2.2.0",
"express": "^4.15.2",
"glob": "^7.1.1",
Expand All @@ -46,7 +48,7 @@
"postcss-clearfix": "^1.0.0",
"postcss-import": "^9.1.0",
"postcss-nested": "^1.0.0",
"rollup": "^0.41.5",
"rollup": "^0.41.6",
"rollup-plugin-buble": "^0.15.0",
"rollup-plugin-commonjs": "^8.0.2",
"rollup-plugin-json": "^2.1.0",
Expand All @@ -55,14 +57,15 @@
"rollup-plugin-svelte": "^1.6.0",
"rollup-plugin-uglify": "^1.0.1",
"rollup-watch": "^3.2.2",
"svelte": "^1.13.1",
"svelte": "^1.13.3",
"uglify-js": "^2.8.12"
},
"dependencies": {
"codemirror": "^5.24.2",
"curl-amd": "^0.8.12",
"roadtrip": "^0.3.4",
"svelte": "^1.11.2"
"rollup": "^0.41.6",
"svelte": "^1.13.3"
},
"now": {
"alias": "svelte.technology",
Expand Down
Loading