jass 0.9.1 → 0.9.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/lib/jass.rb +5 -0
- data/lib/jass/compiler.rb +5 -0
- data/lib/jass/plugin.rb +2 -1
- data/lib/jass/version.rb +1 -1
- data/vendor/node_modules/@types/estree/index.d.ts +4 -2
- data/vendor/node_modules/@types/estree/package.json +2 -2
- data/vendor/node_modules/acorn/bin/_acorn.js +12 -12
- data/vendor/node_modules/acorn/bin/run_test262.js +2 -3
- data/vendor/node_modules/acorn/bin/test262.whitelist +0 -5
- data/vendor/node_modules/acorn/dist/acorn.es.js +76 -68
- data/vendor/node_modules/acorn/dist/acorn.js +76 -68
- data/vendor/node_modules/acorn/dist/acorn_loose.es.js +42 -30
- data/vendor/node_modules/acorn/dist/acorn_loose.js +42 -30
- data/vendor/node_modules/acorn/dist/walk.es.js +47 -43
- data/vendor/node_modules/acorn/dist/walk.js +47 -43
- data/vendor/node_modules/acorn/package.json +9 -5
- data/vendor/node_modules/chalk/index.js.flow +93 -0
- data/vendor/node_modules/chalk/package.json +8 -3
- data/vendor/node_modules/color-convert/conversions.js +36 -29
- data/vendor/node_modules/color-convert/package.json +4 -4
- data/vendor/node_modules/estree-walker/index.d.ts +17 -0
- data/vendor/node_modules/estree-walker/package.json +2 -1
- data/vendor/node_modules/fill-range/index.js +2 -2
- data/vendor/node_modules/fill-range/package.json +24 -7
- data/vendor/node_modules/is-reference/node_modules/@types/estree/index.d.ts +546 -0
- data/vendor/node_modules/is-reference/node_modules/@types/estree/package.json +22 -0
- data/vendor/node_modules/math-random/browser.js +17 -0
- data/vendor/node_modules/math-random/node.js +13 -0
- data/vendor/node_modules/math-random/package.json +31 -0
- data/vendor/node_modules/math-random/test.js +26 -0
- data/vendor/node_modules/nodent-compiler/compiler.js +115 -11
- data/vendor/node_modules/nodent-compiler/{lib/output.js → output.js} +0 -0
- data/vendor/node_modules/nodent-compiler/package.json +8 -4
- data/vendor/node_modules/{nodent-compiler/lib → nodent-transform}/arboriculture.js +1340 -1107
- data/vendor/node_modules/nodent-transform/package.json +19 -0
- data/vendor/node_modules/path-parse/package.json +1 -1
- data/vendor/node_modules/pretty-ms/index.js +2 -1
- data/vendor/node_modules/pretty-ms/package.json +2 -3
- data/vendor/node_modules/randomatic/index.js +12 -2
- data/vendor/node_modules/randomatic/node_modules/is-number/index.js +6 -7
- data/vendor/node_modules/randomatic/node_modules/is-number/package.json +9 -16
- data/vendor/node_modules/randomatic/node_modules/kind-of/index.js +112 -102
- data/vendor/node_modules/randomatic/node_modules/kind-of/package.json +18 -20
- data/vendor/node_modules/randomatic/package.json +15 -13
- data/vendor/node_modules/repeat-element/index.js +1 -1
- data/vendor/node_modules/repeat-element/package.json +27 -22
- data/vendor/node_modules/resolve/lib/async.js +20 -17
- data/vendor/node_modules/resolve/lib/core.js +2 -2
- data/vendor/node_modules/resolve/lib/core.json +4 -1
- data/vendor/node_modules/resolve/lib/sync.js +52 -13
- data/vendor/node_modules/resolve/package.json +3 -3
- data/vendor/node_modules/rollup-plugin-commonjs/dist/rollup-plugin-commonjs.cjs.js +50 -12
- data/vendor/node_modules/rollup-plugin-commonjs/dist/rollup-plugin-commonjs.es.js +50 -12
- data/vendor/node_modules/rollup-plugin-commonjs/package.json +2 -2
- data/vendor/node_modules/rollup-plugin-commonjs/src/index.js +49 -11
- data/vendor/node_modules/rollup-plugin-commonjs/src/transform.js +1 -1
- data/vendor/node_modules/rollup-plugin-node-resolve/dist/rollup-plugin-node-resolve.cjs.js +82 -85
- data/vendor/node_modules/rollup-plugin-node-resolve/dist/rollup-plugin-node-resolve.es.js +82 -85
- data/vendor/node_modules/rollup-plugin-node-resolve/package.json +1 -1
- data/vendor/node_modules/rollup-plugin-node-resolve/src/index.js +81 -84
- data/vendor/node_modules/rollup-pluginutils/dist/pluginutils.cjs.js +81 -2
- data/vendor/node_modules/rollup-pluginutils/dist/pluginutils.es.js +81 -3
- data/vendor/node_modules/rollup-pluginutils/package.json +12 -6
- data/vendor/node_modules/rollup-pluginutils/src/attachScopes.js +10 -2
- data/vendor/node_modules/rollup-pluginutils/src/dataToEsm.js +69 -0
- data/vendor/node_modules/rollup-pluginutils/src/index.js +1 -0
- data/vendor/node_modules/supports-color/index.js +1 -5
- data/vendor/node_modules/supports-color/package.json +51 -51
- data/vendor/yarn.lock +65 -70
- metadata +16 -21
- data/vendor/node_modules/irregular-plurals/irregular-plurals.json +0 -146
- data/vendor/node_modules/irregular-plurals/package.json +0 -39
- data/vendor/node_modules/nodent-compiler/lib/parser.js +0 -291
- data/vendor/node_modules/path-parse/index.min.js +0 -1
- data/vendor/node_modules/path-parse/test.min.js +0 -1
- data/vendor/node_modules/plur/index.js +0 -20
- data/vendor/node_modules/plur/package.json +0 -42
- data/vendor/node_modules/randomatic/node_modules/is-number/node_modules/kind-of/index.js +0 -116
- data/vendor/node_modules/randomatic/node_modules/is-number/node_modules/kind-of/package.json +0 -90
- data/vendor/node_modules/rollup-pluginutils/dist/pluginutils.es6.js +0 -217
- data/vendor/node_modules/rollup-pluginutils/node_modules/estree-walker/dist/estree-walker.es.js +0 -55
- data/vendor/node_modules/rollup-pluginutils/node_modules/estree-walker/dist/estree-walker.es6.js +0 -59
- data/vendor/node_modules/rollup-pluginutils/node_modules/estree-walker/dist/estree-walker.umd.js +0 -65
- data/vendor/node_modules/rollup-pluginutils/node_modules/estree-walker/package.json +0 -33
- data/vendor/node_modules/rollup-pluginutils/node_modules/estree-walker/src/estree-walker.js +0 -49
@@ -164,7 +164,7 @@ function getName ( id ) {
|
|
164
164
|
}
|
165
165
|
}
|
166
166
|
|
167
|
-
var reserved = 'abstract arguments boolean break byte case catch char class const continue debugger default delete do double else enum eval export extends false final finally float for function goto if implements import in instanceof int interface let long native new null package private protected public return short static super switch synchronized this throw throws transient true try typeof var void volatile while with yield'.split( ' ' );
|
167
|
+
var reserved = 'abstract arguments boolean break byte case catch char class const continue debugger default delete do double else enum eval export extends false final finally float for from function goto if implements import in instanceof int interface let long native new null package private protected public return short static super switch synchronized this throw throws transient true try typeof var void volatile while with yield'.split( ' ' );
|
168
168
|
var blacklist = { __esModule: true };
|
169
169
|
reserved.forEach( function (word) { return blacklist[ word ] = true; } );
|
170
170
|
|
@@ -629,6 +629,7 @@ function startsWith ( str, prefix ) {
|
|
629
629
|
return str.slice( 0, prefix.length ) === prefix;
|
630
630
|
}
|
631
631
|
|
632
|
+
var isCjsPromises = Object.create(null);
|
632
633
|
|
633
634
|
function commonjs ( options ) {
|
634
635
|
if ( options === void 0 ) options = {};
|
@@ -687,9 +688,36 @@ function commonjs ( options ) {
|
|
687
688
|
|
688
689
|
var sourceMap = options.sourceMap !== false;
|
689
690
|
|
690
|
-
var commonjsModules = new Map();
|
691
691
|
var resolveUsingOtherResolvers;
|
692
692
|
|
693
|
+
function getIsCjsPromise ( id ) {
|
694
|
+
var isCjsPromise = isCjsPromises[id];
|
695
|
+
if (isCjsPromise)
|
696
|
+
{ return isCjsPromise.promise; }
|
697
|
+
|
698
|
+
var promise = new Promise( function (resolve$$1) {
|
699
|
+
isCjsPromises[id] = isCjsPromise = {
|
700
|
+
resolve: resolve$$1,
|
701
|
+
promise: undefined
|
702
|
+
};
|
703
|
+
});
|
704
|
+
isCjsPromise.promise = promise;
|
705
|
+
|
706
|
+
return promise;
|
707
|
+
}
|
708
|
+
function setIsCjsPromise ( id, promise ) {
|
709
|
+
var isCjsPromise = isCjsPromises[id];
|
710
|
+
if (isCjsPromise) {
|
711
|
+
if (isCjsPromise.resolve) {
|
712
|
+
isCjsPromise.resolve(promise);
|
713
|
+
isCjsPromise.resolve = undefined;
|
714
|
+
}
|
715
|
+
}
|
716
|
+
else {
|
717
|
+
isCjsPromises[id] = { promise: promise, resolve: undefined };
|
718
|
+
}
|
719
|
+
}
|
720
|
+
|
693
721
|
return {
|
694
722
|
name: 'commonjs',
|
695
723
|
|
@@ -725,8 +753,12 @@ function commonjs ( options ) {
|
|
725
753
|
resolvers.unshift( function (id) { return isExternal( id ) ? false : null; } );
|
726
754
|
|
727
755
|
resolveUsingOtherResolvers = first( resolvers );
|
728
|
-
|
729
|
-
var entryModules =
|
756
|
+
var input = options$1.input || options$1.entry;
|
757
|
+
var entryModules = Array.isArray(input) ?
|
758
|
+
input :
|
759
|
+
typeof input === 'object' && input !== null ?
|
760
|
+
Object.values(input) :
|
761
|
+
[input];
|
730
762
|
entryModuleIdsPromise = Promise.all(
|
731
763
|
entryModules.map( function (entry) { return resolveId( entry ); })
|
732
764
|
);
|
@@ -749,12 +781,15 @@ function commonjs ( options ) {
|
|
749
781
|
var actualId$1 = id.slice( PREFIX.length );
|
750
782
|
var name$1 = getName( actualId$1 );
|
751
783
|
|
752
|
-
|
753
|
-
|
754
|
-
|
755
|
-
|
756
|
-
|
757
|
-
|
784
|
+
return ( ( extensions.indexOf( extname( id ) ) === -1 ) ? Promise.resolve(false) : getIsCjsPromise( actualId$1 ) )
|
785
|
+
.then( function (isCjs) {
|
786
|
+
if ( isCjs )
|
787
|
+
{ return ("import { __moduleExports } from " + (JSON.stringify( actualId$1 )) + "; export default __moduleExports;"); }
|
788
|
+
else if (esModulesWithoutDefaultExport.indexOf(actualId$1) !== -1)
|
789
|
+
{ return ("import * as " + name$1 + " from " + (JSON.stringify( actualId$1 )) + "; export default " + name$1 + ";"); }
|
790
|
+
else
|
791
|
+
{ return ("import * as " + name$1 + " from " + (JSON.stringify( actualId$1 )) + "; export default ( " + name$1 + " && " + name$1 + "['default'] ) || " + name$1 + ";"); }
|
792
|
+
});
|
758
793
|
}
|
759
794
|
},
|
760
795
|
|
@@ -764,7 +799,7 @@ function commonjs ( options ) {
|
|
764
799
|
if ( !filter( id ) ) { return null; }
|
765
800
|
if ( extensions.indexOf( extname( id ) ) === -1 ) { return null; }
|
766
801
|
|
767
|
-
|
802
|
+
var transformPromise = entryModuleIdsPromise.then( function (entryModuleIds) {
|
768
803
|
var ref = checkEsModule( this$1.parse, code, id );
|
769
804
|
var isEsModule = ref.isEsModule;
|
770
805
|
var hasDefaultExport = ref.hasDefaultExport;
|
@@ -787,11 +822,14 @@ function commonjs ( options ) {
|
|
787
822
|
return;
|
788
823
|
}
|
789
824
|
|
790
|
-
commonjsModules.set( id, true );
|
791
825
|
return transformed;
|
792
826
|
}).catch(function (err) {
|
793
827
|
this$1.error(err, err.loc);
|
794
828
|
});
|
829
|
+
|
830
|
+
setIsCjsPromise(id, transformPromise.then( function (transformed) { return transformed ? true : false; }, function () { return true; } ));
|
831
|
+
|
832
|
+
return transformPromise;
|
795
833
|
}
|
796
834
|
};
|
797
835
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "rollup-plugin-commonjs",
|
3
|
-
"version": "9.1.
|
3
|
+
"version": "9.1.6",
|
4
4
|
"description": "Convert CommonJS modules to ES2015",
|
5
5
|
"main": "dist/rollup-plugin-commonjs.cjs.js",
|
6
6
|
"module": "dist/rollup-plugin-commonjs.es.js",
|
@@ -35,7 +35,7 @@
|
|
35
35
|
"locate-character": "^2.0.5",
|
36
36
|
"mocha": "^5.0.1",
|
37
37
|
"require-relative": "^0.8.7",
|
38
|
-
"rollup": "^0.
|
38
|
+
"rollup": "^0.63.2",
|
39
39
|
"rollup-plugin-buble": "^0.19.2",
|
40
40
|
"rollup-plugin-node-resolve": "^3.0.3",
|
41
41
|
"shx": "^0.2.2",
|
@@ -37,6 +37,7 @@ function startsWith ( str, prefix ) {
|
|
37
37
|
return str.slice( 0, prefix.length ) === prefix;
|
38
38
|
}
|
39
39
|
|
40
|
+
const isCjsPromises = Object.create(null);
|
40
41
|
|
41
42
|
export default function commonjs ( options = {} ) {
|
42
43
|
const extensions = options.extensions || ['.js'];
|
@@ -93,9 +94,36 @@ export default function commonjs ( options = {} ) {
|
|
93
94
|
|
94
95
|
const sourceMap = options.sourceMap !== false;
|
95
96
|
|
96
|
-
const commonjsModules = new Map();
|
97
97
|
let resolveUsingOtherResolvers;
|
98
98
|
|
99
|
+
function getIsCjsPromise ( id ) {
|
100
|
+
let isCjsPromise = isCjsPromises[id];
|
101
|
+
if (isCjsPromise)
|
102
|
+
return isCjsPromise.promise;
|
103
|
+
|
104
|
+
const promise = new Promise( resolve => {
|
105
|
+
isCjsPromises[id] = isCjsPromise = {
|
106
|
+
resolve: resolve,
|
107
|
+
promise: undefined
|
108
|
+
};
|
109
|
+
});
|
110
|
+
isCjsPromise.promise = promise;
|
111
|
+
|
112
|
+
return promise;
|
113
|
+
}
|
114
|
+
function setIsCjsPromise ( id, promise ) {
|
115
|
+
const isCjsPromise = isCjsPromises[id];
|
116
|
+
if (isCjsPromise) {
|
117
|
+
if (isCjsPromise.resolve) {
|
118
|
+
isCjsPromise.resolve(promise);
|
119
|
+
isCjsPromise.resolve = undefined;
|
120
|
+
}
|
121
|
+
}
|
122
|
+
else {
|
123
|
+
isCjsPromises[id] = { promise: promise, resolve: undefined };
|
124
|
+
}
|
125
|
+
}
|
126
|
+
|
99
127
|
return {
|
100
128
|
name: 'commonjs',
|
101
129
|
|
@@ -131,8 +159,12 @@ export default function commonjs ( options = {} ) {
|
|
131
159
|
resolvers.unshift( id => isExternal( id ) ? false : null );
|
132
160
|
|
133
161
|
resolveUsingOtherResolvers = first( resolvers );
|
134
|
-
|
135
|
-
const entryModules =
|
162
|
+
const input = options.input || options.entry;
|
163
|
+
const entryModules = Array.isArray(input) ?
|
164
|
+
input :
|
165
|
+
typeof input === 'object' && input !== null ?
|
166
|
+
Object.values(input) :
|
167
|
+
[input];
|
136
168
|
entryModuleIdsPromise = Promise.all(
|
137
169
|
entryModules.map( entry => resolveId( entry ))
|
138
170
|
);
|
@@ -155,12 +187,15 @@ export default function commonjs ( options = {} ) {
|
|
155
187
|
const actualId = id.slice( PREFIX.length );
|
156
188
|
const name = getName( actualId );
|
157
189
|
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
190
|
+
return ( ( extensions.indexOf( extname( id ) ) === -1 ) ? Promise.resolve(false) : getIsCjsPromise( actualId ) )
|
191
|
+
.then( isCjs => {
|
192
|
+
if ( isCjs )
|
193
|
+
return `import { __moduleExports } from ${JSON.stringify( actualId )}; export default __moduleExports;`;
|
194
|
+
else if (esModulesWithoutDefaultExport.indexOf(actualId) !== -1)
|
195
|
+
return `import * as ${name} from ${JSON.stringify( actualId )}; export default ${name};`;
|
196
|
+
else
|
197
|
+
return `import * as ${name} from ${JSON.stringify( actualId )}; export default ( ${name} && ${name}['default'] ) || ${name};`;
|
198
|
+
});
|
164
199
|
}
|
165
200
|
},
|
166
201
|
|
@@ -168,7 +203,7 @@ export default function commonjs ( options = {} ) {
|
|
168
203
|
if ( !filter( id ) ) return null;
|
169
204
|
if ( extensions.indexOf( extname( id ) ) === -1 ) return null;
|
170
205
|
|
171
|
-
|
206
|
+
const transformPromise = entryModuleIdsPromise.then( (entryModuleIds) => {
|
172
207
|
const {isEsModule, hasDefaultExport, ast} = checkEsModule( this.parse, code, id );
|
173
208
|
if ( isEsModule ) {
|
174
209
|
if ( !hasDefaultExport )
|
@@ -188,11 +223,14 @@ export default function commonjs ( options = {} ) {
|
|
188
223
|
return;
|
189
224
|
}
|
190
225
|
|
191
|
-
commonjsModules.set( id, true );
|
192
226
|
return transformed;
|
193
227
|
}).catch(err => {
|
194
228
|
this.error(err, err.loc);
|
195
229
|
});
|
230
|
+
|
231
|
+
setIsCjsPromise(id, transformPromise.then( transformed => transformed ? true : false, () => true ));
|
232
|
+
|
233
|
+
return transformPromise;
|
196
234
|
}
|
197
235
|
};
|
198
236
|
}
|
@@ -5,7 +5,7 @@ import { extractNames, flatten, isReference, isTruthy, isFalsy } from './ast-uti
|
|
5
5
|
import { PREFIX, HELPERS_ID } from './helpers.js';
|
6
6
|
import { getName } from './utils.js';
|
7
7
|
|
8
|
-
const reserved = 'abstract arguments boolean break byte case catch char class const continue debugger default delete do double else enum eval export extends false final finally float for function goto if implements import in instanceof int interface let long native new null package private protected public return short static super switch synchronized this throw throws transient true try typeof var void volatile while with yield'.split( ' ' );
|
8
|
+
const reserved = 'abstract arguments boolean break byte case catch char class const continue debugger default delete do double else enum eval export extends false final finally float for from function goto if implements import in instanceof int interface let long native new null package private protected public return short static super switch synchronized this throw throws transient true try typeof var void volatile while with yield'.split( ' ' );
|
9
9
|
const blacklist = { __esModule: true };
|
10
10
|
reserved.forEach( word => blacklist[ word ] = true );
|
11
11
|
|
@@ -15,7 +15,9 @@ var CONSOLE_WARN = function () {
|
|
15
15
|
|
16
16
|
return console.warn.apply( console, args );
|
17
17
|
}; // eslint-disable-line no-console
|
18
|
-
|
18
|
+
// It is important that .mjs occur before .js so that Rollup will interpret npm modules
|
19
|
+
// which deploy both ESM .mjs and CommonJS .js files as ESM.
|
20
|
+
var DEFAULT_EXTS = [ '.mjs', '.js', '.json', '.node' ];
|
19
21
|
|
20
22
|
var readFileCache = {};
|
21
23
|
var readFileAsync = function (file) { return new Promise(function (fulfil, reject) { return fs.readFile(file, function (err, contents) { return err ? reject(err) : fulfil(contents); }); }); };
|
@@ -45,6 +47,8 @@ function cachedIsFile (file, cb) {
|
|
45
47
|
isFileCache[file].then(function (contents) { return cb(null, contents); }, cb);
|
46
48
|
}
|
47
49
|
|
50
|
+
var resolveIdAsync = function (file, opts) { return new Promise(function (fulfil, reject) { return resolveId(file, opts, function (err, contents) { return err ? reject(err) : fulfil(contents); }); }); };
|
51
|
+
|
48
52
|
function nodeResolve ( options ) {
|
49
53
|
if ( options === void 0 ) options = {};
|
50
54
|
|
@@ -87,7 +91,7 @@ function nodeResolve ( options ) {
|
|
87
91
|
readFileCache = {};
|
88
92
|
},
|
89
93
|
|
90
|
-
resolveId: function resolveId
|
94
|
+
resolveId: function resolveId$$1 ( importee, importer ) {
|
91
95
|
if ( /\0/.test( importee ) ) { return null; } // ignore IDs with null character, these belong to other plugins
|
92
96
|
|
93
97
|
// disregard entry module
|
@@ -118,99 +122,92 @@ function nodeResolve ( options ) {
|
|
118
122
|
|
119
123
|
if (only && !only.some(function (pattern) { return pattern.test(id); })) { return null; }
|
120
124
|
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
}
|
125
|
+
var disregardResult = false;
|
126
|
+
var packageBrowserField = false;
|
127
|
+
var extensions = options.extensions || DEFAULT_EXTS;
|
128
|
+
|
129
|
+
var resolveOptions = {
|
130
|
+
basedir: path.dirname( importer ),
|
131
|
+
packageFilter: function packageFilter ( pkg, pkgPath ) {
|
132
|
+
var pkgRoot = path.dirname( pkgPath );
|
133
|
+
if (options.browser && typeof pkg[ 'browser' ] === 'object') {
|
134
|
+
packageBrowserField = Object.keys(pkg[ 'browser' ]).reduce(function (browser, key) {
|
135
|
+
var resolved = pkg[ 'browser' ][ key ] === false ? false : path.resolve( pkgRoot, pkg[ 'browser' ][ key ] );
|
136
|
+
browser[ key ] = resolved;
|
137
|
+
if ( key[0] === '.' ) {
|
138
|
+
var absoluteKey = path.resolve( pkgRoot, key );
|
139
|
+
browser[ absoluteKey ] = resolved;
|
140
|
+
if ( !path.extname(key) ) {
|
141
|
+
extensions.reduce( function ( browser, ext ) {
|
142
|
+
browser[ absoluteKey + ext ] = browser[ key ];
|
143
|
+
return browser;
|
144
|
+
}, browser );
|
142
145
|
}
|
143
|
-
|
144
|
-
|
145
|
-
}
|
146
|
+
}
|
147
|
+
return browser;
|
148
|
+
}, {});
|
149
|
+
}
|
146
150
|
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
151
|
+
if (options.browser && typeof pkg[ 'browser' ] === 'string') {
|
152
|
+
pkg[ 'main' ] = pkg[ 'browser' ];
|
153
|
+
} else if ( useModule && pkg[ 'module' ] ) {
|
154
|
+
pkg[ 'main' ] = pkg[ 'module' ];
|
155
|
+
} else if ( useJsnext && pkg[ 'jsnext:main' ] ) {
|
156
|
+
pkg[ 'main' ] = pkg[ 'jsnext:main' ];
|
157
|
+
} else if ( ( useJsnext || useModule ) && !useMain ) {
|
158
|
+
disregardResult = true;
|
159
|
+
}
|
160
|
+
return pkg;
|
161
|
+
},
|
162
|
+
readFile: cachedReadFile,
|
163
|
+
isFile: cachedIsFile,
|
164
|
+
extensions: extensions
|
165
|
+
};
|
166
|
+
|
167
|
+
if (preserveSymlinks !== undefined) {
|
168
|
+
resolveOptions.preserveSymlinks = preserveSymlinks;
|
169
|
+
}
|
166
170
|
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
171
|
+
return resolveIdAsync(
|
172
|
+
importee,
|
173
|
+
Object.assign( resolveOptions, customResolveOptions )
|
174
|
+
)
|
175
|
+
.catch(function () { return false; })
|
176
|
+
.then(function (resolved) {
|
177
|
+
if (options.browser && packageBrowserField) {
|
178
|
+
if (packageBrowserField[ resolved ]) {
|
179
|
+
resolved = packageBrowserField[ resolved ];
|
176
180
|
}
|
181
|
+
browserMapCache[resolved] = packageBrowserField;
|
182
|
+
}
|
177
183
|
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
184
|
+
if ( !disregardResult && resolved !== false ) {
|
185
|
+
if ( !preserveSymlinks && resolved && fs.existsSync( resolved ) ) {
|
186
|
+
resolved = fs.realpathSync( resolved );
|
187
|
+
}
|
182
188
|
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
}
|
193
|
-
fulfil( null );
|
194
|
-
} else if ( jail && resolved.indexOf( path.normalize( jail.trim( path.sep ) ) ) !== 0 ) {
|
195
|
-
fulfil( null );
|
189
|
+
if ( ~builtins.indexOf( resolved ) ) {
|
190
|
+
return null;
|
191
|
+
} else if ( ~builtins.indexOf( importee ) && preferBuiltins ) {
|
192
|
+
if ( !isPreferBuiltinsSet ) {
|
193
|
+
onwarn(
|
194
|
+
"preferring built-in module '" + importee + "' over local alternative " +
|
195
|
+
"at '" + resolved + "', pass 'preferBuiltins: false' to disable this " +
|
196
|
+
"behavior or 'preferBuiltins: true' to disable this warning"
|
197
|
+
);
|
196
198
|
}
|
199
|
+
return null;
|
200
|
+
} else if ( jail && resolved.indexOf( path.normalize( jail.trim( path.sep ) ) ) !== 0 ) {
|
201
|
+
return null;
|
197
202
|
}
|
203
|
+
}
|
198
204
|
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
} else {
|
204
|
-
var valid = isModule( code );
|
205
|
-
fulfil( valid ? resolved : null );
|
206
|
-
}
|
207
|
-
});
|
208
|
-
} else {
|
209
|
-
fulfil( resolved );
|
210
|
-
}
|
205
|
+
if ( resolved && options.modulesOnly ) {
|
206
|
+
return readFileAsync( resolved, 'utf-8').then(function (code) { return isModule( code ) ? resolved : null; });
|
207
|
+
} else {
|
208
|
+
return resolved === false ? null : resolved;
|
211
209
|
}
|
212
|
-
);
|
213
|
-
});
|
210
|
+
});
|
214
211
|
}
|
215
212
|
};
|
216
213
|
}
|