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.

Sign up for GitHub

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

fix(framework-examples): fix Aurelia example (#120) #126

Merged
merged 6 commits into from
Dec 20, 2016
Merged

fix(framework-examples): fix Aurelia example (#120) #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f227a87
Merge pull request #1 from material-components/master
Thanood Dec 17, 2016
96a59a8
fix(framework-examples): fix Aurelia example (#120)
Thanood Dec 17, 2016
76312fd
chore(framework-examples): update Aurelia example README
Thanood Dec 17, 2016
c8297fa
chore(framework-examples): remove nitpicks from Aurelia sample
Thanood Dec 19, 2016
896f913
chore(framework-examples): remove repository field from Aurelia sample
Thanood Dec 19, 2016
dd2e811
Merge branch 'master' into master
traviskaufman Dec 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions framework-examples/aurelia/.editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true

# 2 space indentation
[**.*]
indent_style = space
indent_size = 2
12 changes: 10 additions & 2 deletions framework-examples/aurelia/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
.awcache/
.vscode/settings.json
node_modules
.DS_STORE
npm-debug.log*
/dist
/build
/typings
/.awcache
/electron.js*
/release
/test/coverage
yarn.lock
10 changes: 10 additions & 0 deletions framework-examples/aurelia/.vscode/extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"recommendations": [
"AureliaEffect.aurelia",
"msjsdiag.debugger-for-chrome",
"steoates.autoimport",
"EditorConfig.EditorConfig",
"christian-kohler.path-intellisense",
"behzad88.Aurelia"
]
}
3 changes: 3 additions & 0 deletions framework-examples/aurelia/.vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"typescript.tsdk": "node_modules/typescript/lib"
}
19 changes: 0 additions & 19 deletions framework-examples/aurelia/custom_typings/aurelia-protractor.d.ts
View file
Open in desktop

This file was deleted.

Binary file added framework-examples/aurelia/favicon.ico
View file
Open in desktop
Binary file not shown.
12 changes: 5 additions & 7 deletions framework-examples/aurelia/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<!DOCTYPE html>
<html>
<head>
<title><%- webpackConfig.metadata.title %></title>
<meta charset="utf-8">
<title><%- htmlWebpackPlugin.options.metadata.title %></title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<base href="<%- webpackConfig.metadata.baseUrl %>">
<base href="<%- htmlWebpackPlugin.options.metadata.baseUrl %>">
<!-- imported CSS are concatenated and added automatically -->
</head>
<body aurelia-app="main">
<div class="splash">
<div class="message"><%- webpackConfig.metadata.title %></div>
<div class="message"><%- htmlWebpackPlugin.options.metadata.title %></div>
<i class="fa fa-spinner fa-spin"></i>
</div>
<script>
document.addEventListener('DOMContentLoaded', function() { console.log('document.ready'); }, false);
</script>
<% if (webpackConfig.metadata.ENV === 'development') { %>
<% if (htmlWebpackPlugin.options.metadata.ENV === 'development') { %>
<!-- Webpack Dev Server reload -->
<script src="/webpack-dev-server.js"></script>
<% } %>
Expand Down
253 changes: 110 additions & 143 deletions framework-examples/aurelia/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,147 +1,114 @@
{
"name": "aurelia-skeleton-navigation-webpack",
"version": "1.0.0",
"description": "A starter kit for building a standard navigation-style app with Aurelia and webpack.",
"main": "dist/electron.js",
"productName": "Aurelia Electron",
"scripts": {
"test": "cross-env NODE_ENV=test ./node_modules/karma/bin/karma start test/karma.conf.js",
"webdriver:update": "cross-env ./node_modules/.bin/webdriver-manager update",
"webdriver:start": "cross-env ./node_modules/.bin/webdriver-manager start",
"pree2e": "npm run webdriver:update -- --standalone",
"e2e": "concurrently --kill-others \"npm run e2e:start-when-ready\" \"cross-env WEBPACK_PORT=19876 npm start\"",
"e2e:start-when-ready": "wait-on --timeout 20000 http-get://localhost:19876/index.html && npm run e2e:start",
"e2e:start": "cross-env ./node_modules/.bin/protractor test/protractor.conf.js",
"e2e:live": "npm run e2e:start -- --elementExplorer",
"clean": "npm cache clean && rimraf node_modules test/coverage dist",
"clean:dist": "rimraf dist",
"preclean:install": "npm run clean",
"clean:install": "npm set progress=false && npm install",
"preclean:start": "npm run clean",
"clean:start": "npm start",
"watch": "npm run watch:dev",
"watch:dev": "npm run build:dev -- --watch",
"watch:dev:hmr": "npm run watch:dev -- --hot",
"watch:test": "npm run test -- --auto-watch --no-single-run",
"watch:prod": "npm run build:prod -- --watch",
"build": "cross-env NODE_ENV=development npm run build:dev",
"prebuild:dev": "npm run clean:dist",
"build:dev": "cross-env NODE_ENV=development npm run webpack -- --progress --profile",
"prebuild:prod": "npm run clean:dist",
"build:prod": "cross-env NODE_ENV=production npm run webpack -- --progress --profile",
"start": "npm run server:dev",
"server": "npm run server:dev",
"server:dev": "cross-env NODE_ENV=development node ./node_modules/webpack-dev-server/bin/webpack-dev-server --inline --progress --profile --watch",
"server:dev:hmr": "npm run server:dev -- --hot",
"server:prod": "http-server dist --cors",
"webpack": "cross-env ./node_modules/.bin/webpack",
"webpack-dev-server": "cross-env ./node_modules/.bin/webpack-dev-server"
},
"repository": {
"type": "git",
"url": "git+ssh://git@github.com/aurelia/skeleton-navigation.git"
},
"keywords": [
"aurelia",
"skeleton",
"navigation",
"webpack"
],
"license": "CC0-1.0",
"author": "Rob Eisenberg <rob@bluespire.com> (http://robeisenberg.com/)",
"contributors": [
{
"name": "Arjen de Blok"
"name": "mdc-framework-example-aurelia",
"version": "1.1.2",
"description": "Example implementation of Aurelia components for MDC.",
"main": "dist/main.js",
"scripts": {
"pretest": "del-cli \"test/coverage\"",
"test": "cross-env NODE_ENV=test TS_NODE_PROJECT=tsconfig.tsnode.json TS_NODE_FAST=true ts-node ./node_modules/karma/bin/karma start test/karma.conf.js",
"test:debug": "npm test -- --single-run=false --debug",
"webdriver:update": "cross-env ./node_modules/.bin/webdriver-manager update",
"webdriver:start": "cross-env ./node_modules/.bin/webdriver-manager start",
"pree2e": "npm run webdriver:update -- --standalone",
"e2e": "concurrently --success first --kill-others \"npm run e2e:start-when-ready\" \"cross-env WEBPACK_PORT=19876 npm start\"",
"e2e:start-when-ready": "wait-on --timeout 120000 http-get://localhost:19876/index.html && npm run e2e:start",
"e2e:start": "cross-env ./node_modules/.bin/protractor test/protractor.conf.js",
"e2e:live": "npm run e2e:start -- --elementExplorer",
"clean": "npm cache clean && del-cli node_modules \"test/coverage\" dist",
"clean:dist": "del-cli dist",
"preclean:install": "npm run clean",
"clean:install": "npm install",
"preclean:start": "npm run clean",
"clean:start": "npm start",
"watch": "npm run watch:dev",
"watch:dev": "npm run build:dev -- --watch",
"watch:dev:hmr": "npm run watch:dev -- --hot",
"watch:test": "npm run test -- --auto-watch --no-single-run",
"watch:prod": "npm run build:prod -- --watch",
"build": "npm run build:dev",
"prebuild:dev": "npm run clean:dist",
"build:dev": "cross-env NODE_ENV=development npm run webpack -- --progress --profile",
"prebuild:prod": "npm run clean:dist",
"build:prod": "cross-env NODE_ENV=production npm run webpack -- --progress --profile",
"start": "npm run server:dev",
"server": "npm run server:dev",
"server:dev": "cross-env NODE_ENV=development npm run webpack-dev-server -- --inline --progress --profile --watch",
"server:dev:hmr": "npm run server:dev -- --hot",
"server:prod": "http-server dist --cors",
"webpack": "cross-env TS_NODE_PROJECT=tsconfig.tsnode.json TS_NODE_FAST=true ./node_modules/.bin/webpack",
"webpack-dev-server": "cross-env TS_NODE_PROJECT=tsconfig.tsnode.json TS_NODE_FAST=true ./node_modules/.bin/webpack-dev-server"
},
{
"name": "Bazyli Brzóska <bazyli.brzoska@gmail.com> (https://invent.life)"
}
],
"bugs": {
"url": "https://github.com/aurelia/skeleton-navigation/issues"
},
"homepage": "https://github.com/aurelia/skeleton-navigation#readme",
"aurelia": {
"build": {
"resources": []
"private": true,
"aurelia": {
"build": {
"resources": []
}
},
"dependencies": {
"@material/checkbox": "^0.1.0",
"@material/button": "^0.1.0",
"@material/ripple": "^0.1.0",
"aurelia-bootstrapper-webpack": "^1.1.0",
"aurelia-event-aggregator": "^1.0.0",
"aurelia-fetch-client": "^1.0.1",
"aurelia-framework": "^1.0.7",
"aurelia-history-browser": "^1.0.0",
"aurelia-loader-webpack": "^1.0.3",
"aurelia-logging-console": "^1.0.0",
"aurelia-pal-browser": "^1.0.0",
"aurelia-polyfills": "^1.1.1",
"aurelia-route-recognizer": "^1.1.0",
"aurelia-router": "^1.0.7",
"aurelia-templating-binding": "^1.1.0",
"aurelia-templating-resources": "^1.2.0",
"aurelia-templating-router": "^1.0.0",
"bluebird": "^3.4.6",
"font-awesome": "^4.7.0",
"isomorphic-fetch": "^2.2.1"
},
"devDependencies": {
"@easy-webpack/config-aurelia": "^2.2.2",
"@easy-webpack/config-common-chunks-simple": "^2.0.3",
"@easy-webpack/config-copy-files": "^1.1.2",
"@easy-webpack/config-css": "^4.0.0",
"@easy-webpack/config-env-development": "^2.1.5",
"@easy-webpack/config-env-production": "^3.0.0",
"@easy-webpack/config-external-source-maps": "^3.1.0",
"@easy-webpack/config-fonts-and-images": "^2.1.0",
"@easy-webpack/config-generate-index-html": "^2.1.1",
"@easy-webpack/config-global-bluebird": "^2.1.0",
"@easy-webpack/config-html": "^3.1.0",
"@easy-webpack/config-json": "^3.1.0",
"@easy-webpack/config-source-map-support": "^1.0.2",
"@easy-webpack/config-test-coverage-istanbul": "^3.2.0",
"@easy-webpack/config-typescript": "^5.0.0",
"@easy-webpack/config-uglify": "^2.2.3",
"@easy-webpack/core": "^2.0.0",
"@types/bluebird": "^3.0.35",
"@types/jasmine": "^2.5.38",
"@types/node": "^6.0.48",
"@types/webpack": "^2.0.0",
"@types/whatwg-fetch": "^0.0.32",
"aurelia-protractor-plugin": "^1.0.1",
"concurrently": "^3.1.0",
"cross-env": "^3.1.3",
"del-cli": "^0.2.0",
"http-server": "^0.9.0",
"jasmine-core": "^2.5.2",
"karma": "^1.3.0",
"karma-chrome-launcher": "^2.0.0",
"karma-coverage": "^1.1.1",
"karma-jasmine": "^1.0.2",
"karma-mocha-reporter": "^2.2.0",
"karma-remap-istanbul": "^0.2.1",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^1.8.0",
"protractor": "^4.0.11",
"ts-node": "^1.7.2",
"typescript": "^2.1",
"wait-on": "^2.0.1",
"wallaby-webpack": "0.0.26",
"webpack": "2.1.0-beta.27",
"webpack-dev-server": "2.1.0-beta.12"
}
},
"dependencies": {
"aurelia-bootstrapper-webpack": "^1.0.0",
"aurelia-event-aggregator": "^1.0.0",
"aurelia-fetch-client": "^1.0.0",
"aurelia-framework": "^1.0.0",
"aurelia-history-browser": "^1.0.0",
"aurelia-loader-webpack": "^1.0.0",
"aurelia-logging-console": "^1.0.0",
"aurelia-pal-browser": "^1.0.0",
"aurelia-polyfills": "^1.0.0",
"aurelia-route-recognizer": "^1.0.0",
"aurelia-router": "^1.0.2",
"aurelia-templating-binding": "^1.0.0",
"aurelia-templating-resources": "^1.0.0",
"aurelia-templating-router": "^1.0.0",
"bluebird": "^3.4.1",
"bootstrap": "^3.3.7",
"font-awesome": "^4.6.3",
"isomorphic-fetch": "^2.2.1",
"jquery": "^3.1.0"
},
"devDependencies": {
"@easy-webpack/config-aurelia": "^2.0.1",
"@easy-webpack/config-babel": "^2.0.2",
"@easy-webpack/config-common-chunks-simple": "^2.0.1",
"@easy-webpack/config-copy-files": "^1.0.0",
"@easy-webpack/config-css": "^2.3.2",
"@easy-webpack/config-env-development": "^2.1.1",
"@easy-webpack/config-env-production": "^2.1.0",
"@easy-webpack/config-external-source-maps": "^2.0.1",
"@easy-webpack/config-fonts-and-images": "^1.2.1",
"@easy-webpack/config-generate-index-html": "^2.0.1",
"@easy-webpack/config-global-bluebird": "^1.2.0",
"@easy-webpack/config-global-jquery": "^1.2.0",
"@easy-webpack/config-global-regenerator": "^1.2.0",
"@easy-webpack/config-html": "^2.0.2",
"@easy-webpack/config-json": "^2.0.2",
"@easy-webpack/config-source-map-support": "^1.0.0",
"@easy-webpack/config-test-coverage-istanbul": "^2.0.2",
"@easy-webpack/config-typescript": "^2.1.2",
"@easy-webpack/config-uglify": "^2.1.0",
"@easy-webpack/core": "^1.3.2",
"@types/bluebird": "^2.0.29",
"@types/jasmine": "^2.2.30",
"@types/whatwg-fetch": "0.0.27",
"aurelia-tools": "^0.2.4",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-preset-es2015": "^6.9.0",
"babel-preset-es2015-loose": "^7.0.0",
"babel-preset-es2015-loose-native-modules": "^1.0.0",
"babel-preset-stage-1": "^6.5.0",
"babel-register": "^6.11.6",
"concurrently": "^2.2.0",
"cross-env": "^2.0.0",
"http-server": "^0.9.0",
"jasmine-core": "^2.4.1",
"karma": "^1.1.2",
"karma-chrome-launcher": "^1.0.1",
"karma-coverage": "^1.1.1",
"karma-jasmine": "^1.0.2",
"karma-mocha-reporter": "^2.0.4",
"karma-remap-istanbul": "^0.1.1",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^1.7.0",
"protractor": "4.0.0",
"rimraf": "^2.5.4",
"ts-node": "^1.2.1",
"typescript": "^2.0.0",
"wait-on": "^1.5.2",
"webpack": "2.1.0-beta.22",
"webpack-dev-server": ">=2.1.0-beta.0 || ^2.1.0"
},
"babel": {
"presets": [
"es2015",
"stage-1"
]
}
}
5 changes: 1 addition & 4 deletions framework-examples/aurelia/src/components/button/mdc-button.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import {bindable, customAttribute, inject, DOM} from 'aurelia-framework';

// Use webpack's require function to load the css
const MDC_BUTTON_STYLES = require('mdc-button-styles');
DOM.injectStyles(MDC_BUTTON_STYLES);
import '@material/button/dist/mdc.button.css';

@customAttribute('mdc-button')
@inject(Element)
Expand Down
9 changes: 2 additions & 7 deletions framework-examples/aurelia/src/components/checkbox/mdc-checkbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import {inject, bindable, bindingMode, DOM} from 'aurelia-framework';

// Since we don't have typings (yet) we require mdc-checkbox manually.
// const MDCCheckboxModule = require('mdc-checkbox');
const {MDCCheckbox} = require('mdc-checkbox');
// Use webpack's require function to load the css
const MDC_CHECKBOX_STYLES = require('mdc-checkbox-styles');
DOM.injectStyles(MDC_CHECKBOX_STYLES);
import {MDCCheckbox} from '@material/checkbox';
import '@material/checkbox/dist/mdc.checkbox.css';

@inject(Element)
export class MdcCheckbox {
Expand Down
9 changes: 2 additions & 7 deletions framework-examples/aurelia/src/components/ripple/mdc-ripple.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import {bindable, customAttribute, inject, DOM} from 'aurelia-framework';

// Since we don't have typings (yet) we require mdc-ripple manually.
// const MDCRippleModule = require('mdc-ripple');
const {MDCRipple} = require('mdc-ripple');
// Use webpack's require function to load the css
const MDC_RIPPLE_STYLES = require('mdc-ripple-styles');
DOM.injectStyles(MDC_RIPPLE_STYLES);
import {MDCRipple} from '@material/ripple';
import '@material/ripple/dist/mdc.ripple.css';

@customAttribute('mdc-ripple')
@inject(Element)
Expand Down
Loading