@atlaspack/core 2.14.1-dev.43 → 2.14.1-dev.50
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/lib/index.js +9 -1
- package/lib/isSuperPackage.js +15 -0
- package/lib/requests/AtlaspackConfigRequest.js +11 -7
- package/lib/worker.js +8 -8
- package/package.json +17 -17
- package/src/index.js +2 -0
- package/src/isSuperPackage.js +16 -0
- package/src/requests/AtlaspackConfigRequest.js +24 -5
- package/src/worker.js +8 -7
package/lib/index.js
CHANGED
|
@@ -9,7 +9,8 @@ var _exportNames = {
|
|
|
9
9
|
BuildError: true,
|
|
10
10
|
createWorkerFarm: true,
|
|
11
11
|
INTERNAL_RESOLVE: true,
|
|
12
|
-
INTERNAL_TRANSFORM: true
|
|
12
|
+
INTERNAL_TRANSFORM: true,
|
|
13
|
+
isSuperPackage: true
|
|
13
14
|
};
|
|
14
15
|
Object.defineProperty(exports, "Atlaspack", {
|
|
15
16
|
enumerable: true,
|
|
@@ -53,7 +54,14 @@ Object.defineProperty(exports, "default", {
|
|
|
53
54
|
return _Atlaspack.default;
|
|
54
55
|
}
|
|
55
56
|
});
|
|
57
|
+
Object.defineProperty(exports, "isSuperPackage", {
|
|
58
|
+
enumerable: true,
|
|
59
|
+
get: function () {
|
|
60
|
+
return _isSuperPackage.isSuperPackage;
|
|
61
|
+
}
|
|
62
|
+
});
|
|
56
63
|
var _Atlaspack = _interopRequireWildcard(require("./Atlaspack"));
|
|
64
|
+
var _isSuperPackage = require("./isSuperPackage");
|
|
57
65
|
var _atlaspackV = require("./atlaspack-v3");
|
|
58
66
|
Object.keys(_atlaspackV).forEach(function (key) {
|
|
59
67
|
if (key === "default" || key === "__esModule") return;
|
|
@@ -0,0 +1,15 @@
|
|
|
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
|
+
};
|
|
@@ -60,6 +60,7 @@ function _assert() {
|
|
|
60
60
|
};
|
|
61
61
|
return data;
|
|
62
62
|
}
|
|
63
|
+
var _internalPlugins = _interopRequireDefault(require("../internal-plugins"));
|
|
63
64
|
var _AtlaspackConfig = require("../AtlaspackConfig");
|
|
64
65
|
var _AtlaspackConfig2 = _interopRequireDefault(require("../AtlaspackConfig.schema"));
|
|
65
66
|
var _projectPath = require("../projectPath");
|
|
@@ -304,13 +305,16 @@ async function processConfigChain(configFile, filePath, options) {
|
|
|
304
305
|
for (let ext of exts) {
|
|
305
306
|
try {
|
|
306
307
|
let key = Array.isArray(configFile.extends) ? `/extends/${i}` : '/extends';
|
|
307
|
-
let
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
308
|
+
let nextConfig;
|
|
309
|
+
if (_internalPlugins.default[ext]) {
|
|
310
|
+
nextConfig = (await processConfigChain(_internalPlugins.default[ext](), /*#__ATLASPACK_IGNORE__*/__dirname, options)).config;
|
|
311
|
+
} else {
|
|
312
|
+
let resolved = await resolveExtends(ext, filePath, key, options);
|
|
313
|
+
extendedFiles.push(resolved);
|
|
314
|
+
let result = await processExtendedConfig(filePath, key, ext, resolved, options);
|
|
315
|
+
extendedFiles = extendedFiles.concat(result.extendedFiles);
|
|
316
|
+
nextConfig = result.config;
|
|
317
|
+
}
|
|
314
318
|
extStartConfig = extStartConfig ? mergeConfigs(extStartConfig, nextConfig) : nextConfig;
|
|
315
319
|
} catch (err) {
|
|
316
320
|
errors.push(err);
|
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
|
|
81
82
|
// $FlowFixMe
|
|
82
|
-
if (process.env.ATLASPACK_BUILD_REPL && process.browser) {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
}
|
|
89
|
-
|
|
83
|
+
// if (process.env.ATLASPACK_BUILD_REPL && process.browser) {
|
|
84
|
+
// /* eslint-disable import/no-extraneous-dependencies, monorepo/no-internal-import */
|
|
85
|
+
// require('@atlaspack/repl/src/atlaspack/BrowserPackageManager.js');
|
|
86
|
+
// // $FlowFixMe
|
|
87
|
+
// require('@atlaspack/repl/src/atlaspack/ExtendedMemoryFS.js');
|
|
88
|
+
// /* eslint-enable import/no-extraneous-dependencies, monorepo/no-internal-import */
|
|
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.50+0914fcd0b",
|
|
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.50+0914fcd0b",
|
|
24
|
+
"@atlaspack/cache": "2.13.3-dev.50+0914fcd0b",
|
|
25
|
+
"@atlaspack/diagnostic": "2.14.1-dev.50+0914fcd0b",
|
|
26
|
+
"@atlaspack/events": "2.14.1-dev.50+0914fcd0b",
|
|
27
|
+
"@atlaspack/feature-flags": "2.14.1-dev.50+0914fcd0b",
|
|
28
|
+
"@atlaspack/fs": "2.14.1-dev.50+0914fcd0b",
|
|
29
|
+
"@atlaspack/graph": "3.4.1-dev.50+0914fcd0b",
|
|
30
|
+
"@atlaspack/logger": "2.14.1-dev.50+0914fcd0b",
|
|
31
|
+
"@atlaspack/package-manager": "2.14.1-dev.50+0914fcd0b",
|
|
32
|
+
"@atlaspack/plugin": "2.14.1-dev.50+0914fcd0b",
|
|
33
|
+
"@atlaspack/profiler": "2.14.1-dev.50+0914fcd0b",
|
|
34
|
+
"@atlaspack/rust": "3.0.1-dev.50+0914fcd0b",
|
|
35
|
+
"@atlaspack/types": "2.14.1-dev.50+0914fcd0b",
|
|
36
|
+
"@atlaspack/utils": "2.14.1-dev.50+0914fcd0b",
|
|
37
|
+
"@atlaspack/workers": "2.14.1-dev.50+0914fcd0b",
|
|
38
38
|
"@mischnic/json-sourcemap": "^0.1.0",
|
|
39
39
|
"@parcel/source-map": "^2.1.1",
|
|
40
40
|
"base-x": "^3.0.8",
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"./src/serializerCore.js": "./src/serializerCore.browser.js"
|
|
68
68
|
},
|
|
69
69
|
"type": "commonjs",
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "0914fcd0b475df31a4e105a1cda98df3c679c661"
|
|
71
71
|
}
|
package/src/index.js
CHANGED
|
@@ -0,0 +1,16 @@
|
|
|
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
|
+
};
|
|
@@ -34,6 +34,7 @@ import json5 from 'json5';
|
|
|
34
34
|
import path from 'path';
|
|
35
35
|
import invariant from 'assert';
|
|
36
36
|
|
|
37
|
+
import atlaspackInternalPlugins from '../internal-plugins';
|
|
37
38
|
import {AtlaspackConfig} from '../AtlaspackConfig';
|
|
38
39
|
import AtlaspackConfigSchema from '../AtlaspackConfig.schema';
|
|
39
40
|
import {toProjectPath} from '../projectPath';
|
|
@@ -446,11 +447,29 @@ export async function processConfigChain(
|
|
|
446
447
|
let key = Array.isArray(configFile.extends)
|
|
447
448
|
? `/extends/${i}`
|
|
448
449
|
: '/extends';
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
450
|
+
|
|
451
|
+
let nextConfig;
|
|
452
|
+
if (atlaspackInternalPlugins[ext]) {
|
|
453
|
+
nextConfig = (
|
|
454
|
+
await processConfigChain(
|
|
455
|
+
atlaspackInternalPlugins[ext](),
|
|
456
|
+
/*#__ATLASPACK_IGNORE__*/ __dirname,
|
|
457
|
+
options,
|
|
458
|
+
)
|
|
459
|
+
).config;
|
|
460
|
+
} else {
|
|
461
|
+
let resolved = await resolveExtends(ext, filePath, key, options);
|
|
462
|
+
extendedFiles.push(resolved);
|
|
463
|
+
let result = await processExtendedConfig(
|
|
464
|
+
filePath,
|
|
465
|
+
key,
|
|
466
|
+
ext,
|
|
467
|
+
resolved,
|
|
468
|
+
options,
|
|
469
|
+
);
|
|
470
|
+
extendedFiles = extendedFiles.concat(result.extendedFiles);
|
|
471
|
+
nextConfig = result.config;
|
|
472
|
+
}
|
|
454
473
|
extStartConfig = extStartConfig
|
|
455
474
|
? mergeConfigs(extStartConfig, nextConfig)
|
|
456
475
|
: nextConfig;
|
package/src/worker.js
CHANGED
|
@@ -32,14 +32,15 @@ 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
|
|
35
36
|
// $FlowFixMe
|
|
36
|
-
if (process.env.ATLASPACK_BUILD_REPL && process.browser) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
}
|
|
37
|
+
// if (process.env.ATLASPACK_BUILD_REPL && process.browser) {
|
|
38
|
+
// /* eslint-disable import/no-extraneous-dependencies, monorepo/no-internal-import */
|
|
39
|
+
// require('@atlaspack/repl/src/atlaspack/BrowserPackageManager.js');
|
|
40
|
+
// // $FlowFixMe
|
|
41
|
+
// require('@atlaspack/repl/src/atlaspack/ExtendedMemoryFS.js');
|
|
42
|
+
// /* eslint-enable import/no-extraneous-dependencies, monorepo/no-internal-import */
|
|
43
|
+
// }
|
|
43
44
|
|
|
44
45
|
registerCoreWithSerializer();
|
|
45
46
|
|