diff --git a/RELEASE_PLAN.md b/RELEASE_PLAN.md index 89dcfd2ea1..6f1fbbac4b 100644 --- a/RELEASE_PLAN.md +++ b/RELEASE_PLAN.md @@ -38,7 +38,7 @@ Bugfixes for upcoming features won't be ported of course. ### Edge Release Channel -After experimenting with `nuxt-edge` releases in the last time, the decisiion to do **nightly releases** for now instead of +After experimenting with `nuxt-edge` releases in the last time, the decision to do **nightly releases** for now instead of releasing a version after _each commit_ was made. ## End of Life diff --git a/packages/core/src/module.js b/packages/core/src/module.js index d4b5839364..91ecfbc1c3 100644 --- a/packages/core/src/module.js +++ b/packages/core/src/module.js @@ -164,7 +164,7 @@ export default class ModuleContainer { throw new Error(message) } else { // TODO: Remove in next major version - message += ' Silently ignoring module as programatic usage detected.' + message += ' Silently ignoring module as programmatic usage detected.' consola.warn(message) return } diff --git a/packages/core/test/module.test.js b/packages/core/test/module.test.js index 42bdcaeec2..766d648fe6 100644 --- a/packages/core/test/module.test.js +++ b/packages/core/test/module.test.js @@ -473,6 +473,6 @@ describe('core: module', () => { const result = await module.addModule('test-build-module', true) expect(result).toBeUndefined() - expect(consola.warn).toBeCalledWith('Module `test-build-module` not found. Please ensure `test-build-module` is in `devDependencies` and installed. HINT: During build step, for npm/yarn, `NODE_ENV=production` or `--production` should NOT be used. Silently ignoring module as programatic usage detected.') + expect(consola.warn).toBeCalledWith('Module `test-build-module` not found. Please ensure `test-build-module` is in `devDependencies` and installed. HINT: During build step, for npm/yarn, `NODE_ENV=production` or `--production` should NOT be used. Silently ignoring module as programmatic usage detected.') }) }) diff --git a/packages/generator/test/generator.route.test.js b/packages/generator/test/generator.route.test.js index da275caf82..7fe50091a8 100644 --- a/packages/generator/test/generator.route.test.js +++ b/packages/generator/test/generator.route.test.js @@ -224,7 +224,7 @@ describe('generator: generate route', () => { expect(returned).toEqual(true) }) - test('should generate file in flat folder if route is epmty', async () => { + test('should generate file in flat folder if route is empty', async () => { const nuxt = createNuxt() nuxt.options.build.html = { minify: false } const generator = new Generator(nuxt) diff --git a/packages/server/src/server.js b/packages/server/src/server.js index cd5cebfc3a..1496e357dc 100644 --- a/packages/server/src/server.js +++ b/packages/server/src/server.js @@ -182,13 +182,13 @@ export default class Server { middleware = this._requireMiddleware(middleware) } - // Normalize handler to handle (backward compatiblity) + // Normalize handler to handle (backward compatibility) if (middleware.handler && !middleware.handle) { middleware.handle = middleware.handler delete middleware.handler } - // Normalize path to route (backward compatiblity) + // Normalize path to route (backward compatibility) if (middleware.path && !middleware.route) { middleware.route = middleware.path delete middleware.path @@ -265,7 +265,7 @@ export default class Server { middleware.route = middleware.route.slice(0, -1) } - // Assign _middleware to handle to make accessable from app.stack + // Assign _middleware to handle to make accessible from app.stack middleware.handle._middleware = middleware return middleware diff --git a/packages/utils/src/locking.js b/packages/utils/src/locking.js index 85e8968639..9380a53c47 100644 --- a/packages/utils/src/locking.js +++ b/packages/utils/src/locking.js @@ -65,7 +65,7 @@ export async function lock ({ id, dir, root, options }) { } if (!lockPaths.size) { - // make sure to always cleanup our temporate lockPaths + // make sure to always cleanup our temporary lockPaths onExit(() => { for (const lockPath of lockPaths) { fs.removeSync(lockPath) diff --git a/packages/utils/test/locking.test.js b/packages/utils/test/locking.test.js index 88a8b9ce15..44f37cb1b8 100644 --- a/packages/utils/test/locking.test.js +++ b/packages/utils/test/locking.test.js @@ -115,7 +115,7 @@ describe('util: locking', () => { expect(fs.remove).toHaveBeenCalledTimes(1) }) - test('lock release also cleansup onExit set', async () => { + test('lock release also cleanup onExit set', async () => { const release = jest.fn() properlock.lock.mockImplementation(() => release) diff --git a/packages/utils/test/timer.test.js b/packages/utils/test/timer.test.js index fb59344dce..ea8440b9dc 100644 --- a/packages/utils/test/timer.test.js +++ b/packages/utils/test/timer.test.js @@ -83,12 +83,12 @@ describe('util: timer', () => { const timer = new Timer() const hrtime = process.hrtime process.hrtime = { - bigint: jest.fn(() => 'bingint hrtime') + bigint: jest.fn(() => 'bigint hrtime') } const time = timer.hrtime() - expect(time).toEqual('bingint hrtime') + expect(time).toEqual('bigint hrtime') expect(process.hrtime.bigint).toBeCalledTimes(1) process.hrtime = hrtime diff --git a/packages/vue-app/template/client.js b/packages/vue-app/template/client.js index 3790e9173b..eccc8ab9bf 100644 --- a/packages/vue-app/template/client.js +++ b/packages/vue-app/template/client.js @@ -48,8 +48,8 @@ Object.assign(Vue.config, <%= serialize(vue.config) %>)<%= isTest ? '// eslint-d <% if (nuxtOptions.render.ssrLog) { %> const logs = NUXT.logs || [] if (logs.length > 0) { - const ssrLogSyle = 'background: #2E495E;border-radius: 0.5em;color: white;font-weight: bold;padding: 2px 0.5em;' - console.group && console.group<%= nuxtOptions.render.ssrLog === 'collapsed' ? 'Collapsed' : '' %> ('%cNuxt SSR', ssrLogSyle) + const ssrLogStyle = 'background: #2E495E;border-radius: 0.5em;color: white;font-weight: bold;padding: 2px 0.5em;' + console.group && console.group<%= nuxtOptions.render.ssrLog === 'collapsed' ? 'Collapsed' : '' %> ('%cNuxt SSR', ssrLogStyle) logs.forEach(logObj => (console[logObj.type] || console.log)(...logObj.args)) delete NUXT.logs console.groupEnd && console.groupEnd() diff --git a/packages/vue-app/template/components/nuxt.js b/packages/vue-app/template/components/nuxt.js index 9c106e68e0..7f3ab77898 100644 --- a/packages/vue-app/template/components/nuxt.js +++ b/packages/vue-app/template/components/nuxt.js @@ -83,14 +83,14 @@ export default { }) } - // if an error occured within NuxtError show a simple + // if an error occurred within NuxtError show a simple // error message instead to prevent looping if (this.errorFromNuxtError) { this.$nextTick(() => (this.errorFromNuxtError = false)) return h('div', {}, [ - h('h2', 'An error occured while showing the error page'), - h('p', 'Unfortunately an error occured and while showing the error page another error occured'), + h('h2', 'An error occurred while showing the error page'), + h('p', 'Unfortunately an error occurred and while showing the error page another error occurred'), h('p', `Error details: ${this.errorFromNuxtError.toString()}`), h('nuxt-link', { props: { to: '/' } }, 'Go back to home') ]) diff --git a/scripts/package.js b/scripts/package.js index 06a3e8e340..379eac6e4f 100644 --- a/scripts/package.js +++ b/scripts/package.js @@ -239,7 +239,7 @@ export default class Package { case 'ERROR': return this.logger.error(event.error) - // Eencountered an unrecoverable error + // Encountered an unrecoverable error case 'FATAL': return this.logger.fatal(event.error) diff --git a/test/dev/ssr.test.js b/test/dev/ssr.test.js index c72b8c50b6..ef9f641b03 100644 --- a/test/dev/ssr.test.js +++ b/test/dev/ssr.test.js @@ -17,7 +17,7 @@ const url = route => 'http://localhost:' + port + route // == Uniq Test == // The idea behind is pages using a shared nextId() which returns an incrementing id // So all responses should strictly be different and length of unique responses should equal to responses -// We strictly compare {id} section +// We strictly compare {id} section // Because other response parts such as window.__NUXT may be different resulting false positive passes. const uniqueTest = async (url) => { const results = [] diff --git a/test/e2e/error.test.js b/test/e2e/error.test.js index e9f31c6ea5..cb2f5d468f 100644 --- a/test/e2e/error.test.js +++ b/test/e2e/error.test.js @@ -33,7 +33,7 @@ describe('basic browser', () => { await page.nuxt.navigate('/squared') expect(await page.$text('header')).toBe('Error layout') - expect(await page.$text('h2')).toBe('An error occured while showing the error page') + expect(await page.$text('h2')).toBe('An error occurred while showing the error page') }) test('/about loads normally', async () => {