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(): begin using acorn provided by rollup. #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(): begin using acorn provided by rollup. #15

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
9 changes: 4 additions & 5 deletions dist/rollup-plugin-node-globals.cjs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau

var rollupPluginutils = require('rollup-pluginutils');
var estreeWalker = require('estree-walker');
var acorn = require('acorn');
var MagicString = _interopDefault(require('magic-string'));
var path = require('path');
var crypto = require('crypto');
Expand Down Expand Up @@ -67,11 +66,11 @@ function flatten(node) {
};
}

function inject (code, id, mod1, mod2, sourceMap) {
function inject (code, id, mod1, mod2, sourceMap, parse) {
var ast = void 0;

try {
ast = acorn.parse(code, {
ast = parse(code, {
ecmaVersion: 8,
sourceType: 'module'
});
Expand Down Expand Up @@ -245,13 +244,13 @@ var index = (function (options) {
},
transform: function transform(code, id) {
if (id === BUFFER_PATH) {
return inject(code, id, buf, new Map(), sourceMap);
return inject(code, id, buf, new Map(), sourceMap, this.parse);
}
if (!filter(id)) return null;
if (code.search(firstpass) === -1) return null;
if (id.slice(-3) !== '.js') return null;

var out = inject(code, id, mods1, mods2, sourceMap);
var out = inject(code, id, mods1, mods2, sourceMap, this.parse);
return out;
}
};
Expand Down
7 changes: 3 additions & 4 deletions dist/rollup-plugin-node-globals.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { attachScopes, createFilter } from 'rollup-pluginutils';
import { walk } from 'estree-walker';
import { parse } from 'acorn';
import MagicString from 'magic-string';
import { join, relative, dirname } from 'path';
import { randomBytes } from 'crypto';
Expand Down Expand Up @@ -63,7 +62,7 @@ function flatten(node) {
};
}

function inject (code, id, mod1, mod2, sourceMap) {
function inject (code, id, mod1, mod2, sourceMap, parse) {
var ast = void 0;

try {
Expand Down Expand Up @@ -241,13 +240,13 @@ var index = (function (options) {
},
transform: function transform(code, id) {
if (id === BUFFER_PATH) {
return inject(code, id, buf, new Map(), sourceMap);
return inject(code, id, buf, new Map(), sourceMap, this.parse);
}
if (!filter(id)) return null;
if (code.search(firstpass) === -1) return null;
if (id.slice(-3) !== '.js') return null;

var out = inject(code, id, mods1, mods2, sourceMap);
var out = inject(code, id, mods1, mods2, sourceMap, this.parse);
return out;
}
};
Expand Down
9 changes: 4 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@
"author": "Calvin Metcalf <[email protected]>",
"license": "MIT",
"dependencies": {
"acorn": "^5.5.0",
"buffer-es6": "^4.9.3",
"estree-walker": "^0.5.1",
"magic-string": "^0.22.4",
"magic-string": "^0.25.0",
"process-es6": "^0.11.6",
"rollup-pluginutils": "^2.0.1"
"rollup-pluginutils": "^2.3.1"
},
"keywords": [
"rollup-plugin"
Expand All @@ -35,9 +34,9 @@
"mkdirp": "^0.5.1",
"mocha": "^5.0.1",
"rimraf": "^2.6.2",
"rollup": "^0.56.3",
"rollup": "^0.64.1",
"rollup-plugin-babel": "^3.0.3",
"rollup-plugin-node-resolve": "^3.0.3"
"rollup-plugin-node-resolve": "^3.3.0"
},
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ export default options => {
},
transform(code, id) {
if (id === BUFFER_PATH) {
return inject(code, id, buf, new Map(), sourceMap);
return inject(code, id, buf, new Map(), sourceMap, this.parse);
}
if (!filter(id)) return null;
if (code.search(firstpass) === -1) return null;
if (id.slice(-3) !== '.js') return null;

var out = inject(code, id, mods1, mods2, sourceMap);
var out = inject(code, id, mods1, mods2, sourceMap, this.parse);
return out;
}
}
Expand Down
5 changes: 1 addition & 4 deletions src/inject/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ import {
import {
walk
} from 'estree-walker';
import {
parse
} from 'acorn';
import makeLegalIdentifier from './makeLegalIdentifier';
import MagicString from 'magic-string';

Expand Down Expand Up @@ -51,7 +48,7 @@ function flatten(node) {
}


export default function(code, id, mod1, mod2, sourceMap) {
export default function(code, id, mod1, mod2, sourceMap, parse) {
let ast;

try {
Expand Down