@atlaspack/utils 2.17.3-typescript-5b4d3ad41.0 → 2.17.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/lib/DefaultMap.js +4 -0
- package/lib/ansi-html.js +0 -2
- package/lib/config.js +1 -3
- package/lib/debug-tools.js +0 -1
- package/lib/glob.js +4 -12
- package/lib/index.js +9 -164
- package/lib/is-url.js +0 -2
- package/lib/objectHash.js +1 -0
- package/lib/prettyDiagnostic.js +5 -3
- package/lib/schema.js +19 -38
- package/lib/shared-buffer.js +1 -5
- package/lib/urlJoin.js +1 -1
- package/package.json +15 -22
- package/src/{DefaultMap.ts → DefaultMap.js} +12 -8
- package/src/Deferred.js +23 -0
- package/src/{PromiseQueue.ts → PromiseQueue.js} +35 -40
- package/src/{TapStream.ts → TapStream.js} +7 -8
- package/src/{alternatives.ts → alternatives.js} +15 -14
- package/src/{ansi-html.ts → ansi-html.js} +1 -1
- package/src/{blob.ts → blob.js} +4 -2
- package/src/{bundle-url.ts → bundle-url.js} +5 -3
- package/src/{collection.ts → collection.js} +21 -14
- package/src/{config.ts → config.js} +19 -18
- package/src/{countLines.ts → countLines.js} +2 -0
- package/src/{debounce.ts → debounce.js} +5 -3
- package/src/{debug-tools.ts → debug-tools.js} +8 -6
- package/src/{dependency-location.ts → dependency-location.js} +11 -15
- package/src/{escape-html.ts → escape-html.js} +3 -5
- package/src/{generateBuildMetrics.ts → generateBuildMetrics.js} +18 -16
- package/src/{generateCertificate.ts → generateCertificate.js} +5 -7
- package/src/{getCertificate.ts → getCertificate.js} +3 -5
- package/src/{getExisting.ts → getExisting.js} +3 -4
- package/src/{getModuleParts.ts → getModuleParts.js} +2 -3
- package/src/{getRootDir.ts → getRootDir.js} +2 -0
- package/src/{glob.ts → glob.js} +10 -14
- package/src/{hash.ts → hash.js} +17 -22
- package/src/{http-server.ts → http-server.js} +38 -32
- package/src/{index.ts → index.js} +8 -7
- package/src/{is-url.ts → is-url.js} +2 -1
- package/src/{isDirectoryInside.ts → isDirectoryInside.js} +1 -0
- package/src/{objectHash.ts → objectHash.js} +4 -1
- package/src/{openInBrowser.ts → openInBrowser.js} +4 -2
- package/src/{parseCSSImport.ts → parseCSSImport.js} +2 -0
- package/src/{path.ts → path.js} +3 -1
- package/src/{prettifyTime.ts → prettifyTime.js} +2 -0
- package/src/{prettyDiagnostic.ts → prettyDiagnostic.js} +20 -22
- package/src/{progress-message.ts → progress-message.js} +2 -3
- package/src/{relativeBundlePath.ts → relativeBundlePath.js} +3 -3
- package/src/{relativeUrl.ts → relativeUrl.js} +1 -0
- package/src/{replaceBundleReferences.ts → replaceBundleReferences.js} +36 -54
- package/src/{schema.ts → schema.js} +141 -158
- package/src/{shared-buffer.ts → shared-buffer.js} +3 -5
- package/src/{sourcemap.ts → sourcemap.js} +6 -16
- package/src/{stream.ts → stream.js} +21 -29
- package/src/throttle.js +15 -0
- package/src/{urlJoin.ts → urlJoin.js} +3 -1
- package/test/{DefaultMap.test.ts → DefaultMap.test.js} +6 -4
- package/test/{PromiseQueue.test.ts → PromiseQueue.test.js} +6 -5
- package/test/{collection.test.ts → collection.test.js} +2 -0
- package/test/{config.test.ts → config.test.js} +3 -0
- package/test/{objectHash.test.ts → objectHash.test.js} +5 -4
- package/test/{prettifyTime.test.ts → prettifyTime.test.js} +1 -0
- package/test/{replaceBundleReferences.test.ts → replaceBundleReferences.test.js} +32 -0
- package/test/{sourcemap.test.ts → sourcemap.test.js} +1 -0
- package/test/{throttle.test.ts → throttle.test.js} +3 -1
- package/test/{urlJoin.test.ts → urlJoin.test.js} +2 -0
- package/LICENSE +0 -201
- package/lib/DefaultMap.d.ts +0 -13
- package/lib/Deferred.d.ts +0 -8
- package/lib/PromiseQueue.d.ts +0 -25
- package/lib/TapStream.d.ts +0 -6
- package/lib/alternatives.d.ts +0 -3
- package/lib/ansi-html.d.ts +0 -1
- package/lib/blob.d.ts +0 -4
- package/lib/bundle-url.d.ts +0 -4
- package/lib/collection.d.ts +0 -33
- package/lib/config.d.ts +0 -17
- package/lib/countLines.d.ts +0 -1
- package/lib/debounce.d.ts +0 -1
- package/lib/debug-tools.d.ts +0 -6
- package/lib/dependency-location.d.ts +0 -14
- package/lib/escape-html.d.ts +0 -1
- package/lib/generateBuildMetrics.d.ts +0 -18
- package/lib/generateCertificate.d.ts +0 -5
- package/lib/getCertificate.d.ts +0 -6
- package/lib/getExisting.d.ts +0 -8
- package/lib/getModuleParts.d.ts +0 -4
- package/lib/getRootDir.d.ts +0 -2
- package/lib/glob.d.ts +0 -10
- package/lib/hash.d.ts +0 -7
- package/lib/http-server.d.ts +0 -19
- package/lib/index.d.ts +0 -48
- package/lib/is-url.d.ts +0 -1
- package/lib/isDirectoryInside.d.ts +0 -2
- package/lib/objectHash.d.ts +0 -3
- package/lib/openInBrowser.d.ts +0 -1
- package/lib/parseCSSImport.d.ts +0 -1
- package/lib/path.d.ts +0 -8
- package/lib/prettifyTime.d.ts +0 -1
- package/lib/prettyDiagnostic.d.ts +0 -17
- package/lib/progress-message.d.ts +0 -3
- package/lib/relativeBundlePath.d.ts +0 -4
- package/lib/relativeUrl.d.ts +0 -1
- package/lib/replaceBundleReferences.d.ts +0 -39
- package/lib/schema.d.ts +0 -107
- package/lib/shared-buffer.d.ts +0 -2
- package/lib/sourcemap.d.ts +0 -16
- package/lib/stream.d.ts +0 -8
- package/lib/throttle.d.ts +0 -1
- package/lib/urlJoin.d.ts +0 -5
- package/src/Deferred.ts +0 -26
- package/src/throttle.ts +0 -13
- package/tsconfig.json +0 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# @atlaspack/utils
|
|
2
2
|
|
|
3
|
+
## 2.17.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [[`069de47`](https://github.com/atlassian-labs/atlaspack/commit/069de478e64fb5889f6f2ce023eb510782767fbd)]:
|
|
8
|
+
- @atlaspack/feature-flags@2.20.0
|
|
9
|
+
|
|
3
10
|
## 2.17.2
|
|
4
11
|
|
|
5
12
|
### Patch Changes
|
package/lib/DefaultMap.js
CHANGED
|
@@ -17,6 +17,8 @@ class DefaultMap extends Map {
|
|
|
17
17
|
ret = this._getDefault(key);
|
|
18
18
|
this.set(key, ret);
|
|
19
19
|
}
|
|
20
|
+
|
|
21
|
+
// $FlowFixMe
|
|
20
22
|
return ret;
|
|
21
23
|
}
|
|
22
24
|
}
|
|
@@ -36,6 +38,8 @@ class DefaultWeakMap extends WeakMap {
|
|
|
36
38
|
ret = this._getDefault(key);
|
|
37
39
|
this.set(key, ret);
|
|
38
40
|
}
|
|
41
|
+
|
|
42
|
+
// $FlowFixMe
|
|
39
43
|
return ret;
|
|
40
44
|
}
|
|
41
45
|
}
|
package/lib/ansi-html.js
CHANGED
|
@@ -13,8 +13,6 @@ function _ansiHtmlCommunity() {
|
|
|
13
13
|
}
|
|
14
14
|
var _escapeHtml = require("./escape-html");
|
|
15
15
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
16
|
-
// @ts-expect-error ansi-html-community is not typed
|
|
17
|
-
|
|
18
16
|
function ansiHtml(ansi) {
|
|
19
17
|
return (0, _ansiHtmlCommunity().default)((0, _escapeHtml.escapeHTML)(ansi));
|
|
20
18
|
}
|
package/lib/config.js
CHANGED
|
@@ -50,9 +50,6 @@ function _lruCache() {
|
|
|
50
50
|
return data;
|
|
51
51
|
}
|
|
52
52
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
53
|
-
// @ts-expect-error TS7016
|
|
54
|
-
|
|
55
|
-
// @ts-expect-error TS2351
|
|
56
53
|
const configCache = new (_lruCache().default)({
|
|
57
54
|
max: 500
|
|
58
55
|
});
|
|
@@ -84,6 +81,7 @@ async function loadConfig(fs, filepath, filenames, projectRoot, opts) {
|
|
|
84
81
|
let extname = _path().default.extname(configFile).slice(1);
|
|
85
82
|
if (extname === 'js' || extname === 'cjs') {
|
|
86
83
|
let output = {
|
|
84
|
+
// $FlowFixMe
|
|
87
85
|
config: (0, _clone().default)(module.require(configFile)),
|
|
88
86
|
files: [{
|
|
89
87
|
filePath: configFile
|
package/lib/debug-tools.js
CHANGED
package/lib/glob.js
CHANGED
|
@@ -34,10 +34,6 @@ var _path = require("./path");
|
|
|
34
34
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
35
35
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
36
36
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
37
|
-
// @ts-expect-error TS7016
|
|
38
|
-
|
|
39
|
-
// @ts-expect-error TS2305
|
|
40
|
-
|
|
41
37
|
function isGlob(p) {
|
|
42
38
|
return (0, _isGlob2().default)((0, _path.normalizeSeparators)(p));
|
|
43
39
|
}
|
|
@@ -53,34 +49,32 @@ function globToRegex(glob, opts) {
|
|
|
53
49
|
return (0, _micromatch().makeRe)(glob, opts);
|
|
54
50
|
}
|
|
55
51
|
function globSync(p, fs, options) {
|
|
52
|
+
// $FlowFixMe
|
|
56
53
|
options = {
|
|
57
54
|
...options,
|
|
58
55
|
fs: {
|
|
59
|
-
// @ts-expect-error TS7006
|
|
60
56
|
statSync: p => {
|
|
61
57
|
return fs.statSync(p);
|
|
62
58
|
},
|
|
63
|
-
// @ts-expect-error TS7006
|
|
64
59
|
lstatSync: p => {
|
|
65
60
|
// Our FileSystem interface doesn't have lstat support at the moment,
|
|
66
61
|
// but this is fine for our purposes since we follow symlinks by default.
|
|
67
62
|
return fs.statSync(p);
|
|
68
63
|
},
|
|
69
|
-
// @ts-expect-error TS7006
|
|
70
64
|
readdirSync: (p, opts) => {
|
|
71
65
|
return fs.readdirSync(p, opts);
|
|
72
66
|
}
|
|
73
67
|
}
|
|
74
68
|
};
|
|
75
69
|
|
|
76
|
-
//
|
|
70
|
+
// $FlowFixMe
|
|
77
71
|
return _fastGlob().default.sync((0, _path.normalizeSeparators)(p), options);
|
|
78
72
|
}
|
|
79
73
|
function glob(p, fs, options) {
|
|
74
|
+
// $FlowFixMe
|
|
80
75
|
options = {
|
|
81
76
|
...options,
|
|
82
77
|
fs: {
|
|
83
|
-
// @ts-expect-error TS7006
|
|
84
78
|
stat: async (p, cb) => {
|
|
85
79
|
try {
|
|
86
80
|
cb(null, await fs.stat(p));
|
|
@@ -88,7 +82,6 @@ function glob(p, fs, options) {
|
|
|
88
82
|
cb(err);
|
|
89
83
|
}
|
|
90
84
|
},
|
|
91
|
-
// @ts-expect-error TS7006
|
|
92
85
|
lstat: async (p, cb) => {
|
|
93
86
|
// Our FileSystem interface doesn't have lstat support at the moment,
|
|
94
87
|
// but this is fine for our purposes since we follow symlinks by default.
|
|
@@ -98,7 +91,6 @@ function glob(p, fs, options) {
|
|
|
98
91
|
cb(err);
|
|
99
92
|
}
|
|
100
93
|
},
|
|
101
|
-
// @ts-expect-error TS7006
|
|
102
94
|
readdir: async (p, opts, cb) => {
|
|
103
95
|
if (typeof opts === 'function') {
|
|
104
96
|
cb = opts;
|
|
@@ -113,6 +105,6 @@ function glob(p, fs, options) {
|
|
|
113
105
|
}
|
|
114
106
|
};
|
|
115
107
|
|
|
116
|
-
//
|
|
108
|
+
// $FlowFixMe Added in Flow 0.121.0 upgrade in #4381
|
|
117
109
|
return (0, _fastGlob().default)((0, _path.normalizeSeparators)(p), options);
|
|
118
110
|
}
|
package/lib/index.js
CHANGED
|
@@ -3,84 +3,6 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
var _exportNames = {
|
|
7
|
-
resolveConfig: true,
|
|
8
|
-
resolveConfigSync: true,
|
|
9
|
-
loadConfig: true,
|
|
10
|
-
readConfig: true,
|
|
11
|
-
makeDeferredWithPromise: true,
|
|
12
|
-
generateBuildMetrics: true,
|
|
13
|
-
createHTTPServer: true,
|
|
14
|
-
normalizePath: true,
|
|
15
|
-
normalizeSeparators: true,
|
|
16
|
-
relativePath: true,
|
|
17
|
-
prettyDiagnostic: true,
|
|
18
|
-
validateSchema: true,
|
|
19
|
-
fuzzySearch: true,
|
|
20
|
-
countLines: true,
|
|
21
|
-
generateCertificate: true,
|
|
22
|
-
getCertificate: true,
|
|
23
|
-
getModuleParts: true,
|
|
24
|
-
getRootDir: true,
|
|
25
|
-
isDirectoryInside: true,
|
|
26
|
-
isURL: true,
|
|
27
|
-
objectHash: true,
|
|
28
|
-
prettifyTime: true,
|
|
29
|
-
PromiseQueue: true,
|
|
30
|
-
TapStream: true,
|
|
31
|
-
urlJoin: true,
|
|
32
|
-
relativeUrl: true,
|
|
33
|
-
createDependencyLocation: true,
|
|
34
|
-
debounce: true,
|
|
35
|
-
throttle: true,
|
|
36
|
-
openInBrowser: true,
|
|
37
|
-
findAlternativeNodeModules: true,
|
|
38
|
-
findAlternativeFiles: true,
|
|
39
|
-
blobToBuffer: true,
|
|
40
|
-
blobToString: true,
|
|
41
|
-
unique: true,
|
|
42
|
-
objectSortedEntries: true,
|
|
43
|
-
objectSortedEntriesDeep: true,
|
|
44
|
-
setDifference: true,
|
|
45
|
-
setSymmetricDifference: true,
|
|
46
|
-
setEqual: true,
|
|
47
|
-
setIntersect: true,
|
|
48
|
-
setIntersectStatic: true,
|
|
49
|
-
setUnion: true,
|
|
50
|
-
debugTools: true,
|
|
51
|
-
DefaultMap: true,
|
|
52
|
-
DefaultWeakMap: true,
|
|
53
|
-
getProgressMessage: true,
|
|
54
|
-
getPackageProgressMessage: true,
|
|
55
|
-
isGlob: true,
|
|
56
|
-
isGlobMatch: true,
|
|
57
|
-
globMatch: true,
|
|
58
|
-
globSync: true,
|
|
59
|
-
glob: true,
|
|
60
|
-
globToRegex: true,
|
|
61
|
-
hashStream: true,
|
|
62
|
-
hashObject: true,
|
|
63
|
-
hashFile: true,
|
|
64
|
-
SharedBuffer: true,
|
|
65
|
-
replaceURLReferences: true,
|
|
66
|
-
replaceInlineReferences: true,
|
|
67
|
-
measureStreamLength: true,
|
|
68
|
-
readableFromStringOrBuffer: true,
|
|
69
|
-
bufferStream: true,
|
|
70
|
-
blobToStream: true,
|
|
71
|
-
streamFromPromise: true,
|
|
72
|
-
fallbackStream: true,
|
|
73
|
-
relativeBundlePath: true,
|
|
74
|
-
ansiHtml: true,
|
|
75
|
-
escapeHTML: true,
|
|
76
|
-
SOURCEMAP_RE: true,
|
|
77
|
-
SOURCEMAP_EXTENSIONS: true,
|
|
78
|
-
matchSourceMappingURL: true,
|
|
79
|
-
loadSourceMapUrl: true,
|
|
80
|
-
loadSourceMap: true,
|
|
81
|
-
remapSourceLocation: true,
|
|
82
|
-
stripAnsi: true
|
|
83
|
-
};
|
|
84
6
|
Object.defineProperty(exports, "DefaultMap", {
|
|
85
7
|
enumerable: true,
|
|
86
8
|
get: function () {
|
|
@@ -537,91 +459,8 @@ Object.defineProperty(exports, "validateSchema", {
|
|
|
537
459
|
return _schema.default;
|
|
538
460
|
}
|
|
539
461
|
});
|
|
540
|
-
var _config = require("./config");
|
|
541
|
-
Object.keys(_config).forEach(function (key) {
|
|
542
|
-
if (key === "default" || key === "__esModule") return;
|
|
543
|
-
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
|
|
544
|
-
if (key in exports && exports[key] === _config[key]) return;
|
|
545
|
-
Object.defineProperty(exports, key, {
|
|
546
|
-
enumerable: true,
|
|
547
|
-
get: function () {
|
|
548
|
-
return _config[key];
|
|
549
|
-
}
|
|
550
|
-
});
|
|
551
|
-
});
|
|
552
|
-
var _Deferred = require("./Deferred");
|
|
553
|
-
Object.keys(_Deferred).forEach(function (key) {
|
|
554
|
-
if (key === "default" || key === "__esModule") return;
|
|
555
|
-
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
|
|
556
|
-
if (key in exports && exports[key] === _Deferred[key]) return;
|
|
557
|
-
Object.defineProperty(exports, key, {
|
|
558
|
-
enumerable: true,
|
|
559
|
-
get: function () {
|
|
560
|
-
return _Deferred[key];
|
|
561
|
-
}
|
|
562
|
-
});
|
|
563
|
-
});
|
|
564
|
-
var _generateBuildMetrics = _interopRequireWildcard(require("./generateBuildMetrics"));
|
|
565
|
-
Object.keys(_generateBuildMetrics).forEach(function (key) {
|
|
566
|
-
if (key === "default" || key === "__esModule") return;
|
|
567
|
-
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
|
|
568
|
-
if (key in exports && exports[key] === _generateBuildMetrics[key]) return;
|
|
569
|
-
Object.defineProperty(exports, key, {
|
|
570
|
-
enumerable: true,
|
|
571
|
-
get: function () {
|
|
572
|
-
return _generateBuildMetrics[key];
|
|
573
|
-
}
|
|
574
|
-
});
|
|
575
|
-
});
|
|
576
|
-
var _httpServer = require("./http-server");
|
|
577
|
-
Object.keys(_httpServer).forEach(function (key) {
|
|
578
|
-
if (key === "default" || key === "__esModule") return;
|
|
579
|
-
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
|
|
580
|
-
if (key in exports && exports[key] === _httpServer[key]) return;
|
|
581
|
-
Object.defineProperty(exports, key, {
|
|
582
|
-
enumerable: true,
|
|
583
|
-
get: function () {
|
|
584
|
-
return _httpServer[key];
|
|
585
|
-
}
|
|
586
|
-
});
|
|
587
|
-
});
|
|
588
|
-
var _path = require("./path");
|
|
589
|
-
Object.keys(_path).forEach(function (key) {
|
|
590
|
-
if (key === "default" || key === "__esModule") return;
|
|
591
|
-
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
|
|
592
|
-
if (key in exports && exports[key] === _path[key]) return;
|
|
593
|
-
Object.defineProperty(exports, key, {
|
|
594
|
-
enumerable: true,
|
|
595
|
-
get: function () {
|
|
596
|
-
return _path[key];
|
|
597
|
-
}
|
|
598
|
-
});
|
|
599
|
-
});
|
|
600
|
-
var _prettyDiagnostic = _interopRequireWildcard(require("./prettyDiagnostic"));
|
|
601
|
-
Object.keys(_prettyDiagnostic).forEach(function (key) {
|
|
602
|
-
if (key === "default" || key === "__esModule") return;
|
|
603
|
-
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
|
|
604
|
-
if (key in exports && exports[key] === _prettyDiagnostic[key]) return;
|
|
605
|
-
Object.defineProperty(exports, key, {
|
|
606
|
-
enumerable: true,
|
|
607
|
-
get: function () {
|
|
608
|
-
return _prettyDiagnostic[key];
|
|
609
|
-
}
|
|
610
|
-
});
|
|
611
|
-
});
|
|
612
|
-
var _schema = _interopRequireWildcard(require("./schema"));
|
|
613
|
-
Object.keys(_schema).forEach(function (key) {
|
|
614
|
-
if (key === "default" || key === "__esModule") return;
|
|
615
|
-
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
|
|
616
|
-
if (key in exports && exports[key] === _schema[key]) return;
|
|
617
|
-
Object.defineProperty(exports, key, {
|
|
618
|
-
enumerable: true,
|
|
619
|
-
get: function () {
|
|
620
|
-
return _schema[key];
|
|
621
|
-
}
|
|
622
|
-
});
|
|
623
|
-
});
|
|
624
462
|
var _countLines = _interopRequireDefault(require("./countLines"));
|
|
463
|
+
var _generateBuildMetrics = _interopRequireDefault(require("./generateBuildMetrics"));
|
|
625
464
|
var _generateCertificate = _interopRequireDefault(require("./generateCertificate"));
|
|
626
465
|
var _getCertificate = _interopRequireDefault(require("./getCertificate"));
|
|
627
466
|
var _getModuleParts = _interopRequireDefault(require("./getModuleParts"));
|
|
@@ -630,7 +469,9 @@ var _isDirectoryInside = _interopRequireDefault(require("./isDirectoryInside"));
|
|
|
630
469
|
var _isUrl = _interopRequireDefault(require("./is-url"));
|
|
631
470
|
var _objectHash = _interopRequireDefault(require("./objectHash"));
|
|
632
471
|
var _prettifyTime = _interopRequireDefault(require("./prettifyTime"));
|
|
472
|
+
var _prettyDiagnostic = _interopRequireDefault(require("./prettyDiagnostic"));
|
|
633
473
|
var _PromiseQueue = _interopRequireDefault(require("./PromiseQueue"));
|
|
474
|
+
var _schema = _interopRequireWildcard(require("./schema"));
|
|
634
475
|
var _TapStream = _interopRequireDefault(require("./TapStream"));
|
|
635
476
|
var _urlJoin = _interopRequireDefault(require("./urlJoin"));
|
|
636
477
|
var _relativeUrl = _interopRequireDefault(require("./relativeUrl"));
|
|
@@ -641,12 +482,16 @@ var _openInBrowser = _interopRequireDefault(require("./openInBrowser"));
|
|
|
641
482
|
var _alternatives = require("./alternatives");
|
|
642
483
|
var _blob = require("./blob");
|
|
643
484
|
var _collection = require("./collection");
|
|
485
|
+
var _config = require("./config");
|
|
644
486
|
var _debugTools = require("./debug-tools");
|
|
645
487
|
var _DefaultMap = require("./DefaultMap");
|
|
488
|
+
var _Deferred = require("./Deferred");
|
|
646
489
|
var _progressMessage = require("./progress-message");
|
|
647
490
|
var _glob = require("./glob");
|
|
648
491
|
var _hash = require("./hash");
|
|
649
492
|
var _sharedBuffer = require("./shared-buffer");
|
|
493
|
+
var _httpServer = require("./http-server");
|
|
494
|
+
var _path = require("./path");
|
|
650
495
|
var _replaceBundleReferences = require("./replaceBundleReferences");
|
|
651
496
|
var _stream = require("./stream");
|
|
652
497
|
var _relativeBundlePath = require("./relativeBundlePath");
|
|
@@ -660,6 +505,6 @@ function _stripAnsi() {
|
|
|
660
505
|
};
|
|
661
506
|
return data;
|
|
662
507
|
}
|
|
663
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
664
508
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
665
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
509
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
510
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
package/lib/is-url.js
CHANGED
package/lib/objectHash.js
CHANGED
|
@@ -12,6 +12,7 @@ function _crypto() {
|
|
|
12
12
|
return data;
|
|
13
13
|
}
|
|
14
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
15
|
+
// $FlowFixMe
|
|
15
16
|
function objectHash(object) {
|
|
16
17
|
let hash = _crypto().default.createHash('md5');
|
|
17
18
|
for (let key of Object.keys(object).sort()) {
|
package/lib/prettyDiagnostic.js
CHANGED
|
@@ -47,10 +47,10 @@ function _snarkdown() {
|
|
|
47
47
|
return data;
|
|
48
48
|
}
|
|
49
49
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
50
|
+
// $FlowFixMe
|
|
50
51
|
/* eslint-disable import/no-extraneous-dependencies */
|
|
51
|
-
|
|
52
|
+
// $FlowFixMe
|
|
52
53
|
/* eslint-enable import/no-extraneous-dependencies */
|
|
53
|
-
|
|
54
54
|
async function prettyDiagnostic(diagnostic, options, terminalWidth, format = 'ansi') {
|
|
55
55
|
let {
|
|
56
56
|
origin,
|
|
@@ -94,7 +94,9 @@ async function prettyDiagnostic(diagnostic, options, terminalWidth, format = 'an
|
|
|
94
94
|
formattedCodeFrame = (0, _codeframe().default)(code, highlights, {
|
|
95
95
|
useColor: true,
|
|
96
96
|
syntaxHighlighting: true,
|
|
97
|
-
language:
|
|
97
|
+
language:
|
|
98
|
+
// $FlowFixMe sketchy null checks do not matter here...
|
|
99
|
+
codeFrame.language || (filePath != null ? _path().default.extname(filePath).substr(1) : undefined),
|
|
98
100
|
terminalWidth
|
|
99
101
|
});
|
|
100
102
|
}
|
package/lib/schema.js
CHANGED
|
@@ -30,9 +30,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
30
30
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
31
31
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
32
32
|
function validateSchema(schema, data) {
|
|
33
|
-
function walk(
|
|
34
|
-
// @ts-expect-error TS7006
|
|
35
|
-
schemaAncestors, dataNode, dataPath) {
|
|
33
|
+
function walk(schemaAncestors, dataNode, dataPath) {
|
|
36
34
|
let [schemaNode] = schemaAncestors;
|
|
37
35
|
if (schemaNode.type) {
|
|
38
36
|
let type = Array.isArray(dataNode) ? 'array' : typeof dataNode;
|
|
@@ -51,10 +49,10 @@ function validateSchema(schema, data) {
|
|
|
51
49
|
{
|
|
52
50
|
if (schemaNode.items) {
|
|
53
51
|
let results = [];
|
|
54
|
-
//
|
|
52
|
+
// $FlowFixMe type was already checked
|
|
55
53
|
for (let i = 0; i < dataNode.length; i++) {
|
|
56
54
|
let result = walk([schemaNode.items].concat(schemaAncestors),
|
|
57
|
-
//
|
|
55
|
+
// $FlowFixMe type was already checked
|
|
58
56
|
dataNode[i], dataPath + '/' + i);
|
|
59
57
|
if (result) results.push(result);
|
|
60
58
|
}
|
|
@@ -64,7 +62,7 @@ function validateSchema(schema, data) {
|
|
|
64
62
|
}
|
|
65
63
|
case 'string':
|
|
66
64
|
{
|
|
67
|
-
//
|
|
65
|
+
// $FlowFixMe type was already checked
|
|
68
66
|
let value = dataNode;
|
|
69
67
|
if (schemaNode.enum) {
|
|
70
68
|
if (!schemaNode.enum.includes(value)) {
|
|
@@ -94,7 +92,7 @@ function validateSchema(schema, data) {
|
|
|
94
92
|
}
|
|
95
93
|
case 'number':
|
|
96
94
|
{
|
|
97
|
-
//
|
|
95
|
+
// $FlowFixMe type was already checked
|
|
98
96
|
let value = dataNode;
|
|
99
97
|
if (schemaNode.enum) {
|
|
100
98
|
if (!schemaNode.enum.includes(value)) {
|
|
@@ -115,13 +113,10 @@ function validateSchema(schema, data) {
|
|
|
115
113
|
let results = [];
|
|
116
114
|
let invalidProps;
|
|
117
115
|
if (schemaNode.__forbiddenProperties) {
|
|
118
|
-
//
|
|
116
|
+
// $FlowFixMe type was already checked
|
|
119
117
|
let keys = Object.keys(dataNode);
|
|
120
|
-
// @ts-expect-error TS7006
|
|
121
118
|
invalidProps = schemaNode.__forbiddenProperties.filter(val => keys.includes(val));
|
|
122
|
-
results.push(...invalidProps.map(
|
|
123
|
-
// @ts-expect-error TS7006
|
|
124
|
-
k => ({
|
|
119
|
+
results.push(...invalidProps.map(k => ({
|
|
125
120
|
type: 'forbidden-prop',
|
|
126
121
|
dataPath: dataPath + '/' + (0, _diagnostic().encodeJSONKeyComponent)(k),
|
|
127
122
|
dataType: 'key',
|
|
@@ -132,14 +127,10 @@ function validateSchema(schema, data) {
|
|
|
132
127
|
})));
|
|
133
128
|
}
|
|
134
129
|
if (schemaNode.required) {
|
|
135
|
-
//
|
|
130
|
+
// $FlowFixMe type was already checked
|
|
136
131
|
let keys = Object.keys(dataNode);
|
|
137
|
-
let missingKeys = schemaNode.required.filter(
|
|
138
|
-
|
|
139
|
-
val => !keys.includes(val));
|
|
140
|
-
results.push(...missingKeys.map(
|
|
141
|
-
// @ts-expect-error TS7006
|
|
142
|
-
k => ({
|
|
132
|
+
let missingKeys = schemaNode.required.filter(val => !keys.includes(val));
|
|
133
|
+
results.push(...missingKeys.map(k => ({
|
|
143
134
|
type: 'missing-prop',
|
|
144
135
|
dataPath,
|
|
145
136
|
dataType: 'value',
|
|
@@ -153,14 +144,14 @@ function validateSchema(schema, data) {
|
|
|
153
144
|
let {
|
|
154
145
|
additionalProperties = true
|
|
155
146
|
} = schemaNode;
|
|
156
|
-
//
|
|
147
|
+
// $FlowFixMe type was already checked
|
|
157
148
|
for (let k in dataNode) {
|
|
158
149
|
if (invalidProps && invalidProps.includes(k)) {
|
|
159
150
|
// Don't check type on forbidden props
|
|
160
151
|
continue;
|
|
161
152
|
} else if (k in schemaNode.properties) {
|
|
162
153
|
let result = walk([schemaNode.properties[k]].concat(schemaAncestors),
|
|
163
|
-
//
|
|
154
|
+
// $FlowFixMe type was already checked
|
|
164
155
|
dataNode[k], dataPath + '/' + (0, _diagnostic().encodeJSONKeyComponent)(k));
|
|
165
156
|
if (result) results.push(result);
|
|
166
157
|
} else {
|
|
@@ -170,9 +161,9 @@ function validateSchema(schema, data) {
|
|
|
170
161
|
type: 'enum',
|
|
171
162
|
dataType: 'key',
|
|
172
163
|
dataPath: dataPath + '/' + (0, _diagnostic().encodeJSONKeyComponent)(k),
|
|
173
|
-
expectedValues: Object.keys(schemaNode.properties
|
|
174
|
-
//
|
|
175
|
-
|
|
164
|
+
expectedValues: Object.keys(schemaNode.properties).filter(
|
|
165
|
+
// $FlowFixMe type was already checked
|
|
166
|
+
p => !(p in dataNode)),
|
|
176
167
|
actualValue: k,
|
|
177
168
|
ancestors: schemaAncestors,
|
|
178
169
|
prettyType: schemaNode.__type
|
|
@@ -180,7 +171,7 @@ function validateSchema(schema, data) {
|
|
|
180
171
|
}
|
|
181
172
|
} else {
|
|
182
173
|
let result = walk([additionalProperties].concat(schemaAncestors),
|
|
183
|
-
//
|
|
174
|
+
// $FlowFixMe type was already checked
|
|
184
175
|
dataNode[k], dataPath + '/' + (0, _diagnostic().encodeJSONKeyComponent)(k));
|
|
185
176
|
if (result) results.push(result);
|
|
186
177
|
}
|
|
@@ -222,7 +213,6 @@ function validateSchema(schema, data) {
|
|
|
222
213
|
}
|
|
223
214
|
} else if (schemaNode.not) {
|
|
224
215
|
let result = walk([schemaNode.not].concat(schemaAncestors), dataNode, dataPath);
|
|
225
|
-
// @ts-expect-error TS2339
|
|
226
216
|
if (!result || result.length == 0) {
|
|
227
217
|
return {
|
|
228
218
|
type: 'other',
|
|
@@ -244,22 +234,16 @@ var _default = exports.default = validateSchema;
|
|
|
244
234
|
function fuzzySearch(expectedValues, actualValue) {
|
|
245
235
|
let result = expectedValues.map(exp => [exp, levenshtein().distance(exp, actualValue)]).filter(
|
|
246
236
|
// Remove if more than half of the string would need to be changed
|
|
247
|
-
// @ts-expect-error TS2769
|
|
248
237
|
([, d]) => d * 2 < actualValue.length);
|
|
249
|
-
// @ts-expect-error TS2345
|
|
250
238
|
result.sort(([, a], [, b]) => a - b);
|
|
251
|
-
// @ts-expect-error TS2345
|
|
252
239
|
return result.map(([v]) => v);
|
|
253
240
|
}
|
|
254
241
|
validateSchema.diagnostic = function (schema, data, origin, message) {
|
|
255
242
|
if ('source' in data && 'data' in data && typeof data.source !== 'string' && !data) {
|
|
256
243
|
throw new Error('At least one of data.source and data.data must be defined!');
|
|
257
244
|
}
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
// @ts-expect-error TS2339
|
|
261
|
-
data.map.data :
|
|
262
|
-
// @ts-expect-error TS2339
|
|
245
|
+
let object = data.map ? data.map.data :
|
|
246
|
+
// $FlowFixMe we can assume it's a JSON object
|
|
263
247
|
data.data ?? JSON.parse(data.source);
|
|
264
248
|
let errors = validateSchema(schema, object);
|
|
265
249
|
if (errors.length) {
|
|
@@ -319,13 +303,11 @@ validateSchema.diagnostic = function (schema, data, origin, message) {
|
|
|
319
303
|
};
|
|
320
304
|
});
|
|
321
305
|
let map, code;
|
|
322
|
-
// @ts-expect-error TS2339
|
|
323
306
|
if (data.map) {
|
|
324
|
-
// @ts-expect-error TS2339
|
|
325
307
|
map = data.map;
|
|
326
308
|
code = data.source;
|
|
327
309
|
} else {
|
|
328
|
-
//
|
|
310
|
+
// $FlowFixMe we can assume that data is valid JSON
|
|
329
311
|
map = data.source ?? JSON.stringify((0, _nullthrows().default)(data.data), 0, '\t');
|
|
330
312
|
code = map;
|
|
331
313
|
}
|
|
@@ -347,7 +329,6 @@ validateSchema.diagnostic = function (schema, data, origin, message) {
|
|
|
347
329
|
diagnostic: {
|
|
348
330
|
message: message,
|
|
349
331
|
origin,
|
|
350
|
-
// @ts-expect-error TS2322
|
|
351
332
|
codeFrames
|
|
352
333
|
}
|
|
353
334
|
});
|
package/lib/shared-buffer.js
CHANGED
|
@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.SharedBuffer = void 0;
|
|
7
|
-
// flow-to-ts helpers
|
|
8
|
-
|
|
9
|
-
// /flow-to-ts helpers
|
|
10
|
-
|
|
11
7
|
let SharedBuffer = exports.SharedBuffer = void 0;
|
|
12
8
|
|
|
13
|
-
//
|
|
9
|
+
// $FlowFixMe[prop-missing]
|
|
14
10
|
if (process.browser) {
|
|
15
11
|
exports.SharedBuffer = SharedBuffer = ArrayBuffer;
|
|
16
12
|
// Safari has removed the constructor
|
package/lib/urlJoin.js
CHANGED
|
@@ -28,7 +28,7 @@ function urlJoin(publicURL, assetPath) {
|
|
|
28
28
|
// Leading / ensures that paths with colons are not parsed as a protocol.
|
|
29
29
|
let p = assetPath.startsWith('/') ? assetPath : '/' + assetPath;
|
|
30
30
|
const assetUrl = _url().default.parse(p);
|
|
31
|
-
url.pathname = _path().default.posix.join(url.pathname
|
|
31
|
+
url.pathname = _path().default.posix.join(url.pathname, assetUrl.pathname);
|
|
32
32
|
url.search = assetUrl.search;
|
|
33
33
|
url.hash = assetUrl.hash;
|
|
34
34
|
return _url().default.format(url);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaspack/utils",
|
|
3
|
-
"version": "2.17.3
|
|
3
|
+
"version": "2.17.3",
|
|
4
4
|
"description": "Blazing fast, zero configuration web application bundler",
|
|
5
5
|
"license": "(MIT OR Apache-2.0)",
|
|
6
6
|
"publishConfig": {
|
|
@@ -10,9 +10,8 @@
|
|
|
10
10
|
"type": "git",
|
|
11
11
|
"url": "https://github.com/atlassian-labs/atlaspack.git"
|
|
12
12
|
},
|
|
13
|
-
"main": "
|
|
14
|
-
"source": "
|
|
15
|
-
"types": "./lib/index.d.ts",
|
|
13
|
+
"main": "lib/index.js",
|
|
14
|
+
"source": "src/index.js",
|
|
16
15
|
"engines": {
|
|
17
16
|
"node": ">= 16.0.0"
|
|
18
17
|
},
|
|
@@ -31,18 +30,17 @@
|
|
|
31
30
|
}
|
|
32
31
|
},
|
|
33
32
|
"dependencies": {
|
|
34
|
-
"@atlaspack/codeframe": "2.13.
|
|
35
|
-
"@atlaspack/diagnostic": "2.14.
|
|
36
|
-
"@atlaspack/feature-flags": "2.
|
|
37
|
-
"@atlaspack/logger": "2.14.
|
|
38
|
-
"@atlaspack/markdown-ansi": "2.14.
|
|
39
|
-
"@atlaspack/rust": "3.4.
|
|
40
|
-
"@iarna/toml": "^2.2.0",
|
|
33
|
+
"@atlaspack/codeframe": "2.13.4",
|
|
34
|
+
"@atlaspack/diagnostic": "2.14.1",
|
|
35
|
+
"@atlaspack/feature-flags": "2.20.0",
|
|
36
|
+
"@atlaspack/logger": "2.14.13",
|
|
37
|
+
"@atlaspack/markdown-ansi": "2.14.1",
|
|
38
|
+
"@atlaspack/rust": "3.4.1",
|
|
41
39
|
"@parcel/source-map": "^2.1.1",
|
|
42
|
-
"@types/micromatch": "^4.0.9",
|
|
43
|
-
"@types/node-forge": "^1.3.13",
|
|
44
|
-
"ansi-html-community": "0.0.8",
|
|
45
40
|
"chalk": "^4.1.0",
|
|
41
|
+
"nullthrows": "^1.1.1",
|
|
42
|
+
"@iarna/toml": "^2.2.0",
|
|
43
|
+
"ansi-html-community": "0.0.8",
|
|
46
44
|
"clone": "^2.1.1",
|
|
47
45
|
"fast-glob": "^3.2.12",
|
|
48
46
|
"fastest-levenshtein": "^1.0.16",
|
|
@@ -52,14 +50,13 @@
|
|
|
52
50
|
"lru-cache": "^6.0.0",
|
|
53
51
|
"micromatch": "^4.0.4",
|
|
54
52
|
"node-forge": "^1.2.1",
|
|
55
|
-
"nullthrows": "^1.1.1",
|
|
56
53
|
"open": "^7.0.3",
|
|
57
54
|
"snarkdown": "^2.0.0",
|
|
58
55
|
"strip-ansi": "^6.0.0",
|
|
59
56
|
"terminal-link": "^2.1.1"
|
|
60
57
|
},
|
|
61
58
|
"devDependencies": {
|
|
62
|
-
"@atlaspack/babel-register": "2.14.
|
|
59
|
+
"@atlaspack/babel-register": "2.14.1",
|
|
63
60
|
"benny": "^3.7.1",
|
|
64
61
|
"random-int": "^1.0.0"
|
|
65
62
|
},
|
|
@@ -69,9 +66,5 @@
|
|
|
69
66
|
"./src/openInBrowser.js": false,
|
|
70
67
|
"@atlaspack/markdown-ansi": false
|
|
71
68
|
},
|
|
72
|
-
"type": "commonjs"
|
|
73
|
-
|
|
74
|
-
"check-ts": "tsc --emitDeclarationOnly --rootDir src"
|
|
75
|
-
},
|
|
76
|
-
"gitHead": "5b4d3ad41ffa002b989ba77271bb3010a1f05b2a"
|
|
77
|
-
}
|
|
69
|
+
"type": "commonjs"
|
|
70
|
+
}
|