Merge pull request #250 from y-chan/development

google analyticsが正しく設定できていない問題の修正
stop-covid19-hyogo · Apr 17, 2020 · ca37f04 · ca37f04
2 parents 45e0479 + 58cefd8
commit ca37f04
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -28,9 +28,13 @@ jobs:
 
       - run: yarn install --frozen-lockfile
       - run: yarn run test
-      - run: yarn run generate:dev --fail-on-page-error
+      - name: generate
+        run: |
+          echo "GOOGLE_ANALYTICS_ID=${GOOGLE_ANALYTICS_ID}" >> .env.development
+          cat .env.development
+          yarn run generate:dev --fail-on-page-error
         env:
-          GOOGLE_ANALYTICS_TRACKING_ID: UA-160592267-3
+          GOOGLE_ANALYTICS_ID: ${{ secrets.GOOGLE_ANALYTICS_ID_DEVELOP }}
 
       - run: "echo \"User-agent: *\nDisallow: /\" > ./dist/robots.txt"
 

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -28,9 +28,13 @@ jobs:
 
       - run: yarn install --frozen-lockfile
       - run: yarn run test
-      - run: yarn run generate:dev --fail-on-page-error
+      - name: generate
+        run: |
+          echo "GOOGLE_ANALYTICS_ID=${GOOGLE_ANALYTICS_ID}" >> .env.development
+          cat .env.development
+          yarn run generate:dev --fail-on-page-error
         env:
-          GOOGLE_ANALYTICS_TRACKING_ID: UA-160592267-2
+          GOOGLE_ANALYTICS_ID: ${{ secrets.GOOGLE_ANALYTICS_ID_STAGING }}
 
       - run: "echo \"User-agent: *\nDisallow: /\" > ./dist/robots.txt"
 

diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -88,10 +88,7 @@ const config: Configuration = {
     '@nuxtjs/stylelint-module',
     '@nuxtjs/vuetify',
     '@nuxt/typescript-build',
-    [
-      '@nuxtjs/google-analytics',
-      { id: process.env.GOOGLE_ANALYTICS_TRACKING_ID || 'dummy' }
-    ]
+    '@nuxtjs/google-analytics'
   ],
   /*
    ** Nuxt.js modules
@@ -125,6 +122,9 @@ const config: Configuration = {
     exclude: [''], // Sitemapから除外する項目
     routes: ['/about'] // Sitemapに追加する項目
   },
+  googleAnalytics: {
+    id: process.env.GOOGLE_ANALYTICS_ID // .env.production などに設定してください。
+  },
   optionalCookies: [
     {
       name: 'i18n_redirected',