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

feat: Use relative path to node_modules by default #22

Merged
merged 1 commit into from
Aug 18, 2019
Merged

feat: Use relative path to node_modules by default #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ If the plugin settings object is omitted the defaults are used:
### modulesDir

The URL path in which files from the `node_modules` directory will be published on
the web server. This must always be an absolute URL (with or without hostname).
Default "/node_modules".
the web server. This must be an absolute URL if provided (with or without hostname).
Default undefined.

### rootBaseDir

Expand Down
4 changes: 2 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ function tryResolve(babelPath, importPath, sourceFileName, pluginOptions) {
let importPathRel = path.relative(path.dirname(sourceFileName), importPathAbs);
const sep = pluginOptions.fsPath === true ? path.sep : path.posix.sep;

if (isNodeModule && !fromNodeModule) {
const modulesDir = pluginOptions.modulesDir || (pluginOptions.fsPath === true ? nodeModules : '/node_modules');
const {modulesDir} = pluginOptions;
if (modulesDir && isNodeModule && !fromNodeModule) {
if (modulesDir.includes('://')) {
return modulesDir + (modulesDir.endsWith('/') ? '' : '/') + pathToURL(path.relative(nodeModules, importPathAbs));
}
Expand Down
4 changes: 4 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
},
"devDependencies": {
"@babel/core": "^7.4.5",
"@cfware/eslint-config-node": "^0.1.0",
"@cfware/fake-module1": "file:fixtures/packages/fake-module1@2",
"@cfware/fake-module2": "file:fixtures/packages/fake-module2",
"@cfware/nyc": "^0.5.0",
Expand All @@ -46,5 +47,8 @@
"nyc": "^14.1.1",
"standard-version": "^6.0.1",
"xo": "^0.24.0"
},
"xo": {
"extends": "@cfware/eslint-config-node"
}
}
9 changes: 5 additions & 4 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import path from 'path';
import test from 'ava';
import {transform} from '@babel/core';
import plugin from '..';
import plugin from '../index.js';

const projectDir = path.resolve(__dirname, '..');
const nodeModules = path.resolve(projectDir, 'node_modules');
const nodeModulesRelative = path.join('.', 'node_modules');

function babelTest(t, source, result, options = {}) {
const origError = console.error;
Expand Down Expand Up @@ -86,7 +87,7 @@ test('absolute resolve', t => {

test('static node package', t => babelTest(t,
'import mod from "@cfware/fake-module1";',
'import mod from "/node_modules/@cfware/fake-module1/index.js";'
'import mod from "./node_modules/@cfware/fake-module1/index.js";'
));

test('static package from resolve directory A', t => babelTest(t,
Expand All @@ -112,7 +113,7 @@ test('static package from resolve directory A imported by a file in resolve dire

test('static package from resolve directory B imported by a file in resolve directory A', t => babelTest(t,
'import mod from "@cfware/fake-module1";',
'import mod from "/node_modules/@cfware/fake-module1/index.js";',
'import mod from "../../../node_modules/@cfware/fake-module1/index.js";',
{
filename: 'fixtures/my-modules/my-other-module/foo.js',
plugins: [[plugin, {
Expand Down Expand Up @@ -181,7 +182,7 @@ test('static node package to package with absolute path', t => babelTest(t,

test('static node package to package with fsPath but no modulesDir specified', t => babelTest(t,
'import mod from "is-windows";',
`import mod from "${path.join(nodeModules, 'is-windows', 'index.js').replace(/\\/g, '\\\\')}";`,
`import mod from ".${(path.sep + path.join(nodeModulesRelative, 'is-windows', 'index.js')).replace(/\\/g, '\\\\')}";`,
{
plugins: [[plugin, {fsPath: true}]],
filename: 'index.js'
Expand Down