From 6bcfaf8a3adf6f286025ff849c0a1f2b7dac66cc Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.ir>
Date: Fri, 4 Aug 2017 13:29:42 +0430
Subject: [PATCH] consitent ~/static and ~/assets aliases

closes #1257 #1241
---
 examples/async-component-injection/layouts/default.vue     | 4 ++--
 .../posts/deep-dive-into-ocean.vue                         | 2 +-
 examples/custom-build/pages/index.vue                      | 2 +-
 examples/typescript/nuxt.config.js                         | 2 +-
 examples/with-vuetify/nuxt.config.js                       | 4 ++--
 lib/builder/webpack/base.config.js                         | 7 ++++---
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/examples/async-component-injection/layouts/default.vue b/examples/async-component-injection/layouts/default.vue
index d3a922c8b4..204ba8cf6c 100644
--- a/examples/async-component-injection/layouts/default.vue
+++ b/examples/async-component-injection/layouts/default.vue
@@ -4,8 +4,8 @@
       <nuxt-link to="/">NUXT BLOG</nuxt-link>
     </div>
     <p class="links">
-      <a href="https://twitter.com/nuxt_js" target="_blank"><img src="~assets/img/twitter.png"></a>
-      <a href="https://github.com/nuxt/nuxt.js/tree/dev/examples/async-component-injection" target="_blank"><img src="~assets/img/github.png"></a>
+      <a href="https://twitter.com/nuxt_js" target="_blank"><img src="~/assets/img/twitter.png"></a>
+      <a href="https://github.com/nuxt/nuxt.js/tree/dev/examples/async-component-injection" target="_blank"><img src="~/assets/img/github.png"></a>
     </p>
     <div class="main">
       <nuxt/>
diff --git a/examples/async-component-injection/posts/deep-dive-into-ocean.vue b/examples/async-component-injection/posts/deep-dive-into-ocean.vue
index e8c99537ba..684982dfd4 100644
--- a/examples/async-component-injection/posts/deep-dive-into-ocean.vue
+++ b/examples/async-component-injection/posts/deep-dive-into-ocean.vue
@@ -3,7 +3,7 @@
     <h3 class="date">Jul 10, 2017</h3>
     <h1>Deep dive into the Ocean</h1>
     <div class="content">
-      <img src="~assets/img/swimmer.jpg">
+      <img src="~/assets/img/swimmer.jpg">
       <h2>Subtitle #1</h2>
       <p>Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean. A small river named Duden flows by their place and supplies it with the necessary regelialia. It is a paradisematic country, in which roasted parts of sentences fly into your mouth. Even the all-powerful Pointing has no control about the blind texts it is an almost unorthographic life One day however a small line of blind text by the name of Lorem Ipsum decided to leave for the far World of Grammar.</p>
       <h2>Another subtitle</h2>
diff --git a/examples/custom-build/pages/index.vue b/examples/custom-build/pages/index.vue
index 5be0248820..93b9004318 100644
--- a/examples/custom-build/pages/index.vue
+++ b/examples/custom-build/pages/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <p><img src="~assets/nuxt.png" /></p>
+    <p><img src="~/assets/nuxt.png" /></p>
     <p>This image is included as data:image/png;base64...</p>
     <p>In the source code, the files generated are based on the build.filenames data.</p>
     <p>If you look at the <a href="/_nuxt/vendor.js">vendor.js</a>, lodash has been included (cmd/ctrl + F "lodash").</p>
diff --git a/examples/typescript/nuxt.config.js b/examples/typescript/nuxt.config.js
index 5cce2a6bb2..e6c3bdf87d 100644
--- a/examples/typescript/nuxt.config.js
+++ b/examples/typescript/nuxt.config.js
@@ -18,7 +18,7 @@ module.exports = {
   /*
   ** Build configuration
   */
-  css: ['tachyons/css/tachyons.min.css', '~assets/css/main.css'],
+  css: ['tachyons/css/tachyons.min.css', '~/assets/css/main.css'],
   build: {
     vendor: ['axios', 'gsap', 'vuex-class', 'nuxt-class-component']
   },
diff --git a/examples/with-vuetify/nuxt.config.js b/examples/with-vuetify/nuxt.config.js
index 26034324a3..c1fc371f7a 100644
--- a/examples/with-vuetify/nuxt.config.js
+++ b/examples/with-vuetify/nuxt.config.js
@@ -21,9 +21,9 @@ module.exports = {
   /*
   ** Load Vuetify into the app
   */
-  plugins: ['~plugins/vuetify'],
+  plugins: ['~/plugins/vuetify'],
   /*
   ** Load Vuetify CSS globally
   */
-  css: ['~assets/app.styl']
+  css: ['~/assets/app.styl']
 }
diff --git a/lib/builder/webpack/base.config.js b/lib/builder/webpack/base.config.js
index 0cfda3c9d0..d77edc9d8d 100644
--- a/lib/builder/webpack/base.config.js
+++ b/lib/builder/webpack/base.config.js
@@ -52,10 +52,11 @@ export default function webpackBaseConfig ({ isClient, isServer }) {
         '~~': join(this.options.rootDir),
         '@': join(this.options.srcDir),
         '@@': join(this.options.rootDir),
-        'static': join(this.options.srcDir, 'static'),
-        '~static': join(this.options.srcDir, 'static'),
+
+        // Used by vue-loader so we can use in templates
+        // with <img src="~/assets/nuxt.png" />        
         'assets': join(this.options.srcDir, 'assets'),
-        '~assets': join(this.options.srcDir, 'assets')
+        'static': join(this.options.srcDir, 'static')
       },
       modules: [
         this.options.modulesDir,