Merge branch 'master' into resolve

Author: weaverryan

appveyor.yml renamed to .appveyor.yml

@@ -3,7 +3,7 @@ cache:
   - "%LOCALAPPDATA%\\Yarn"
 
 environment:
-  nodejs_version: "6"
+  nodejs_version: "8"
 
 platform:
   - x86

.travis.yml

@@ -11,21 +11,28 @@ matrix:
     - name: 'Lowest versions of the dependencies'
       os: linux
       node_js: "10"
-      env: JOB_PART=test
+      env:
+        - JOB_PART=test
+        - DISABLE_UNSTABLE_CHECKS=1
       install:
         - rm yarn.lock
         - node ./scripts/force-lowest-dependencies
         - yarn
     - name: 'Highest versions of the dependencies'
       os: linux
       node_js: "10"
-      env: JOB_PART=test
+      env:
+        - JOB_PART=test
+        - DISABLE_UNSTABLE_CHECKS=1
       install:
         - rm yarn.lock
         - yarn
     - os: linux
       node_js: "10"
       env: JOB_PART=travis:lint
+    - os: linux
+      node_js: "11"
+      env: JOB_PART=test
     - os: linux
       node_js: "10"
       env: JOB_PART=test
@@ -35,8 +42,5 @@ matrix:
     - os: linux
       node_js: "8"
       env: JOB_PART=test
-    - os: linux
-      node_js: "6"
-      env: JOB_PART=test
 
 script: npm run $JOB_PART

CHANGELOG.md

@@ -1,5 +1,57 @@
 # CHANGELOG
 
+## 0.25.0
+
+ * [BC BREAK] Various dependency versions were updated, including
+   `css-loader` updated from `^1.0.0` to `^2.1.1` and `resolve-url-loader`
+   updated from `^2.3.0` to `^3.0.1`. The minimum Node version was
+   also bumped from 6 to 8. See #540 for more details.
+
+ * Added `Encore.disableCssExtraction()` if you prefer your CSS to
+   be output via the `style-loader` - #539 thank to @Lyrkan.
+
+ * Added `Encore.configureLoaderRule()` as a way to configure the
+   loader config that Encore normally handles - #509 thanks to @Kocal.
+
+ * Babel cache is no longer used for production builds to avoid a
+   bug where the cache prevents browserslist from being used - #516
+   thanks to @Lyrkan.
+
+## 0.24.0
+
+ * Add CSS modules support in Vue.js for Sass/Less/Stylus - #511
+   thanks to @Lyrkan
+
+ * Allow to use Dart Sass instead of Node Sass - #517 thanks to
+   @Lyrkan
+
+ * Allow to set a custom context in copyFiles - #518 thanks to
+   @Lyrkan
+
+ * Improve 'Install x to use y' and 'Unrecognized method' error
+   messages - #520 thanks to @Lyrkan
+
+ * Allow to set @babel/preset-env's useBuiltIns option - #521
+   thanks to @Lyrkan
+
+ * Allow setOutputPath to create nested directories - #525 thanks
+   to @Lyrkan
+
+## 0.23.0
+
+ * Add support for CSS modules in Vue - #508 thanks to @Lyrkan
+
+ * Store externals in an array - #495 thanks to @deAtog
+
+ * Add `Encore.isRuntimeEnvironmentConfigured()` - #500 thanks
+   to @stof.
+
+ * Add the ability to configure watch options - #486 thanks
+   to @Kocal
+
+ * Enabled cache and parallelism for terser for faster builds -
+   #497 thanks to @Kocal
+
 ## 0.22.0
 
  * [BC BREAK] The values/paths in entrypoints.json were previously

bin/encore.js

@@ -16,7 +16,7 @@ const chalk = require('chalk');
 const logger = require('../lib/logger');
 
 const runtimeConfig = parseRuntime(
-    require('yargs/yargs')(process.argv.slice(2)).argv,
+    require('yargs-parser')(process.argv.slice(2)),
     process.cwd()
 );
 context.runtimeConfig = runtimeConfig;

fixtures/copy/foo.css

@@ -0,0 +1 @@
+This is an invalid content to check that the file is still copied

fixtures/copy/foo.js

@@ -0,0 +1 @@
+This is an invalid content to check that the file is still copied

fixtures/copy/foo.json

@@ -0,0 +1 @@
+This is an invalid content to check that the file is still copied

fixtures/js/css_import.js

@@ -0,0 +1,2 @@
+
+require('./../css/h1_style.css');

fixtures/vuejs-css-modules/App.vue

@@ -0,0 +1,49 @@
+<template>
+  <div id="app" class="red large justified lowercase" :class="[$css.italic, $scss.bold, $less.underline, $stylus.rtl]"></div>
+</template>
+
+<style>
+  .red {
+    color: red;
+  }
+</style>
+
+<style lang="scss">
+  .large {
+    font-size: 50px;
+  }
+</style>
+
+<style lang="less">
+  .justified {
+    text-align: justify;
+  }
+</style>
+
+<style lang="styl">
+  .lowercase
+    text-transform: lowercase
+</style>
+
+<style module="$css">
+  .italic {
+    font-style: italic;
+  }
+</style>
+
+<style lang="scss" module="$scss">
+  .bold {
+    font-weight: bold;
+  }
+</style>
+
+<style lang="less" module="$less">
+  .underline {
+    text-decoration: underline;
+  }
+</style>
+
+<style lang="styl" module="$stylus">
+  .rtl
+    direction: rtl;
+</style>

fixtures/vuejs-css-modules/main.js

@@ -0,0 +1,8 @@
+import Vue from 'vue'
+import App from './App'
+
+new Vue({
+  el: '#app',
+  template: '<App/>',
+  components: { App }
+})