From 908efc47f51d841cd22b04a1301dc8c5c2752878 Mon Sep 17 00:00:00 2001
From: "Xin Du (Clark)" <clark.duxin@gmail.com>
Date: Mon, 8 Jun 2020 19:53:15 +0100
Subject: [PATCH] feat(template): remove dotenv module (#544)

---
 README.md                                          | 1 -
 packages/cna-template/template/.env                | 1 -
 packages/cna-template/template/nuxt/nuxt.config.js | 4 ----
 packages/cna-template/template/nuxt/package.js     | 3 ---
 packages/cna-template/template/nuxt/package.json   | 1 -
 packages/create-nuxt-app/lib/prompts.js            | 3 +--
 packages/create-nuxt-app/lib/saofile.js            | 5 +----
 7 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 packages/cna-template/template/.env

diff --git a/README.md b/README.md
index 603932d09..8f3eba203 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,6 @@ yarn create nuxt-app <my-project>
 1. Choose Nuxt.js modules:
     - [Axios](https://github.com/nuxt-community/axios-module)
     - [Progressive Web App (PWA) Support](https://github.com/nuxt-community/pwa-module)
-    - [DotEnv](https://github.com/nuxt-community/dotenv-module)
 1. Choose linting tools:
     - [ESLint](https://github.com/nuxt/eslint-config)
     - [Prettier](https://github.com/prettier/prettier)
diff --git a/packages/cna-template/template/.env b/packages/cna-template/template/.env
deleted file mode 100644
index 108b00b6c..000000000
--- a/packages/cna-template/template/.env
+++ /dev/null
@@ -1 +0,0 @@
-BASE_URL=http://localhost:3000
diff --git a/packages/cna-template/template/nuxt/nuxt.config.js b/packages/cna-template/template/nuxt/nuxt.config.js
index 4df5d8121..4c97534d6 100644
--- a/packages/cna-template/template/nuxt/nuxt.config.js
+++ b/packages/cna-template/template/nuxt/nuxt.config.js
@@ -120,10 +120,6 @@ export default {
     <%_ if (pwa) { _%>
     '@nuxtjs/pwa',
     <%_ } _%>
-    <%_ if (dotenv) { _%>
-    // Doc: https://github.com/nuxt-community/dotenv-module
-    '@nuxtjs/dotenv',
-    <%_ } _%>
   ],
   <%_ if (axios) { _%>
   /*
diff --git a/packages/cna-template/template/nuxt/package.js b/packages/cna-template/template/nuxt/package.js
index 27ebeac06..0891fc9ef 100644
--- a/packages/cna-template/template/nuxt/package.js
+++ b/packages/cna-template/template/nuxt/package.js
@@ -64,9 +64,6 @@ module.exports = {
     if (!features.includes('pwa')) {
       delete pkg.dependencies['@nuxtjs/pwa']
     }
-    if (!features.includes('dotenv')) {
-      delete pkg.dependencies['@nuxtjs/dotenv']
-    }
 
     // TS
     const typescript = language.includes('ts')
diff --git a/packages/cna-template/template/nuxt/package.json b/packages/cna-template/template/nuxt/package.json
index 75116af35..f6c146df3 100644
--- a/packages/cna-template/template/nuxt/package.json
+++ b/packages/cna-template/template/nuxt/package.json
@@ -21,7 +21,6 @@
     "@nuxt/typescript-runtime": "^0.4.9",
     "@nuxtjs/axios": "^5.11.0",
     "@nuxtjs/pwa": "^3.0.0-beta.20",
-    "@nuxtjs/dotenv": "^1.4.1",
     "nuxt": "^2.12.2"
   },
   "devDependencies": {
diff --git a/packages/create-nuxt-app/lib/prompts.js b/packages/create-nuxt-app/lib/prompts.js
index ccf2d3e17..850265d7e 100644
--- a/packages/create-nuxt-app/lib/prompts.js
+++ b/packages/create-nuxt-app/lib/prompts.js
@@ -62,8 +62,7 @@ module.exports = [
     pageSize: 10,
     choices: [
       { name: 'Axios', value: 'axios' },
-      { name: 'Progressive Web App (PWA) Support', value: 'pwa' },
-      { name: 'DotEnv', value: 'dotenv' }
+      { name: 'Progressive Web App (PWA) Support', value: 'pwa' }
     ],
     default: []
   },
diff --git a/packages/create-nuxt-app/lib/saofile.js b/packages/create-nuxt-app/lib/saofile.js
index 7bb8d5024..4c19b244f 100644
--- a/packages/create-nuxt-app/lib/saofile.js
+++ b/packages/create-nuxt-app/lib/saofile.js
@@ -18,7 +18,6 @@ module.exports = {
     const lintStaged = eslint && this.answers.linter.includes('lintStaged')
     const stylelint = this.answers.linter.includes('stylelint')
     const axios = this.answers.features.includes('axios')
-    const dotenv = this.answers.features.includes('dotenv')
     const pm = this.answers.pm === 'yarn' ? 'yarn' : 'npm'
     const pmRun = this.answers.pm === 'yarn' ? 'yarn' : 'npm run'
 
@@ -36,8 +35,7 @@ module.exports = {
       axios,
       edge,
       pm,
-      pmRun,
-      dotenv
+      pmRun
     }
   },
   actions () {
@@ -84,7 +82,6 @@ module.exports = {
         '_jsconfig.json': 'devTools.includes("jsconfig.json")',
         'tsconfig.json': 'language.includes("ts")',
         'semantic.yml': 'devTools.includes("semantic-pull-requests")',
-        '.env': 'features.includes("dotenv")',
         '_stylelint.config.js': 'linter.includes("stylelint")'
       },
       templateDir