Skip to content

Commit 9525e7a

Browse files
weaverryanweaverryan
authored
Merge branch 'master' into resolve
2 parents 382bc5f + afe3797 commit 9525e7a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+3801
-2643
lines changed

‎appveyor.yml renamed to ‎.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cache:
33
- "%LOCALAPPDATA%\\Yarn"
44

55
environment:
6-
nodejs_version: "6"
6+
nodejs_version: "8"
77

88
platform:
99
- x86

‎.travis.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,28 @@ matrix:
1111
- name: 'Lowest versions of the dependencies'
1212
os: linux
1313
node_js: "10"
14-
env: JOB_PART=test
14+
env:
15+
- JOB_PART=test
16+
- DISABLE_UNSTABLE_CHECKS=1
1517
install:
1618
- rm yarn.lock
1719
- node ./scripts/force-lowest-dependencies
1820
- yarn
1921
- name: 'Highest versions of the dependencies'
2022
os: linux
2123
node_js: "10"
22-
env: JOB_PART=test
24+
env:
25+
- JOB_PART=test
26+
- DISABLE_UNSTABLE_CHECKS=1
2327
install:
2428
- rm yarn.lock
2529
- yarn
2630
- os: linux
2731
node_js: "10"
2832
env: JOB_PART=travis:lint
33+
- os: linux
34+
node_js: "11"
35+
env: JOB_PART=test
2936
- os: linux
3037
node_js: "10"
3138
env: JOB_PART=test
@@ -35,8 +42,5 @@ matrix:
3542
- os: linux
3643
node_js: "8"
3744
env: JOB_PART=test
38-
- os: linux
39-
node_js: "6"
40-
env: JOB_PART=test
4145

4246
script: npm run $JOB_PART

‎CHANGELOG.md

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

3+
## 0.25.0
4+
5+
* [BC BREAK] Various dependency versions were updated, including
6+
`css-loader` updated from `^1.0.0` to `^2.1.1` and `resolve-url-loader`
7+
updated from `^2.3.0` to `^3.0.1`. The minimum Node version was
8+
also bumped from 6 to 8. See #540 for more details.
9+
10+
* Added `Encore.disableCssExtraction()` if you prefer your CSS to
11+
be output via the `style-loader` - #539 thank to @Lyrkan.
12+
13+
* Added `Encore.configureLoaderRule()` as a way to configure the
14+
loader config that Encore normally handles - #509 thanks to @Kocal.
15+
16+
* Babel cache is no longer used for production builds to avoid a
17+
bug where the cache prevents browserslist from being used - #516
18+
thanks to @Lyrkan.
19+
20+
## 0.24.0
21+
22+
* Add CSS modules support in Vue.js for Sass/Less/Stylus - #511
23+
thanks to @Lyrkan
24+
25+
* Allow to use Dart Sass instead of Node Sass - #517 thanks to
26+
@Lyrkan
27+
28+
* Allow to set a custom context in copyFiles - #518 thanks to
29+
@Lyrkan
30+
31+
* Improve 'Install x to use y' and 'Unrecognized method' error
32+
messages - #520 thanks to @Lyrkan
33+
34+
* Allow to set @babel/preset-env's useBuiltIns option - #521
35+
thanks to @Lyrkan
36+
37+
* Allow setOutputPath to create nested directories - #525 thanks
38+
to @Lyrkan
39+
40+
## 0.23.0
41+
42+
* Add support for CSS modules in Vue - #508 thanks to @Lyrkan
43+
44+
* Store externals in an array - #495 thanks to @deAtog
45+
46+
* Add `Encore.isRuntimeEnvironmentConfigured()` - #500 thanks
47+
to @stof.
48+
49+
* Add the ability to configure watch options - #486 thanks
50+
to @Kocal
51+
52+
* Enabled cache and parallelism for terser for faster builds -
53+
#497 thanks to @Kocal
54+
355
## 0.22.0
456

557
* [BC BREAK] The values/paths in entrypoints.json were previously

‎bin/encore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const chalk = require('chalk');
1616
const logger = require('../lib/logger');
1717

1818
const runtimeConfig = parseRuntime(
19-
require('yargs/yargs')(process.argv.slice(2)).argv,
19+
require('yargs-parser')(process.argv.slice(2)),
2020
process.cwd()
2121
);
2222
context.runtimeConfig = runtimeConfig;

‎fixtures/copy/foo.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This is an invalid content to check that the file is still copied

‎fixtures/copy/foo.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This is an invalid content to check that the file is still copied

‎fixtures/copy/foo.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This is an invalid content to check that the file is still copied

‎fixtures/js/css_import.js

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

‎fixtures/vuejs-css-modules/App.vue

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<template>
2+
<div id="app" class="red large justified lowercase" :class="[$css.italic, $scss.bold, $less.underline, $stylus.rtl]"></div>
3+
</template>
4+
5+
<style>
6+
.red {
7+
color: red;
8+
}
9+
</style>
10+
11+
<style lang="scss">
12+
.large {
13+
font-size: 50px;
14+
}
15+
</style>
16+
17+
<style lang="less">
18+
.justified {
19+
text-align: justify;
20+
}
21+
</style>
22+
23+
<style lang="styl">
24+
.lowercase
25+
text-transform: lowercase
26+
</style>
27+
28+
<style module="$css">
29+
.italic {
30+
font-style: italic;
31+
}
32+
</style>
33+
34+
<style lang="scss" module="$scss">
35+
.bold {
36+
font-weight: bold;
37+
}
38+
</style>
39+
40+
<style lang="less" module="$less">
41+
.underline {
42+
text-decoration: underline;
43+
}
44+
</style>
45+
46+
<style lang="styl" module="$stylus">
47+
.rtl
48+
direction: rtl;
49+
</style>

‎fixtures/vuejs-css-modules/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+
})

‎fixtures/vuejs-typescript/App.vue

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

‎fixtures/vuejs-typescript/assets/logo.png

6.69 KB
Loading

‎fixtures/vuejs-typescript/components/Hello.vue

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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 lang="ts">
24+
import Vue from 'vue';
25+
26+
export default Vue.extend({
27+
name: 'hello',
28+
data () {
29+
return {
30+
msg: 'Welcome to Your Vue.js App'
31+
}
32+
}
33+
})
34+
</script>
35+
36+
<!-- Add "scoped" attribute to limit CSS to this component only -->
37+
<style scoped>
38+
h1, h2 {
39+
font-weight: normal;
40+
}
41+
42+
ul {
43+
list-style-type: none;
44+
padding: 0;
45+
}
46+
47+
li {
48+
display: inline-block;
49+
margin: 0 10px;
50+
}
51+
52+
a {
53+
color: #42b983;
54+
}
55+
</style>

‎fixtures/vuejs-typescript/main.ts

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.vue'
3+
4+
new Vue({
5+
el: '#app',
6+
template: '<App/>',
7+
components: { App }
8+
})

‎fixtures/vuejs-typescript/tsconfig.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"compilerOptions": {
3+
"target": "es6",
4+
"strict": true,
5+
"module": "es2015",
6+
"moduleResolution": "node",
7+
"allowSyntheticDefaultImports": true
8+
},
9+
"include": [
10+
"./**/*.ts"
11+
]
12+
}

0 commit comments

Comments
 (0)