Skip to content

Commit 1e27937

Browse files
authored
Merge branch 'master' into webpack3
2 parents 5aec489 + efbec0d commit 1e27937

34 files changed

+1171
-63
lines changed

CHANGELOG.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,42 @@
11
# CHANGELOG
22

3+
## 0.10.0
4+
5+
* [BC BREAK] If you're using `enableSassLoader()` AND passing an options
6+
array, the options now need to be moved to the second argument:
7+
8+
```js
9+
// before
10+
.enableSassLoader({ resolve_url_loader: true });
11+
12+
// after
13+
enableSassLoader(function(sassOptions) {}, {
14+
resolve_url_loader: true
15+
})
16+
```
17+
18+
## 0.9.1
19+
20+
* Syntax error fix - #64
21+
22+
## 0.9.0
23+
24+
* [BEHAVIOR CHANGE] When using `autoProvidejQuery()`, `window.jQuery` is now also
25+
included (and so will be re-written in the compiled files). If you're also exposing
26+
`jQuery` as a global variable, you'll need to update your code:
27+
28+
```js
29+
// Before: if you had this
30+
window.jQuery = require('jquery');
31+
32+
// After: change to this
33+
global.jQuery = require('jquery');
34+
```
35+
36+
* Vue.js support! See #49
37+
38+
* Typescript support! See #50
39+
340
## 0.8.0
441

542
* Windows support fixed #28

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ feel. It aims to solve the most common Webpack use cases.
1919
## Documentation
2020

2121
[Read the Documentation on symfony.com](http://symfony.com/doc/current/frontend.html)
22+
or view a demo application: [symfony/symfony-demo](https://github.com/symfony/symfony-demo).

fixtures/js/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import render = require('./render');
2+
3+
render();

fixtures/js/render.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
function render() {
2+
document.getElementById('app').innerHTML = "<h1>Welcome to Your TypeScript App</h1>";
3+
}
4+
5+
export = render;

fixtures/js/render2.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
function render() {
2+
document.getElementById('app').innerHTML = "<h1>Welcome to Your TypeScript App</h1>";
3+
}
4+
5+
export = render;

fixtures/js/tsconfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"compilerOptions": {}
3+
}

fixtures/vuejs/App.vue

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<template>
2+
<div id="app">
3+
<img src="./assets/logo.png">
4+
<hello></hello>
5+
</div>
6+
</template>
7+
8+
<script>
9+
import Hello from './components/Hello'
10+
11+
class TestClassSyntax {
12+
13+
}
14+
15+
export default {
16+
name: 'app',
17+
components: {
18+
Hello
19+
}
20+
}
21+
</script>
22+
23+
<style>
24+
#app {
25+
font-family: 'Avenir', Helvetica, Arial, sans-serif;
26+
-webkit-font-smoothing: antialiased;
27+
-moz-osx-font-smoothing: grayscale;
28+
text-align: center;
29+
color: #2c3e50;
30+
margin-top: 60px;
31+
}
32+
</style>
33+
34+
<style lang="scss">
35+
#app {
36+
display: flex;
37+
color: #2c3e90;
38+
}
39+
</style>
40+
41+
<style lang="sass">
42+
#app
43+
color: #2c3e90
44+
</style>
45+
46+
<style lang="less">
47+
#app {
48+
margin-top: 40px;
49+
}
50+
</style>

fixtures/vuejs/assets/logo.png

6.69 KB
Loading

fixtures/vuejs/components/Hello.vue

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<template>
2+
<div class="hello">
3+
<h1>{{ msg }}</h1>
4+
<h2>Essential Links</h2>
5+
<ul>
6+
<li><a href="https://vuejs.org" target="_blank">Core Docs</a></li>
7+
<li><a href="https://forum.vuejs.org" target="_blank">Forum</a></li>
8+
<li><a href="https://gitter.im/vuejs/vue" target="_blank">Gitter Chat</a></li>
9+
<li><a href="https://twitter.com/vuejs" target="_blank">Twitter</a></li>
10+
<br>
11+
<li><a href="http://vuejs-templates.github.io/webpack/" target="_blank">Docs for This Template</a></li>
12+
</ul>
13+
<h2>Ecosystem</h2>
14+
<ul>
15+
<li><a href="http://router.vuejs.org/" target="_blank">vue-router</a></li>
16+
<li><a href="http://vuex.vuejs.org/" target="_blank">vuex</a></li>
17+
<li><a href="http://vue-loader.vuejs.org/" target="_blank">vue-loader</a></li>
18+
<li><a href="https://github.com/vuejs/awesome-vue" target="_blank">awesome-vue</a></li>
19+
</ul>
20+
</div>
21+
</template>
22+
23+
<script>
24+
export default {
25+
name: 'hello',
26+
data () {
27+
return {
28+
msg: 'Welcome to Your Vue.js App'
29+
}
30+
}
31+
}
32+
</script>
33+
34+
<!-- Add "scoped" attribute to limit CSS to this component only -->
35+
<style scoped>
36+
h1, h2 {
37+
font-weight: normal;
38+
}
39+
40+
ul {
41+
list-style-type: none;
42+
padding: 0;
43+
}
44+
45+
li {
46+
display: inline-block;
47+
margin: 0 10px;
48+
}
49+
50+
a {
51+
color: #42b983;
52+
}
53+
</style>

fixtures/vuejs/main.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import Vue from 'vue'
2+
import App from './App'
3+
4+
new Vue({
5+
el: '#app',
6+
template: '<App/>',
7+
components: { App }
8+
})

0 commit comments

Comments
 (0)