Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for __dirname #8334

Closed
wants to merge 18 commits into from
Closed

Fix for __dirname #8334

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3b1d79e
Fix for __dirname
huv1k Aug 12, 2019
6f2f8a0
Cleanup logs
huv1k Aug 12, 2019
6013200
Adjust config
huv1k Aug 12, 2019
adb6362
Add tests for recompile dev
huv1k Aug 12, 2019
b4e2b09
Test for same file recompile not working
huv1k Aug 12, 2019
e39b71d
Fix cache for server
huv1k Aug 13, 2019
a804ade
Merge branch 'canary' into dirname-fix
huv1k Aug 16, 2019
4b92120
Change tests remove cache
huv1k Aug 29, 2019
f83509d
Add tests for write
huv1k Aug 30, 2019
b75e7f7
Merge branch 'canary' into dirname-fix
huv1k Sep 11, 2019
da2e896
Remove save test
huv1k Sep 11, 2019
53d651f
Adjust tests
huv1k Sep 11, 2019
ecfc5e0
Adjust tests
huv1k Sep 11, 2019
52d129f
Fix tests
huv1k Sep 11, 2019
ad1a1ed
Merge branch 'canary' into dirname-fix
huv1k Sep 11, 2019
cbce18a
Fix static test
huv1k Sep 11, 2019
ab19439
Merge branch 'canary' into dirname-fix
huv1k Sep 13, 2019
de14fd9
Merge branch 'canary' into dirname-fix
huv1k Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/next/build/webpack-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,20 @@ export default async function getBaseWebpackConfig(
include: [path.join(dir, 'data')],
use: 'next-data-loader',
},
isServer && {
test: /\.(tsx|ts|js|mjs|jsx|node)$/,
parser: { amd: false },
use: {
loader: '@zeit/webpack-asset-relocator-loader',
options: {
filterAssetBase: dir,
emitDirnameAll: false,
huv1k marked this conversation as resolved.
Show resolved Hide resolved
emitFilterAssetBaseAll: false,
huv1k marked this conversation as resolved.
Show resolved Hide resolved
production: !dev,
debugLog: false,
Timer marked this conversation as resolved.
Show resolved Hide resolved
},
},
},
{
test: /\.(tsx|ts|js|mjs|jsx)$/,
include: [
Expand Down
1 change: 1 addition & 0 deletions packages/next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"@babel/preset-typescript": "7.3.3",
"@babel/runtime": "7.4.5",
"@babel/runtime-corejs2": "7.4.5",
"@zeit/webpack-asset-relocator-loader": "0.6.2",
"amphtml-validator": "1.0.23",
"async-sema": "3.0.0",
"autodll-webpack-plugin": "0.4.2",
Expand Down
11 changes: 11 additions & 0 deletions test/integration/api-support/pages/api/dirname.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import fs from 'fs'
import path from 'path'

export default (req, res) => {
const fileContent = fs.readFileSync(
path.resolve(__dirname, '..', 'index.js'),
'utf8'
)

res.end(fileContent)
}
8 changes: 8 additions & 0 deletions test/integration/api-support/test/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,14 @@ function runTests (serverless = false) {
expect(res.status).toBe(404)
})

it('should work with __dirname', async () => {
const data = await fetchViaHTTP(appPort, '/api/dirname', null, {}).then(
res => res.ok && res.text()
)

expect(data).toContain('export default () => <div>API - support</div>')
})

it('should build api routes', async () => {
await nextBuild(appDir, [], { stdout: true })
if (serverless) {
Expand Down
12 changes: 12 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2601,6 +2601,13 @@
dependencies:
"@babel/preset-typescript" "^7.0.0"

"@zeit/webpack-asset-relocator-loader@0.6.2":
version "0.6.2"
resolved "https://registry.yarnpkg.com/@zeit/webpack-asset-relocator-loader/-/webpack-asset-relocator-loader-0.6.2.tgz#b15353d8578562f299eddb94d4b771297acc0487"
integrity sha512-IUz2YvFAv03LHP4dhjHqG549ecZhdp7KU8B+vGfJRgcDzvlCmc9CA1YcYfJHVO96U8dU5z85RIysr2whYUXmgQ==
dependencies:
sourcemap-codec "^1.4.4"

JSONStream@^1.0.4, JSONStream@^1.3.4:
version "1.3.5"
resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
Expand Down Expand Up @@ -12642,6 +12649,11 @@ source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6:
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=

sourcemap-codec@^1.4.4:
version "1.4.6"
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz#e30a74f0402bad09807640d39e971090a08ce1e9"
integrity sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==

spawn-sync@^1.0.15:
version "1.0.15"
resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476"
Expand Down