revert 380ffb6 a and 4d8077f for hotfix

nuxt · Apr 1, 2021 · ccfceeb · ccfceeb
1 parent 04d3382
commit ccfceeb
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 143 deletions.
diff --git a/packages/config/src/config/generate.js b/packages/config/src/config/generate.js
@@ -8,7 +8,6 @@ export default () => ({
   fallback: '200.html',
   crawler: true,
   manifest: true,
-  nojekyll: true,
   cache: {
     ignore: [],
     globbyOptions: {

diff --git a/packages/config/test/__snapshots__/options.test.js.snap b/packages/config/test/__snapshots__/options.test.js.snap
@@ -221,7 +221,6 @@ Object {
     "fallback": "200.html",
     "interval": 0,
     "manifest": true,
-    "nojekyll": true,
     "routes": Array [],
     "staticAssets": Object {
       "base": "/_nuxt/static",

diff --git a/packages/config/test/config/__snapshots__/index.test.js.snap b/packages/config/test/config/__snapshots__/index.test.js.snap
@@ -196,7 +196,6 @@ Object {
     "fallback": "200.html",
     "interval": 0,
     "manifest": true,
-    "nojekyll": true,
     "routes": Array [],
     "staticAssets": Object {
       "base": undefined,
@@ -585,7 +584,6 @@ Object {
     "fallback": "200.html",
     "interval": 0,
     "manifest": true,
-    "nojekyll": true,
     "routes": Array [],
     "staticAssets": Object {
       "base": undefined,

diff --git a/packages/generator/src/generator.js b/packages/generator/src/generator.js
@@ -267,10 +267,8 @@ export default class Generator {
 
     // Add .nojekyll file to let GitHub Pages add the _nuxt/ folder
     // https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/
-    if (this.options.generate.nojekyll) {
-      const nojekyllPath = path.resolve(this.distPath, '.nojekyll')
-      await fsExtra.writeFile(nojekyllPath, '')
-    }
+    const nojekyllPath = path.resolve(this.distPath, '.nojekyll')
+    await fsExtra.writeFile(nojekyllPath, '')
 
     await this.nuxt.callHook('generate:distCopied', this)
     await this.nuxt.callHook('export:distCopied', this)

diff --git a/packages/generator/test/generator.init.test.js b/packages/generator/test/generator.init.test.js
@@ -182,7 +182,6 @@ describe('generator: initialize', () => {
   test('should initialize destination folder', async () => {
     const nuxt = createNuxt()
     nuxt.options.generate.fallback = 'fallback.html'
-    nuxt.options.generate.nojekyll = true
     const generator = new Generator(nuxt)
     fsExtra.exists.mockReturnValueOnce(false)
 

diff --git a/packages/types/config/generate.d.ts b/packages/types/config/generate.d.ts
@@ -18,7 +18,6 @@ export interface NuxtOptionsGenerate {
   exclude?: RegExp[]
   fallback?: string | boolean
   interval?: number
-  nojekyll?: boolean
   routes?: NuxtOptionsGenerateRoute[] | NuxtOptionsGenerateRoutesFunction | NuxtOptionsGenerateRoutesFunctionWithCallback
   subFolders?: boolean
   cache?: false | {

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -47,7 +47,6 @@
     "vue-loader": "^15.9.6",
     "vue-style-loader": "^4.1.3",
     "vue-template-compiler": "^2.6.12",
-    "watchpack": "^2.1.1",
     "webpack": "^4.46.0",
     "webpack-bundle-analyzer": "^4.4.0",
     "webpack-dev-middleware": "^4.1.0",

diff --git a/packages/webpack/src/config/base.js b/packages/webpack/src/config/base.js
@@ -17,7 +17,6 @@ import { TARGETS, isUrl, urlJoin, getPKG, tryResolve, requireModule, resolveModu
 import PerfLoader from '../utils/perf-loader'
 import StyleLoader from '../utils/style-loader'
 import WarningIgnorePlugin from '../plugins/warning-ignore'
-import { Watchpack2Plugin } from '../plugins/watchpack'
 import { reservedVueTags } from '../utils/reserved-tags'
 
 export default class WebpackBaseConfig {
@@ -479,8 +478,6 @@ export default class WebpackBaseConfig {
       }))
     }
 
-    plugins.push(new Watchpack2Plugin())
-
     return plugins
   }
 

diff --git a/packages/webpack/src/plugins/watchpack.js b/packages/webpack/src/plugins/watchpack.js
diff --git a/yarn.lock b/yarn.lock
@@ -6492,11 +6492,6 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
-glob-to-regexp@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
-  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
-
 glob@7.1.6, glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
@@ -13279,14 +13274,6 @@ watchpack@^1.7.4:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.1"
 
-watchpack@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz#e99630550fca07df9f90a06056987baa40a689c7"
-  integrity sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==
-  dependencies:
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.1.2"
-
 wcwidth@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"