Merge pull request #11 from honjio/feature/nuxt-version-update

Nuxt.js のバージョンを最新にした 2.3.4 → 2.4.2
yuki153 · Jan 31, 2019 · ab297a9 · ab297a9
2 parents ff415da + aee5823
commit ab297a9
Show file tree

Hide file tree

Showing 7 changed files with 2,546 additions and 1,055 deletions.
diff --git a/functions/package.json b/functions/package.json
@@ -11,12 +11,17 @@
   "main": "lib/index.js",
   "dependencies": {
     "@nuxtjs/axios": "^5.3.6",
+    "@nuxtjs/style-resources": "^0.1.1",
     "bootstrap": "^4.2.1",
     "bootstrap-vue": "^2.0.0-rc.11",
     "express": "^4.16.4",
+    "firebase": "^5.8.1",
     "firebase-admin": "^6.5.0",
     "firebase-functions": "^2.1.0",
-    "nuxt": "^2.3.4"
+    "node-sass": "^4.11.0",
+    "nodemon": "^1.18.9",
+    "nuxt": "^2.4.2",
+    "sass-loader": "^7.1.0"
   },
   "devDependencies": {
     "typescript": "^3.2.2"

diff --git a/functions/yarn.lock b/functions/yarn.lock
diff --git a/src/components/simple/app-footer.vue b/src/components/simple/app-footer.vue
@@ -1,9 +1,9 @@
 <template>
   <footer class="appFooter">
     <ul class="appFooter__items">
-      <li class="appFooter__item"><nuxt-link to="/">計画内容</nuxt-link></li>
-      <li class="appFooter__item"><nuxt-link to="/list">計画一覧</nuxt-link></li>
-      <li class="appFooter__item"><nuxt-link to="/sign-out">ログアウト</nuxt-link></li>
+      <li class="appFooter__item"><n-link to="/">計画内容</n-link></li>
+      <li class="appFooter__item"><n-link to="/list">計画一覧</n-link></li>
+      <li class="appFooter__item"><n-link to="/sign-out">ログアウト</n-link></li>
     </ul>
   </footer>
 </template>

diff --git a/src/layouts/login.vue b/src/layouts/login.vue
@@ -5,8 +5,8 @@
     </header>
     <nuxt />
     <ul :class="`loginMenu${isHide ? ' isHide' : ''}`">
-      <li :class="`loginMenu__item${isSignIn ? ' isSelected' : ''}`"><nuxt-link to="/sign-in">ログイン画面</nuxt-link></li>
-      <li :class="`loginMenu__item${isSignIn ? '' : ' isSelected'}`"><nuxt-link to="/sign-up">新規登録</nuxt-link></li>
+      <li :class="`loginMenu__item${isSignIn ? ' isSelected' : ''}`"><n-link to="/sign-in">ログイン画面</n-link></li>
+      <li :class="`loginMenu__item${isSignIn ? '' : ' isSelected'}`"><n-link to="/sign-up">新規登録</n-link></li>
     </ul>
   </div>
 </template>

diff --git a/src/nuxt.config.js b/src/nuxt.config.js
@@ -47,9 +47,13 @@ module.exports = {
     // Doc: https://bootstrap-vue.js.org/docs/
     //'bootstrap-vue/nuxt'
 
-    // https://github.com/anteriovieira/nuxt-sass-resources-loader
-    ['nuxt-sass-resources-loader', '@/assets/scss/variable.scss']
+    // https://github.com/nuxt-community/style-resources-module
+    '@nuxtjs/style-resources',
   ],
+  styleResources: {
+    // your settings here
+    sass: '~/assets/scss/variable.scss' // alternative: scss
+  },
   /*
   ** Axios module configuration
   */
@@ -64,11 +68,42 @@ module.exports = {
   build: {
     publicPath: '/assets/',
     extractCSS: true,
+
+    // https://github.com/nuxt/nuxt.js/issues/2260#issuecomment-367114722
+    // https://www.hypertextcandy.com/nuxt-ie11-polyfill
+    // vendor: ['babel-polyfill'],
+    // babel: {
+    //   presets: [
+    //       ['@nuxt/app', {
+    //           // useBuiltIns: true,
+    //           targets: { ie: 11 }
+    //           }
+    //       ]
+    //   ]
+    // },
+
     /*
     ** You can extend webpack config here
     */
     extend(config, ctx) {
+      if (ctx.isDev && ctx.isClient) {
+        // console.log(process.env.NODE_ENV);　output: development
+        config.module.rules.push({
+          // enforce: 'pre',
+          test: /\.js$/,
+          loader: 'babel-loader',
+          // include: /src/, ←　src/ 以降全ての .js が解析される
+          // exclude: /node_modules/, ← src/node_modules/ が除外される（上の行込みでの挙動）
+
+          //（ buildDir の設定が一つ前のパスからになっているため functions/ も解析される。そのため src/から指定する ）
+          include: /src\/node_modules\/normalize-url\//,
+          exclude: /node_modules\/@firebase\//,
+          options: {
+            presets: ['@babel/preset-env'],
+          }
+        })
 
+      }
     }
   }
 }
diff --git a/src/package.json b/src/package.json
@@ -12,16 +12,16 @@
   },
   "dependencies": {
     "@nuxtjs/axios": "^5.3.6",
+    "@nuxtjs/style-resources": "^0.1.1",
     "bootstrap": "^4.1.3",
     "bootstrap-vue": "^2.0.0-rc.11",
     "cross-env": "^5.2.0",
     "firebase": "^5.8.0",
-    "nuxt": "^2.3.4"
+    "nuxt": "^2.4.2"
   },
   "devDependencies": {
     "node-sass": "^4.11.0",
     "nodemon": "^1.18.9",
-    "nuxt-sass-resources-loader": "^2.0.5",
     "sass-loader": "^7.1.0"
   }
 }