Skip to content

Commit 7fa38f6

Browse files
committed
fix: upgrade dumber-module-loader, use requirejs compatible module.uri
1 parent eeba641 commit 7fa38f6

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,25 @@
4848
"cherow": "^1.6.9",
4949
"convert-source-map": "^1.6.0",
5050
"del": "^3.0.0",
51-
"dumber-module-loader": "^0.15.17",
51+
"dumber-module-loader": "^0.16.0",
5252
"escope": "^3.6.0",
5353
"mkdirp": "^0.5.1",
5454
"node-fetch": "^2.3.0",
5555
"node-libs-browser": "^2.2.0",
5656
"readable-stream": "^2.3.6",
57-
"resolve": "^1.9.0",
57+
"resolve": "^1.10.0",
5858
"source-map": "^0.6.1"
5959
},
6060
"devDependencies": {
6161
"@babel/cli": "^7.2.3",
62-
"@babel/preset-env": "^7.2.3",
62+
"@babel/preset-env": "^7.3.1",
6363
"@babel/register": "^7.0.0",
6464
"babel-eslint": "^10.0.1",
6565
"babelify": "^10.0.0",
6666
"browserify": "^16.2.3",
6767
"del-cli": "^1.1.0",
68-
"eslint": "^5.12.0",
69-
"nyc": "^13.1.0",
68+
"eslint": "^5.13.0",
69+
"nyc": "^13.2.0",
7070
"standard-changelog": "^2.0.6",
7171
"tap-dot": "^2.0.0",
7272
"tape": "^4.9.2",

spec/transformers/cjs-es.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ test('cjsEs transform wraps cjs code with require call', t => {
5353
test('cjsEs transform wraps cjs code with __dirname', t => {
5454
const source = 'exports.name = __dirname;';
5555
const expected = 'define(function (require, exports, module) {' +
56-
'var __filename = module.filename || \'\', __dirname = __filename.slice(0, __filename.lastIndexOf(\'/\') + 1);\n' +
56+
'var __filename = module.uri || \'\', __dirname = __filename.slice(0, __filename.lastIndexOf(\'/\') + 1);\n' +
5757
'exports.name = __dirname;\n});\n';
5858

5959
t.deepEqual(cjsEs(source), {headLines: 1, contents: expected});
@@ -63,7 +63,7 @@ test('cjsEs transform wraps cjs code with __dirname', t => {
6363
test('cjsEs transform wraps cjs code with __filename', t => {
6464
const source = 'exports.name = __filename;';
6565
const expected = 'define(function (require, exports, module) {' +
66-
'var __filename = module.filename || \'\', __dirname = __filename.slice(0, __filename.lastIndexOf(\'/\') + 1);\n' +
66+
'var __filename = module.uri || \'\', __dirname = __filename.slice(0, __filename.lastIndexOf(\'/\') + 1);\n' +
6767
'exports.name = __filename;\n});\n';
6868

6969
t.deepEqual(cjsEs(source), {headLines: 1, contents: expected});

src/transformers/cjs-es.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default function(contents, forceWrap) {
3535

3636
let pre = '';
3737
if (cjsUsage && (cjsUsage.dirname || cjsUsage.filename)) {
38-
pre += 'var __filename = module.filename || \'\', ' +
38+
pre += 'var __filename = module.uri || \'\', ' +
3939
'__dirname = ' +
4040
'__filename.slice(0, __filename.lastIndexOf(\'/\') + 1);';
4141
}

0 commit comments

Comments
 (0)