diff --git a/Gruntfile.js b/Gruntfile.js index 70fd9d8a8..bb3eb9508 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -341,15 +341,17 @@ module.exports = function(grunt) { }, { cwd: 'build/docs', - src: ['**', '!ptore2e/**'], + src: ['**', '!ptore2e/**', '!index*.html'], dest: 'deploy/docs/', expand: true }, { - src: ['build/docs/index-production.html'], - dest: docsScriptFolder + '/functions/content', - expand: true, - flatten: true + src: 'build/docs/index-production.html', + dest: 'deploy/docs/index.html' + }, + { + src: 'build/docs/index-production.html', + dest: docsScriptFolder + '/functions/content/index.html' }, { cwd: 'build/docs', diff --git a/scripts/docs.angularjs.org-firebase/firebase.json b/scripts/docs.angularjs.org-firebase/firebase.json index a83409ed7..0e018010b 100644 --- a/scripts/docs.angularjs.org-firebase/firebase.json +++ b/scripts/docs.angularjs.org-firebase/firebase.json @@ -1,11 +1,6 @@ { "hosting": { "public": "../../deploy/docs", - "ignore": [ - "/index.html", - "/index-debug.html", - "/index-jquery.html" - ], "redirects": [ { "source": "/error/:namespace\\::error*", @@ -14,14 +9,6 @@ } ], "rewrites": [ - { - "source": "/", - "destination": "/index-production.html" - }, - { - "source": "/index.html", - "destination": "/index-production.html" - }, { "source": "**/*!(.@(jpg|jpeg|gif|png|html|js|map|json|css|svg|ttf|txt|woff|woff2|eot|xml))", "function": "sendFile" diff --git a/scripts/docs.angularjs.org-firebase/functions/index.js b/scripts/docs.angularjs.org-firebase/functions/index.js index b86eb32f6..eace519a4 100644 --- a/scripts/docs.angularjs.org-firebase/functions/index.js +++ b/scripts/docs.angularjs.org-firebase/functions/index.js @@ -25,7 +25,7 @@ const buildSnapshot = data => ` function sendFile(request, response) { const snapshotRequested = typeof request.query._escaped_fragment_ !== 'undefined'; - const filePath = `content/${snapshotRequested ? `partials${request.path}` : 'index-production'}.html`; + const filePath = `content/${snapshotRequested ? `partials${request.path}` : 'index'}.html`; if (snapshotRequested) { fs.readFile(filePath, {encoding: 'utf8'}, (error, data) => {