@atlaspack/core 2.14.1-dev.53 → 2.14.1-dev.74
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 +33 -0
- package/lib/Atlaspack.js +5 -1
- package/lib/BundleGraph.js +1 -1
- package/lib/RequestTracker.js +1 -1
- package/lib/index.js +1 -9
- package/lib/loadAtlaspackPlugin.js +0 -15
- package/lib/public/BundleGraph.js +3 -2
- package/lib/requests/AtlaspackConfigRequest.js +29 -42
- package/lib/resolveOptions.js +13 -1
- package/lib/rustWorkerThreadDylibHack.js +22 -0
- package/lib/worker.js +8 -8
- package/package.json +18 -18
- package/src/Atlaspack.js +11 -5
- package/src/BundleGraph.js +1 -1
- package/src/RequestTracker.js +8 -5
- package/src/index.js +0 -2
- package/src/loadAtlaspackPlugin.js +1 -23
- package/src/public/BundleGraph.js +5 -3
- package/src/requests/AtlaspackConfigRequest.js +31 -76
- package/src/resolveOptions.js +20 -5
- package/src/rustWorkerThreadDylibHack.js +18 -0
- package/src/worker.js +7 -8
- package/test/Environment.test.js +5 -1
- package/lib/internal-plugins.js +0 -9
- package/lib/isSuperPackage.js +0 -15
- package/src/internal-plugins.js +0 -4
- package/src/isSuperPackage.js +0 -16
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,38 @@
|
|
|
1
1
|
# @atlaspack/core
|
|
2
2
|
|
|
3
|
+
## 2.15.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#486](https://github.com/atlassian-labs/atlaspack/pull/486) [`87087f4`](https://github.com/atlassian-labs/atlaspack/commit/87087f44f348ac583a27ea0819122e191ba80f8d) Thanks [@yamadapc](https://github.com/yamadapc)! - Add environment variable to skip cache invalidation
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- [#450](https://github.com/atlassian-labs/atlaspack/pull/450) [`b9d41b1`](https://github.com/atlassian-labs/atlaspack/commit/b9d41b175ad5771651a5b0278a5a0147e669234a) Thanks [@benjervis](https://github.com/benjervis)! - Remove the Atlaspack engines compatibility check
|
|
12
|
+
|
|
13
|
+
- [#420](https://github.com/atlassian-labs/atlaspack/pull/420) [`e1422ad`](https://github.com/atlassian-labs/atlaspack/commit/e1422ad0a801faaa4bc4f1023bed042ffe236e9b) Thanks [@JakeLane](https://github.com/JakeLane)! - Support async script runtime in conditional bundling
|
|
14
|
+
|
|
15
|
+
- [#472](https://github.com/atlassian-labs/atlaspack/pull/472) [`7e357fb`](https://github.com/atlassian-labs/atlaspack/commit/7e357fb173e7958da330e3721667fa5749420952) Thanks [@yamadapc](https://github.com/yamadapc)! - Fix segmentation fault on exit on certain cases
|
|
16
|
+
|
|
17
|
+
- [#478](https://github.com/atlassian-labs/atlaspack/pull/478) [`570493b`](https://github.com/atlassian-labs/atlaspack/commit/570493beaf754e7985aebc7daaaf6dfcfa8fe56b) Thanks [@yamadapc](https://github.com/yamadapc)! - The first attempt at Version Packages didn't include the built artifacts.
|
|
18
|
+
This has hopefully been fixed, so this change will force those packages to re-release.
|
|
19
|
+
- Updated dependencies [[`80bd57b`](https://github.com/atlassian-labs/atlaspack/commit/80bd57b9f9e966563957dee0780d956a682eb2d4), [`ae70b81`](https://github.com/atlassian-labs/atlaspack/commit/ae70b810384cf58f9c57d341ab4c925c7bb2060c), [`ce13d5e`](https://github.com/atlassian-labs/atlaspack/commit/ce13d5e885d55518ee6318e7a72e3a6e4e5126f2), [`4aab060`](https://github.com/atlassian-labs/atlaspack/commit/4aab0605c0d4ee8e0dcc3ffa1162eae5b360b677), [`c0a61a9`](https://github.com/atlassian-labs/atlaspack/commit/c0a61a92405b6830fe39cc17622cc2e97bf02dd7), [`cb35e7d`](https://github.com/atlassian-labs/atlaspack/commit/cb35e7d2b90b372de8401792915f12f410508d24), [`e1422ad`](https://github.com/atlassian-labs/atlaspack/commit/e1422ad0a801faaa4bc4f1023bed042ffe236e9b), [`6ec11f1`](https://github.com/atlassian-labs/atlaspack/commit/6ec11f10a9366fb8a9fc0475c7678235056bd80e), [`570493b`](https://github.com/atlassian-labs/atlaspack/commit/570493beaf754e7985aebc7daaaf6dfcfa8fe56b)]:
|
|
20
|
+
- @atlaspack/fs@2.14.1
|
|
21
|
+
- @atlaspack/rust@3.0.1
|
|
22
|
+
- @atlaspack/utils@2.14.1
|
|
23
|
+
- @atlaspack/feature-flags@2.14.1
|
|
24
|
+
- @atlaspack/diagnostic@2.14.1
|
|
25
|
+
- @atlaspack/graph@3.4.1
|
|
26
|
+
- @atlaspack/logger@2.14.1
|
|
27
|
+
- @atlaspack/package-manager@2.14.1
|
|
28
|
+
- @atlaspack/plugin@2.14.1
|
|
29
|
+
- @atlaspack/profiler@2.14.1
|
|
30
|
+
- @atlaspack/types@2.14.1
|
|
31
|
+
- @atlaspack/workers@2.14.1
|
|
32
|
+
- @atlaspack/events@2.14.1
|
|
33
|
+
- @atlaspack/build-cache@2.13.3
|
|
34
|
+
- @atlaspack/cache@2.13.3
|
|
35
|
+
|
|
3
36
|
## 2.14.0
|
|
4
37
|
|
|
5
38
|
### Minor Changes
|
package/lib/Atlaspack.js
CHANGED
|
@@ -118,6 +118,7 @@ function _featureFlags() {
|
|
|
118
118
|
var _atlaspackV = require("./atlaspack-v3");
|
|
119
119
|
var _AssetGraphRequest = _interopRequireDefault(require("./requests/AssetGraphRequest"));
|
|
120
120
|
var _AssetGraphRequestRust = require("./requests/AssetGraphRequestRust");
|
|
121
|
+
var _rustWorkerThreadDylibHack = require("./rustWorkerThreadDylibHack");
|
|
121
122
|
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); }
|
|
122
123
|
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; }
|
|
123
124
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
@@ -125,7 +126,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
125
126
|
(0, _registerCoreWithSerializer.registerCoreWithSerializer)();
|
|
126
127
|
const INTERNAL_TRANSFORM = exports.INTERNAL_TRANSFORM = Symbol('internal_transform');
|
|
127
128
|
const INTERNAL_RESOLVE = exports.INTERNAL_RESOLVE = Symbol('internal_resolve');
|
|
128
|
-
const WORKER_PATH = exports.WORKER_PATH = _path().default.join(
|
|
129
|
+
const WORKER_PATH = exports.WORKER_PATH = _path().default.join(__dirname, 'worker.js');
|
|
129
130
|
class Atlaspack {
|
|
130
131
|
#requestTracker /*: RequestTracker*/;
|
|
131
132
|
#config /*: AtlaspackConfig*/;
|
|
@@ -165,6 +166,9 @@ class Atlaspack {
|
|
|
165
166
|
...this.#initialOptions.featureFlags
|
|
166
167
|
};
|
|
167
168
|
(0, _featureFlags().setFeatureFlags)(featureFlags);
|
|
169
|
+
if ((0, _featureFlags().getFeatureFlag)('enableRustWorkerThreadDylibHack')) {
|
|
170
|
+
(0, _rustWorkerThreadDylibHack.loadRustWorkerThreadDylibHack)();
|
|
171
|
+
}
|
|
168
172
|
await _sourceMap().init;
|
|
169
173
|
await (_rust().init === null || _rust().init === void 0 ? void 0 : (0, _rust().init)());
|
|
170
174
|
this.#disposable = new (_events().Disposable)();
|
package/lib/BundleGraph.js
CHANGED
|
@@ -832,7 +832,7 @@ class BundleGraph {
|
|
|
832
832
|
// If this asset is referenced by any async dependency, it's referenced.
|
|
833
833
|
return true;
|
|
834
834
|
}
|
|
835
|
-
let dependencies = this._graph.getNodeIdsConnectedTo(assetNodeId
|
|
835
|
+
let dependencies = this._graph.getNodeIdsConnectedTo(assetNodeId).map(id => (0, _nullthrows().default)(this._graph.getNode(id))).filter(node => node.type === 'dependency').map(node => {
|
|
836
836
|
(0, _assert().default)(node.type === 'dependency');
|
|
837
837
|
return node.value;
|
|
838
838
|
});
|
package/lib/RequestTracker.js
CHANGED
|
@@ -1100,7 +1100,7 @@ async function loadRequestGraph(options) {
|
|
|
1100
1100
|
});
|
|
1101
1101
|
}, 5000);
|
|
1102
1102
|
let startTime = Date.now();
|
|
1103
|
-
let events = await options.inputFS.getEventsSince(options.watchDir, snapshotPath, opts);
|
|
1103
|
+
let events = process.env.ATLASPACK_BYPASS_CACHE_INVALIDATION === 'true' ? [] : await options.inputFS.getEventsSince(options.watchDir, snapshotPath, opts);
|
|
1104
1104
|
clearTimeout(timeout);
|
|
1105
1105
|
_logger().default.verbose({
|
|
1106
1106
|
origin: '@atlaspack/core',
|
package/lib/index.js
CHANGED
|
@@ -9,8 +9,7 @@ var _exportNames = {
|
|
|
9
9
|
BuildError: true,
|
|
10
10
|
createWorkerFarm: true,
|
|
11
11
|
INTERNAL_RESOLVE: true,
|
|
12
|
-
INTERNAL_TRANSFORM: true
|
|
13
|
-
isSuperPackage: true
|
|
12
|
+
INTERNAL_TRANSFORM: true
|
|
14
13
|
};
|
|
15
14
|
Object.defineProperty(exports, "Atlaspack", {
|
|
16
15
|
enumerable: true,
|
|
@@ -54,14 +53,7 @@ Object.defineProperty(exports, "default", {
|
|
|
54
53
|
return _Atlaspack.default;
|
|
55
54
|
}
|
|
56
55
|
});
|
|
57
|
-
Object.defineProperty(exports, "isSuperPackage", {
|
|
58
|
-
enumerable: true,
|
|
59
|
-
get: function () {
|
|
60
|
-
return _isSuperPackage.isSuperPackage;
|
|
61
|
-
}
|
|
62
|
-
});
|
|
63
56
|
var _Atlaspack = _interopRequireWildcard(require("./Atlaspack"));
|
|
64
|
-
var _isSuperPackage = require("./isSuperPackage");
|
|
65
57
|
var _atlaspackV = require("./atlaspack-v3");
|
|
66
58
|
Object.keys(_atlaspackV).forEach(function (key) {
|
|
67
59
|
if (key === "default" || key === "__esModule") return;
|
|
@@ -25,8 +25,6 @@ function _diagnostic() {
|
|
|
25
25
|
};
|
|
26
26
|
return data;
|
|
27
27
|
}
|
|
28
|
-
var _package = require("../package.json");
|
|
29
|
-
var _internalPlugins = _interopRequireDefault(require("./internal-plugins"));
|
|
30
28
|
function _utils() {
|
|
31
29
|
const data = require("@atlaspack/utils");
|
|
32
30
|
_utils = function () {
|
|
@@ -41,19 +39,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
41
39
|
const NODE_MODULES = `${_path().default.sep}node_modules${_path().default.sep}`;
|
|
42
40
|
const CONFIG = Symbol.for('parcel-plugin-config');
|
|
43
41
|
async function loadPlugin(pluginName, configPath, keyPath, options) {
|
|
44
|
-
if (_internalPlugins.default && _internalPlugins.default[pluginName]) {
|
|
45
|
-
let plugin = _internalPlugins.default[pluginName]();
|
|
46
|
-
plugin = plugin.default || plugin;
|
|
47
|
-
plugin = plugin[CONFIG];
|
|
48
|
-
if (!plugin) {
|
|
49
|
-
throw new Error(`Plugin ${pluginName} is not a valid Atlaspack plugin, should export an instance of a Atlaspack plugin ex. "export default new Reporter({ ... })".`);
|
|
50
|
-
}
|
|
51
|
-
return {
|
|
52
|
-
plugin,
|
|
53
|
-
version: _package.version,
|
|
54
|
-
resolveFrom: (0, _projectPath.toProjectPathUnsafe)(options.projectRoot)
|
|
55
|
-
};
|
|
56
|
-
}
|
|
57
42
|
let resolveFrom = configPath;
|
|
58
43
|
|
|
59
44
|
// Config packages can reference plugins, but cannot contain other plugins within them.
|
|
@@ -262,12 +262,13 @@ class BundleGraph {
|
|
|
262
262
|
ifFalseBundles.push(...depToBundles(cond.ifFalseDependency));
|
|
263
263
|
}
|
|
264
264
|
for (let bundle of bundles) {
|
|
265
|
-
const conditions = bundleConditions.get(bundle) ?? new Map();
|
|
265
|
+
const conditions = bundleConditions.get(bundle.id) ?? new Map();
|
|
266
266
|
conditions.set(cond.key, {
|
|
267
|
+
bundle,
|
|
267
268
|
ifTrueBundles,
|
|
268
269
|
ifFalseBundles
|
|
269
270
|
});
|
|
270
|
-
bundleConditions.set(bundle, conditions);
|
|
271
|
+
bundleConditions.set(bundle.id, conditions);
|
|
271
272
|
}
|
|
272
273
|
}
|
|
273
274
|
return bundleConditions;
|
|
@@ -40,7 +40,7 @@ function _diagnostic() {
|
|
|
40
40
|
return data;
|
|
41
41
|
}
|
|
42
42
|
function _json() {
|
|
43
|
-
const data =
|
|
43
|
+
const data = require("json5");
|
|
44
44
|
_json = function () {
|
|
45
45
|
return data;
|
|
46
46
|
};
|
|
@@ -60,13 +60,11 @@ function _assert() {
|
|
|
60
60
|
};
|
|
61
61
|
return data;
|
|
62
62
|
}
|
|
63
|
-
var _internalPlugins = _interopRequireDefault(require("../internal-plugins"));
|
|
64
63
|
var _AtlaspackConfig = require("../AtlaspackConfig");
|
|
65
64
|
var _AtlaspackConfig2 = _interopRequireDefault(require("../AtlaspackConfig.schema"));
|
|
66
65
|
var _projectPath = require("../projectPath");
|
|
67
66
|
var _RequestTracker = require("../RequestTracker");
|
|
68
67
|
var _utils2 = require("../utils");
|
|
69
|
-
var _isSuperPackage = require("../isSuperPackage");
|
|
70
68
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
71
69
|
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); }
|
|
72
70
|
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; }
|
|
@@ -136,36 +134,28 @@ async function resolveAtlaspackConfig(options) {
|
|
|
136
134
|
let resolveFrom = getResolveFrom(options.inputFS, options.projectRoot);
|
|
137
135
|
let configPath = options.config != null ? (await options.packageManager.resolve(options.config, resolveFrom)).resolved : await (0, _utils().resolveConfig)(options.inputFS, resolveFrom, ['.parcelrc'], options.projectRoot);
|
|
138
136
|
let usedDefault = false;
|
|
139
|
-
|
|
140
|
-
if (configPath == null && options.defaultConfig != null && (0, _isSuperPackage.isSuperPackage)() && options.defaultConfig.endsWith('.js')) {
|
|
137
|
+
if (configPath == null && options.defaultConfig != null) {
|
|
141
138
|
usedDefault = true;
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
}
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
} catch (e) {
|
|
158
|
-
throw new (_diagnostic().default)({
|
|
159
|
-
diagnostic: {
|
|
160
|
-
message: (0, _diagnostic().md)`Could not find parcel config at ${_path().default.relative(options.projectRoot, configPath)}`,
|
|
161
|
-
origin: '@atlaspack/core'
|
|
162
|
-
}
|
|
163
|
-
});
|
|
164
|
-
}
|
|
165
|
-
let result = await parseAndProcessConfig(configPath, contents, options);
|
|
166
|
-
config = result.config;
|
|
167
|
-
extendedFiles = result.extendedFiles;
|
|
139
|
+
configPath = (await options.packageManager.resolve(options.defaultConfig, resolveFrom)).resolved;
|
|
140
|
+
}
|
|
141
|
+
if (configPath == null) {
|
|
142
|
+
return null;
|
|
143
|
+
}
|
|
144
|
+
let contents;
|
|
145
|
+
try {
|
|
146
|
+
contents = await options.inputFS.readFile(configPath, 'utf8');
|
|
147
|
+
} catch (e) {
|
|
148
|
+
throw new (_diagnostic().default)({
|
|
149
|
+
diagnostic: {
|
|
150
|
+
message: (0, _diagnostic().md)`Could not find parcel config at ${_path().default.relative(options.projectRoot, configPath)}`,
|
|
151
|
+
origin: '@atlaspack/core'
|
|
152
|
+
}
|
|
153
|
+
});
|
|
168
154
|
}
|
|
155
|
+
let {
|
|
156
|
+
config,
|
|
157
|
+
extendedFiles
|
|
158
|
+
} = await parseAndProcessConfig(configPath, contents, options);
|
|
169
159
|
if (options.additionalReporters.length > 0) {
|
|
170
160
|
config.reporters = [...options.additionalReporters.map(({
|
|
171
161
|
packageName,
|
|
@@ -189,7 +179,7 @@ function create(config, options) {
|
|
|
189
179
|
async function parseAndProcessConfig(configPath, contents, options) {
|
|
190
180
|
let config;
|
|
191
181
|
try {
|
|
192
|
-
config = _json().
|
|
182
|
+
config = (0, _json().parse)(contents);
|
|
193
183
|
} catch (e) {
|
|
194
184
|
let pos = {
|
|
195
185
|
line: e.lineNumber,
|
|
@@ -314,16 +304,13 @@ async function processConfigChain(configFile, filePath, options) {
|
|
|
314
304
|
for (let ext of exts) {
|
|
315
305
|
try {
|
|
316
306
|
let key = Array.isArray(configFile.extends) ? `/extends/${i}` : '/extends';
|
|
317
|
-
let
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
extendedFiles = extendedFiles.concat(result.extendedFiles);
|
|
325
|
-
nextConfig = result.config;
|
|
326
|
-
}
|
|
307
|
+
let resolved = await resolveExtends(ext, filePath, key, options);
|
|
308
|
+
extendedFiles.push(resolved);
|
|
309
|
+
let {
|
|
310
|
+
extendedFiles: moreExtendedFiles,
|
|
311
|
+
config: nextConfig
|
|
312
|
+
} = await processExtendedConfig(filePath, key, ext, resolved, options);
|
|
313
|
+
extendedFiles = extendedFiles.concat(moreExtendedFiles);
|
|
327
314
|
extStartConfig = extStartConfig ? mergeConfigs(extStartConfig, nextConfig) : nextConfig;
|
|
328
315
|
} catch (err) {
|
|
329
316
|
errors.push(err);
|
package/lib/resolveOptions.js
CHANGED
|
@@ -139,7 +139,19 @@ async function resolveOptions(initialOptions) {
|
|
|
139
139
|
// where symlinked dependencies outside the project root need to trigger HMR
|
|
140
140
|
// updates. Default to the project root if not provided.
|
|
141
141
|
let watchDir = initialOptions.watchDir != null ? _path().default.resolve(initialOptions.watchDir) : projectRoot;
|
|
142
|
-
let cache =
|
|
142
|
+
let cache = function createCache() {
|
|
143
|
+
if (initialOptions.cache) {
|
|
144
|
+
return initialOptions.cache;
|
|
145
|
+
}
|
|
146
|
+
const needsRustLmdbCache = (0, _featureFlags().getFeatureFlag)('atlaspackV3');
|
|
147
|
+
if (!needsRustLmdbCache && !(outputFS instanceof _fs().NodeFS)) {
|
|
148
|
+
return new (_cache().FSCache)(outputFS, cacheDir);
|
|
149
|
+
}
|
|
150
|
+
if (needsRustLmdbCache || (0, _featureFlags().getFeatureFlag)('useLmdbJsLite')) {
|
|
151
|
+
return new (_cache().LMDBLiteCache)(cacheDir);
|
|
152
|
+
}
|
|
153
|
+
return new (_cache().LMDBCache)(cacheDir);
|
|
154
|
+
}();
|
|
143
155
|
let mode = initialOptions.mode ?? 'development';
|
|
144
156
|
let shouldOptimize = (initialOptions === null || initialOptions === void 0 || (_initialOptions$defau = initialOptions.defaultTargetOptions) === null || _initialOptions$defau === void 0 ? void 0 : _initialOptions$defau.shouldOptimize) ?? mode === 'production';
|
|
145
157
|
let publicUrl = (initialOptions === null || initialOptions === void 0 || (_initialOptions$defau2 = initialOptions.defaultTargetOptions) === null || _initialOptions$defau2 === void 0 ? void 0 : _initialOptions$defau2.publicUrl) ?? '/';
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.loadRustWorkerThreadDylibHack = loadRustWorkerThreadDylibHack;
|
|
7
|
+
/**
|
|
8
|
+
* This is a workaround for https://github.com/rust-lang/rust/issues/91979
|
|
9
|
+
* when running atlaspack with parcel bindings, it is possible that the parcel
|
|
10
|
+
* dylib will be loaded from a node worker thread, which causes a crash on exit.
|
|
11
|
+
*
|
|
12
|
+
* This is a workaround to ensure that the parcel dylib is loaded in the main
|
|
13
|
+
* thread, which fixes the crash.
|
|
14
|
+
*/
|
|
15
|
+
function loadRustWorkerThreadDylibHack() {
|
|
16
|
+
try {
|
|
17
|
+
// $FlowFixMe
|
|
18
|
+
require('@parcel/rust'); // eslint-disable-line
|
|
19
|
+
} catch (err) {
|
|
20
|
+
/* ignore */
|
|
21
|
+
}
|
|
22
|
+
}
|
package/lib/worker.js
CHANGED
|
@@ -78,15 +78,15 @@ require("@atlaspack/package-manager");
|
|
|
78
78
|
require("@atlaspack/fs");
|
|
79
79
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
80
80
|
// register with serializer
|
|
81
|
-
// Repl builds are currently not enabled
|
|
82
81
|
// $FlowFixMe
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
//
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
82
|
+
if (process.env.ATLASPACK_BUILD_REPL && process.browser) {
|
|
83
|
+
/* eslint-disable import/no-extraneous-dependencies, monorepo/no-internal-import */
|
|
84
|
+
require('@atlaspack/repl/src/atlaspack/BrowserPackageManager.js');
|
|
85
|
+
// $FlowFixMe
|
|
86
|
+
require('@atlaspack/repl/src/atlaspack/ExtendedMemoryFS.js');
|
|
87
|
+
/* eslint-enable import/no-extraneous-dependencies, monorepo/no-internal-import */
|
|
88
|
+
}
|
|
89
|
+
|
|
90
90
|
(0, _registerCoreWithSerializer.registerCoreWithSerializer)();
|
|
91
91
|
|
|
92
92
|
// Remove the workerApi type from the TransformationOpts and ValidationOpts types:
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaspack/core",
|
|
3
|
-
"version": "2.14.1-dev.
|
|
3
|
+
"version": "2.14.1-dev.74+ba07f66d9",
|
|
4
4
|
"license": "(MIT OR Apache-2.0)",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -20,21 +20,21 @@
|
|
|
20
20
|
"check-ts": "tsc --noEmit index.d.ts"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@atlaspack/build-cache": "2.13.3-dev.
|
|
24
|
-
"@atlaspack/cache": "2.13.3-dev.
|
|
25
|
-
"@atlaspack/diagnostic": "2.14.1-dev.
|
|
26
|
-
"@atlaspack/events": "2.14.1-dev.
|
|
27
|
-
"@atlaspack/feature-flags": "2.14.1-dev.
|
|
28
|
-
"@atlaspack/fs": "2.14.1-dev.
|
|
29
|
-
"@atlaspack/graph": "3.4.1-dev.
|
|
30
|
-
"@atlaspack/logger": "2.14.1-dev.
|
|
31
|
-
"@atlaspack/package-manager": "2.14.1-dev.
|
|
32
|
-
"@atlaspack/plugin": "2.14.1-dev.
|
|
33
|
-
"@atlaspack/profiler": "2.14.1-dev.
|
|
34
|
-
"@atlaspack/rust": "3.0.1-dev.
|
|
35
|
-
"@atlaspack/types": "2.14.1-dev.
|
|
36
|
-
"@atlaspack/utils": "2.14.1-dev.
|
|
37
|
-
"@atlaspack/workers": "2.14.1-dev.
|
|
23
|
+
"@atlaspack/build-cache": "2.13.3-dev.74+ba07f66d9",
|
|
24
|
+
"@atlaspack/cache": "2.13.3-dev.74+ba07f66d9",
|
|
25
|
+
"@atlaspack/diagnostic": "2.14.1-dev.74+ba07f66d9",
|
|
26
|
+
"@atlaspack/events": "2.14.1-dev.74+ba07f66d9",
|
|
27
|
+
"@atlaspack/feature-flags": "2.14.1-dev.74+ba07f66d9",
|
|
28
|
+
"@atlaspack/fs": "2.14.1-dev.74+ba07f66d9",
|
|
29
|
+
"@atlaspack/graph": "3.4.1-dev.74+ba07f66d9",
|
|
30
|
+
"@atlaspack/logger": "2.14.1-dev.74+ba07f66d9",
|
|
31
|
+
"@atlaspack/package-manager": "2.14.1-dev.74+ba07f66d9",
|
|
32
|
+
"@atlaspack/plugin": "2.14.1-dev.74+ba07f66d9",
|
|
33
|
+
"@atlaspack/profiler": "2.14.1-dev.74+ba07f66d9",
|
|
34
|
+
"@atlaspack/rust": "3.0.1-dev.74+ba07f66d9",
|
|
35
|
+
"@atlaspack/types": "2.14.1-dev.74+ba07f66d9",
|
|
36
|
+
"@atlaspack/utils": "2.14.1-dev.74+ba07f66d9",
|
|
37
|
+
"@atlaspack/workers": "2.14.1-dev.74+ba07f66d9",
|
|
38
38
|
"@mischnic/json-sourcemap": "^0.1.0",
|
|
39
39
|
"@parcel/source-map": "^2.1.1",
|
|
40
40
|
"base-x": "^3.0.8",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"semver": "^7.5.2"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"@atlaspack/babel-register": "2.14.
|
|
51
|
+
"@atlaspack/babel-register": "2.14.1",
|
|
52
52
|
"@types/node": ">= 18",
|
|
53
53
|
"graphviz": "^0.0.9",
|
|
54
54
|
"jest-diff": "*",
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"./src/serializerCore.js": "./src/serializerCore.browser.js"
|
|
68
68
|
},
|
|
69
69
|
"type": "commonjs",
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "ba07f66d98162399b00f736e5f117bd9ec20deae"
|
|
71
71
|
}
|
package/src/Atlaspack.js
CHANGED
|
@@ -58,20 +58,22 @@ import {
|
|
|
58
58
|
fromProjectPathRelative,
|
|
59
59
|
} from './projectPath';
|
|
60
60
|
import {tracer} from '@atlaspack/profiler';
|
|
61
|
-
import {
|
|
61
|
+
import {
|
|
62
|
+
getFeatureFlag,
|
|
63
|
+
setFeatureFlags,
|
|
64
|
+
DEFAULT_FEATURE_FLAGS,
|
|
65
|
+
} from '@atlaspack/feature-flags';
|
|
62
66
|
import {AtlaspackV3, FileSystemV3} from './atlaspack-v3';
|
|
63
67
|
import createAssetGraphRequestJS from './requests/AssetGraphRequest';
|
|
64
68
|
import {createAssetGraphRequestRust} from './requests/AssetGraphRequestRust';
|
|
65
69
|
import type {AssetGraphRequestResult} from './requests/AssetGraphRequest';
|
|
70
|
+
import {loadRustWorkerThreadDylibHack} from './rustWorkerThreadDylibHack';
|
|
66
71
|
|
|
67
72
|
registerCoreWithSerializer();
|
|
68
73
|
|
|
69
74
|
export const INTERNAL_TRANSFORM: symbol = Symbol('internal_transform');
|
|
70
75
|
export const INTERNAL_RESOLVE: symbol = Symbol('internal_resolve');
|
|
71
|
-
export const WORKER_PATH: string = path.join(
|
|
72
|
-
/*#__ATLASPACK_IGNORE__*/ __dirname,
|
|
73
|
-
'worker.js',
|
|
74
|
-
);
|
|
76
|
+
export const WORKER_PATH: string = path.join(__dirname, 'worker.js');
|
|
75
77
|
|
|
76
78
|
export default class Atlaspack {
|
|
77
79
|
#requestTracker /*: RequestTracker*/;
|
|
@@ -120,6 +122,10 @@ export default class Atlaspack {
|
|
|
120
122
|
};
|
|
121
123
|
setFeatureFlags(featureFlags);
|
|
122
124
|
|
|
125
|
+
if (getFeatureFlag('enableRustWorkerThreadDylibHack')) {
|
|
126
|
+
loadRustWorkerThreadDylibHack();
|
|
127
|
+
}
|
|
128
|
+
|
|
123
129
|
await initSourcemaps;
|
|
124
130
|
await initRust?.();
|
|
125
131
|
|
package/src/BundleGraph.js
CHANGED
|
@@ -1315,7 +1315,7 @@ export default class BundleGraph {
|
|
|
1315
1315
|
}
|
|
1316
1316
|
|
|
1317
1317
|
let dependencies = this._graph
|
|
1318
|
-
.getNodeIdsConnectedTo(assetNodeId
|
|
1318
|
+
.getNodeIdsConnectedTo(assetNodeId)
|
|
1319
1319
|
.map((id) => nullthrows(this._graph.getNode(id)))
|
|
1320
1320
|
.filter((node) => node.type === 'dependency')
|
|
1321
1321
|
.map((node) => {
|
package/src/RequestTracker.js
CHANGED
|
@@ -1697,11 +1697,14 @@ async function loadRequestGraph(options): Async<RequestGraph> {
|
|
|
1697
1697
|
});
|
|
1698
1698
|
}, 5000);
|
|
1699
1699
|
let startTime = Date.now();
|
|
1700
|
-
let events =
|
|
1701
|
-
|
|
1702
|
-
|
|
1703
|
-
|
|
1704
|
-
|
|
1700
|
+
let events =
|
|
1701
|
+
process.env.ATLASPACK_BYPASS_CACHE_INVALIDATION === 'true'
|
|
1702
|
+
? []
|
|
1703
|
+
: await options.inputFS.getEventsSince(
|
|
1704
|
+
options.watchDir,
|
|
1705
|
+
snapshotPath,
|
|
1706
|
+
opts,
|
|
1707
|
+
);
|
|
1705
1708
|
clearTimeout(timeout);
|
|
1706
1709
|
|
|
1707
1710
|
logger.verbose({
|
package/src/index.js
CHANGED
|
@@ -8,14 +8,8 @@ import ThrowableDiagnostic, {
|
|
|
8
8
|
generateJSONCodeHighlights,
|
|
9
9
|
md,
|
|
10
10
|
} from '@atlaspack/diagnostic';
|
|
11
|
-
import {version as ATLASPACK_VERSION} from '../package.json';
|
|
12
|
-
import atlaspackInternalPlugins from './internal-plugins';
|
|
13
11
|
import {findAlternativeNodeModules} from '@atlaspack/utils';
|
|
14
|
-
import {
|
|
15
|
-
type ProjectPath,
|
|
16
|
-
toProjectPath,
|
|
17
|
-
toProjectPathUnsafe,
|
|
18
|
-
} from './projectPath';
|
|
12
|
+
import {type ProjectPath, toProjectPath} from './projectPath';
|
|
19
13
|
|
|
20
14
|
const NODE_MODULES = `${path.sep}node_modules${path.sep}`;
|
|
21
15
|
const CONFIG = Symbol.for('parcel-plugin-config');
|
|
@@ -30,22 +24,6 @@ export default async function loadPlugin<T>(
|
|
|
30
24
|
version: Semver,
|
|
31
25
|
resolveFrom: ProjectPath,
|
|
32
26
|
|}> {
|
|
33
|
-
if (atlaspackInternalPlugins && atlaspackInternalPlugins[pluginName]) {
|
|
34
|
-
let plugin = atlaspackInternalPlugins[pluginName]();
|
|
35
|
-
plugin = plugin.default || plugin;
|
|
36
|
-
plugin = plugin[CONFIG];
|
|
37
|
-
if (!plugin) {
|
|
38
|
-
throw new Error(
|
|
39
|
-
`Plugin ${pluginName} is not a valid Atlaspack plugin, should export an instance of a Atlaspack plugin ex. "export default new Reporter({ ... })".`,
|
|
40
|
-
);
|
|
41
|
-
}
|
|
42
|
-
return {
|
|
43
|
-
plugin,
|
|
44
|
-
version: ATLASPACK_VERSION,
|
|
45
|
-
resolveFrom: toProjectPathUnsafe(options.projectRoot),
|
|
46
|
-
};
|
|
47
|
-
}
|
|
48
|
-
|
|
49
27
|
let resolveFrom = configPath;
|
|
50
28
|
|
|
51
29
|
// Config packages can reference plugins, but cannot contain other plugins within them.
|
|
@@ -444,10 +444,11 @@ export default class BundleGraph<TBundle: IBundle>
|
|
|
444
444
|
// be used by a webserver to understand which conditions are used by which bundles,
|
|
445
445
|
// and which bundles those conditions require depending on what they evaluate to.
|
|
446
446
|
getConditionalBundleMapping(): Map<
|
|
447
|
-
|
|
447
|
+
string,
|
|
448
448
|
Map<
|
|
449
449
|
string,
|
|
450
450
|
{|
|
|
451
|
+
bundle: TBundle,
|
|
451
452
|
ifTrueBundles: Array<TBundle>,
|
|
452
453
|
ifFalseBundles: Array<TBundle>,
|
|
453
454
|
|},
|
|
@@ -486,14 +487,15 @@ export default class BundleGraph<TBundle: IBundle>
|
|
|
486
487
|
}
|
|
487
488
|
|
|
488
489
|
for (let bundle of bundles) {
|
|
489
|
-
const conditions = bundleConditions.get(bundle) ?? new Map();
|
|
490
|
+
const conditions = bundleConditions.get(bundle.id) ?? new Map();
|
|
490
491
|
|
|
491
492
|
conditions.set(cond.key, {
|
|
493
|
+
bundle,
|
|
492
494
|
ifTrueBundles,
|
|
493
495
|
ifFalseBundles,
|
|
494
496
|
});
|
|
495
497
|
|
|
496
|
-
bundleConditions.set(bundle, conditions);
|
|
498
|
+
bundleConditions.set(bundle.id, conditions);
|
|
497
499
|
}
|
|
498
500
|
}
|
|
499
501
|
|
|
@@ -30,17 +30,15 @@ import ThrowableDiagnostic, {
|
|
|
30
30
|
md,
|
|
31
31
|
errorToDiagnostic,
|
|
32
32
|
} from '@atlaspack/diagnostic';
|
|
33
|
-
import
|
|
33
|
+
import {parse} from 'json5';
|
|
34
34
|
import path from 'path';
|
|
35
35
|
import invariant from 'assert';
|
|
36
36
|
|
|
37
|
-
import atlaspackInternalPlugins from '../internal-plugins';
|
|
38
37
|
import {AtlaspackConfig} from '../AtlaspackConfig';
|
|
39
38
|
import AtlaspackConfigSchema from '../AtlaspackConfig.schema';
|
|
40
39
|
import {toProjectPath} from '../projectPath';
|
|
41
40
|
import {requestTypes} from '../RequestTracker';
|
|
42
41
|
import {optionsProxy} from '../utils';
|
|
43
|
-
import {isSuperPackage} from '../isSuperPackage';
|
|
44
42
|
|
|
45
43
|
type ConfigMap<K, V> = {[K]: V, ...};
|
|
46
44
|
|
|
@@ -161,60 +159,35 @@ export async function resolveAtlaspackConfig(
|
|
|
161
159
|
);
|
|
162
160
|
|
|
163
161
|
let usedDefault = false;
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
if (
|
|
167
|
-
configPath == null &&
|
|
168
|
-
options.defaultConfig != null &&
|
|
169
|
-
isSuperPackage() &&
|
|
170
|
-
options.defaultConfig.endsWith('.js')
|
|
171
|
-
) {
|
|
162
|
+
if (configPath == null && options.defaultConfig != null) {
|
|
172
163
|
usedDefault = true;
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
options,
|
|
178
|
-
);
|
|
179
|
-
config = result.config;
|
|
180
|
-
extendedFiles = result.extendedFiles;
|
|
181
|
-
} else {
|
|
182
|
-
if (configPath == null && options.defaultConfig != null) {
|
|
183
|
-
usedDefault = true;
|
|
184
|
-
|
|
185
|
-
configPath = (
|
|
186
|
-
await options.packageManager.resolve(options.defaultConfig, resolveFrom)
|
|
187
|
-
).resolved;
|
|
188
|
-
}
|
|
189
|
-
|
|
190
|
-
if (configPath == null) {
|
|
191
|
-
return null;
|
|
192
|
-
}
|
|
164
|
+
configPath = (
|
|
165
|
+
await options.packageManager.resolve(options.defaultConfig, resolveFrom)
|
|
166
|
+
).resolved;
|
|
167
|
+
}
|
|
193
168
|
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
} catch (e) {
|
|
198
|
-
throw new ThrowableDiagnostic({
|
|
199
|
-
diagnostic: {
|
|
200
|
-
message: md`Could not find parcel config at ${path.relative(
|
|
201
|
-
options.projectRoot,
|
|
202
|
-
configPath,
|
|
203
|
-
)}`,
|
|
204
|
-
origin: '@atlaspack/core',
|
|
205
|
-
},
|
|
206
|
-
});
|
|
207
|
-
}
|
|
169
|
+
if (configPath == null) {
|
|
170
|
+
return null;
|
|
171
|
+
}
|
|
208
172
|
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
173
|
+
let contents;
|
|
174
|
+
try {
|
|
175
|
+
contents = await options.inputFS.readFile(configPath, 'utf8');
|
|
176
|
+
} catch (e) {
|
|
177
|
+
throw new ThrowableDiagnostic({
|
|
178
|
+
diagnostic: {
|
|
179
|
+
message: md`Could not find parcel config at ${path.relative(
|
|
180
|
+
options.projectRoot,
|
|
181
|
+
configPath,
|
|
182
|
+
)}`,
|
|
183
|
+
origin: '@atlaspack/core',
|
|
184
|
+
},
|
|
185
|
+
});
|
|
216
186
|
}
|
|
217
187
|
|
|
188
|
+
let {config, extendedFiles}: AtlaspackConfigChain =
|
|
189
|
+
await parseAndProcessConfig(configPath, contents, options);
|
|
190
|
+
|
|
218
191
|
if (options.additionalReporters.length > 0) {
|
|
219
192
|
config.reporters = [
|
|
220
193
|
...options.additionalReporters.map(({packageName, resolveFrom}) => ({
|
|
@@ -243,7 +216,7 @@ export async function parseAndProcessConfig(
|
|
|
243
216
|
): Promise<AtlaspackConfigChain> {
|
|
244
217
|
let config: RawAtlaspackConfig;
|
|
245
218
|
try {
|
|
246
|
-
config =
|
|
219
|
+
config = parse(contents);
|
|
247
220
|
} catch (e) {
|
|
248
221
|
let pos = {
|
|
249
222
|
line: e.lineNumber,
|
|
@@ -473,29 +446,11 @@ export async function processConfigChain(
|
|
|
473
446
|
let key = Array.isArray(configFile.extends)
|
|
474
447
|
? `/extends/${i}`
|
|
475
448
|
: '/extends';
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
atlaspackInternalPlugins[ext](),
|
|
482
|
-
/*#__ATLASPACK_IGNORE__*/ __dirname,
|
|
483
|
-
options,
|
|
484
|
-
)
|
|
485
|
-
).config;
|
|
486
|
-
} else {
|
|
487
|
-
let resolved = await resolveExtends(ext, filePath, key, options);
|
|
488
|
-
extendedFiles.push(resolved);
|
|
489
|
-
let result = await processExtendedConfig(
|
|
490
|
-
filePath,
|
|
491
|
-
key,
|
|
492
|
-
ext,
|
|
493
|
-
resolved,
|
|
494
|
-
options,
|
|
495
|
-
);
|
|
496
|
-
extendedFiles = extendedFiles.concat(result.extendedFiles);
|
|
497
|
-
nextConfig = result.config;
|
|
498
|
-
}
|
|
449
|
+
let resolved = await resolveExtends(ext, filePath, key, options);
|
|
450
|
+
extendedFiles.push(resolved);
|
|
451
|
+
let {extendedFiles: moreExtendedFiles, config: nextConfig} =
|
|
452
|
+
await processExtendedConfig(filePath, key, ext, resolved, options);
|
|
453
|
+
extendedFiles = extendedFiles.concat(moreExtendedFiles);
|
|
499
454
|
extStartConfig = extStartConfig
|
|
500
455
|
? mergeConfigs(extStartConfig, nextConfig)
|
|
501
456
|
: nextConfig;
|
package/src/resolveOptions.js
CHANGED
|
@@ -12,7 +12,7 @@ import type {AtlaspackOptions} from './types';
|
|
|
12
12
|
import path from 'path';
|
|
13
13
|
import {hashString} from '@atlaspack/rust';
|
|
14
14
|
import {NodeFS, NodeVCSAwareFS} from '@atlaspack/fs';
|
|
15
|
-
import {LMDBLiteCache, FSCache} from '@atlaspack/cache';
|
|
15
|
+
import {LMDBCache, LMDBLiteCache, FSCache} from '@atlaspack/cache';
|
|
16
16
|
import {getFeatureFlag, getFeatureFlagValue} from '@atlaspack/feature-flags';
|
|
17
17
|
import {NodePackageManager} from '@atlaspack/package-manager';
|
|
18
18
|
import {
|
|
@@ -146,10 +146,25 @@ export default async function resolveOptions(
|
|
|
146
146
|
? path.resolve(initialOptions.watchDir)
|
|
147
147
|
: projectRoot;
|
|
148
148
|
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
149
|
+
function createCache() {
|
|
150
|
+
if (initialOptions.cache) {
|
|
151
|
+
return initialOptions.cache;
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
const needsRustLmdbCache = getFeatureFlag('atlaspackV3');
|
|
155
|
+
|
|
156
|
+
if (!needsRustLmdbCache && !(outputFS instanceof NodeFS)) {
|
|
157
|
+
return new FSCache(outputFS, cacheDir);
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
if (needsRustLmdbCache || getFeatureFlag('useLmdbJsLite')) {
|
|
161
|
+
return new LMDBLiteCache(cacheDir);
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
return new LMDBCache(cacheDir);
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
let cache = createCache();
|
|
153
168
|
|
|
154
169
|
let mode = initialOptions.mode ?? 'development';
|
|
155
170
|
let shouldOptimize =
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
// @flow strict-local
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* This is a workaround for https://github.com/rust-lang/rust/issues/91979
|
|
5
|
+
* when running atlaspack with parcel bindings, it is possible that the parcel
|
|
6
|
+
* dylib will be loaded from a node worker thread, which causes a crash on exit.
|
|
7
|
+
*
|
|
8
|
+
* This is a workaround to ensure that the parcel dylib is loaded in the main
|
|
9
|
+
* thread, which fixes the crash.
|
|
10
|
+
*/
|
|
11
|
+
export function loadRustWorkerThreadDylibHack() {
|
|
12
|
+
try {
|
|
13
|
+
// $FlowFixMe
|
|
14
|
+
require('@parcel/rust'); // eslint-disable-line
|
|
15
|
+
} catch (err) {
|
|
16
|
+
/* ignore */
|
|
17
|
+
}
|
|
18
|
+
}
|
package/src/worker.js
CHANGED
|
@@ -32,15 +32,14 @@ import '@atlaspack/cache'; // register with serializer
|
|
|
32
32
|
import '@atlaspack/package-manager';
|
|
33
33
|
import '@atlaspack/fs';
|
|
34
34
|
|
|
35
|
-
// Repl builds are currently not enabled
|
|
36
35
|
// $FlowFixMe
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
//
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
36
|
+
if (process.env.ATLASPACK_BUILD_REPL && process.browser) {
|
|
37
|
+
/* eslint-disable import/no-extraneous-dependencies, monorepo/no-internal-import */
|
|
38
|
+
require('@atlaspack/repl/src/atlaspack/BrowserPackageManager.js');
|
|
39
|
+
// $FlowFixMe
|
|
40
|
+
require('@atlaspack/repl/src/atlaspack/ExtendedMemoryFS.js');
|
|
41
|
+
/* eslint-enable import/no-extraneous-dependencies, monorepo/no-internal-import */
|
|
42
|
+
}
|
|
44
43
|
|
|
45
44
|
registerCoreWithSerializer();
|
|
46
45
|
|
package/test/Environment.test.js
CHANGED
|
@@ -108,7 +108,11 @@ describe('Environment', () => {
|
|
|
108
108
|
|
|
109
109
|
describe('createEnvironment', function () {
|
|
110
110
|
it('returns a stable hash', () => {
|
|
111
|
-
|
|
111
|
+
try {
|
|
112
|
+
initializeMonitoring();
|
|
113
|
+
} catch (_err) {
|
|
114
|
+
/* ignore */
|
|
115
|
+
}
|
|
112
116
|
const environment = createEnvironment({});
|
|
113
117
|
expect(environment.id).toEqual('d821e85f6b50315e');
|
|
114
118
|
});
|
package/lib/internal-plugins.js
DELETED
package/lib/isSuperPackage.js
DELETED
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
let fs = require('fs');
|
|
4
|
-
let path = require('path');
|
|
5
|
-
let {
|
|
6
|
-
findAncestorFile
|
|
7
|
-
} = require('@atlaspack/rust');
|
|
8
|
-
let dirname = /*#__ATLASPACK_IGNORE__*/__dirname;
|
|
9
|
-
module.exports.isSuperPackage = () => {
|
|
10
|
-
if (!dirname) {
|
|
11
|
-
return false;
|
|
12
|
-
}
|
|
13
|
-
let packageJson = JSON.parse(fs.readFileSync(findAncestorFile(['package.json'], dirname, '/')));
|
|
14
|
-
return packageJson.name === '@atlaspack/super';
|
|
15
|
-
};
|
package/src/internal-plugins.js
DELETED
package/src/isSuperPackage.js
DELETED
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
let fs = require('fs');
|
|
2
|
-
let path = require('path');
|
|
3
|
-
let {findAncestorFile} = require('@atlaspack/rust');
|
|
4
|
-
let dirname = /*#__ATLASPACK_IGNORE__*/ __dirname;
|
|
5
|
-
|
|
6
|
-
module.exports.isSuperPackage = () => {
|
|
7
|
-
if (!dirname) {
|
|
8
|
-
return false;
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
let packageJson = JSON.parse(
|
|
12
|
-
fs.readFileSync(findAncestorFile(['package.json'], dirname, '/')),
|
|
13
|
-
);
|
|
14
|
-
|
|
15
|
-
return packageJson.name === '@atlaspack/super';
|
|
16
|
-
};
|