@atlaspack/packager-js 2.23.1 → 2.23.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaspack/packager-js
 
+## 2.23.2
+
+### Patch Changes
+
+- [#796](https://github.com/atlassian-labs/atlaspack/pull/796) [`0e967b0`](https://github.com/atlassian-labs/atlaspack/commit/0e967b0cf0fbd885588b81476ec1f25a507ffa94) Thanks [@benjervis](https://github.com/benjervis)! - Minor refactor of the internals of the scope hoisting packager. Some of the internal objects are now keyed on Assets rather than string asset IDs.
+
+- [#801](https://github.com/atlassian-labs/atlaspack/pull/801) [`b104fd8`](https://github.com/atlassian-labs/atlaspack/commit/b104fd846ea17c583e68ddc6b309c5e1edee6938) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Fix incorrect output with skipped assets with scope hoisting improvements
+
+- Updated dependencies [[`0207171`](https://github.com/atlassian-labs/atlaspack/commit/0207171e59e985c51e105aec2e0a99de174374bd), [`10ee3fa`](https://github.com/atlassian-labs/atlaspack/commit/10ee3fa5b75a92acde8973673d9b3c5b6f3958e5), [`bbe4e28`](https://github.com/atlassian-labs/atlaspack/commit/bbe4e28c89e5e9284bd730075d4d6f2a3cb37b21), [`1180103`](https://github.com/atlassian-labs/atlaspack/commit/118010351ed444f8178988afb3f77807154dd933), [`2bc93b1`](https://github.com/atlassian-labs/atlaspack/commit/2bc93b17cea07fd7cbb68acec84d8471345a22b4)]:
+  - @atlaspack/feature-flags@2.25.2
+  - @atlaspack/rust@3.8.2
+  - @atlaspack/utils@3.0.0
+  - @atlaspack/plugin@2.14.32
+  - @atlaspack/types@2.15.22
+
 ## 2.23.1
 
 ### Patch Changes

package/dist/CJSOutputFormat.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CJSOutputFormat = void 0;
+class CJSOutputFormat {
+    constructor(packager) {
+        this.packager = packager;
+    }
+    buildBundlePrelude() {
+        let res = '';
+        let lines = 0;
+        for (let [source, specifiers] of this.packager.externals) {
+            // CJS only supports the namespace symbol. This ensures that all accesses
+            // are live and the `this` binding is correct.
+            let namespace = specifiers.get('*');
+            if (namespace) {
+                res += `var ${namespace} = require(${JSON.stringify(source)});\n`;
+                lines++;
+            }
+            else {
+                res += `require(${JSON.stringify(source)});\n`;
+                lines++;
+            }
+        }
+        if (res.length > 0) {
+            res += '\n';
+            lines++;
+        }
+        return [res, lines];
+    }
+    buildBundlePostlude() {
+        return ['', 0];
+    }
+}
+exports.CJSOutputFormat = CJSOutputFormat;

package/dist/DevPackager.js

@@ -0,0 +1,202 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DevPackager = void 0;
+const utils_1 = require("@atlaspack/utils");
+const source_map_1 = __importDefault(require("@parcel/source-map"));
+const feature_flags_1 = require("@atlaspack/feature-flags");
+const assert_1 = __importDefault(require("assert"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const utils_2 = require("./utils");
+const PRELUDE = fs_1.default
+    .readFileSync(path_1.default.join(__dirname, 'dev-prelude.js'), 'utf8')
+    .trim()
+    .replace(/;$/, '');
+class DevPackager {
+    constructor(options, bundleGraph, bundle, parcelRequireName) {
+        this.options = options;
+        this.bundleGraph = bundleGraph;
+        this.bundle = bundle;
+        this.parcelRequireName = parcelRequireName;
+    }
+    async package() {
+        // Load assets
+        let queue = new utils_1.PromiseQueue({ maxConcurrent: 32 });
+        this.bundle.traverseAssets((asset) => {
+            queue.add(async () => {
+                let [code, mapBuffer] = await Promise.all([
+                    asset.getCode(),
+                    this.bundle.env.sourceMap && asset.getMapBuffer(),
+                ]);
+                return { code, mapBuffer };
+            });
+        });
+        let results = await queue.run();
+        let assets = '';
+        let i = 0;
+        let first = true;
+        let map = new source_map_1.default(this.options.projectRoot);
+        let prefix = this.getPrefix();
+        let lineOffset = (0, utils_1.countLines)(prefix);
+        let script = null;
+        this.bundle.traverse((node) => {
+            let wrapped = first ? '' : ',';
+            if (node.type === 'dependency') {
+                let resolved = this.bundleGraph.getResolvedAsset(node.value, this.bundle);
+                if (resolved && resolved.type !== 'js') {
+                    // if this is a reference to another javascript asset, we should not include
+                    // its output, as its contents should already be loaded.
+                    (0, assert_1.default)(!this.bundle.hasAsset(resolved));
+                    wrapped +=
+                        JSON.stringify(this.bundleGraph.getAssetPublicId(resolved)) +
+                            ':[function() {},{}]';
+                }
+                else {
+                    return;
+                }
+            }
+            if (node.type === 'asset') {
+                let asset = node.value;
+                (0, assert_1.default)(asset.type === 'js', 'all assets in a js bundle must be js assets');
+                // If this is the main entry of a script rather than a module, we need to hoist it
+                // outside the bundle wrapper function so that its variables are exposed as globals.
+                if (this.bundle.env.sourceType === 'script' &&
+                    asset === this.bundle.getMainEntry()) {
+                    // @ts-expect-error TS2322
+                    script = results[i++];
+                    return;
+                }
+                let deps = {};
+                let dependencies = this.bundleGraph.getDependencies(asset);
+                for (let dep of dependencies) {
+                    let resolved = this.bundleGraph.getResolvedAsset(dep, this.bundle);
+                    let specifier = (0, utils_2.getSpecifier)(dep);
+                    if (this.bundleGraph.isDependencySkipped(dep)) {
+                        deps[specifier] = false;
+                    }
+                    else if (resolved) {
+                        deps[specifier] = this.bundleGraph.getAssetPublicId(resolved);
+                    }
+                    else {
+                        // An external module - map placeholder to original specifier.
+                        deps[specifier] = dep.specifier;
+                    }
+                }
+                if ((0, feature_flags_1.getFeatureFlag)('hmrImprovements')) {
+                    // Add dependencies for parcelRequire calls added by runtimes
+                    // so that the HMR runtime can correctly traverse parents.
+                    let hmrDeps = asset.meta.hmrDeps;
+                    if (this.options.hmrOptions && Array.isArray(hmrDeps)) {
+                        for (let id of hmrDeps) {
+                            (0, assert_1.default)(typeof id === 'string');
+                            deps[id] = id;
+                        }
+                    }
+                }
+                // @ts-expect-error TS2339
+                let { code, mapBuffer } = results[i];
+                let output = code || '';
+                wrapped +=
+                    JSON.stringify(this.bundleGraph.getAssetPublicId(asset)) +
+                        ':[function(require,module,exports,__globalThis) {\n' +
+                        output +
+                        '\n},';
+                wrapped += JSON.stringify(deps);
+                wrapped += ']';
+                if (this.bundle.env.isNode() &&
+                    asset.meta.has_node_replacements === true) {
+                    const relPath = (0, utils_1.normalizeSeparators)(path_1.default.relative(this.bundle.target.distDir, path_1.default.dirname(asset.filePath)));
+                    wrapped = wrapped.replace('$parcel$dirnameReplace', relPath);
+                    wrapped = wrapped.replace('$parcel$filenameReplace', relPath);
+                }
+                if (this.bundle.env.sourceMap) {
+                    if (mapBuffer) {
+                        map.addBuffer(mapBuffer, lineOffset);
+                    }
+                    else {
+                        map.addEmptyMap(path_1.default
+                            .relative(this.options.projectRoot, asset.filePath)
+                            .replace(/\\+/g, '/'), output, lineOffset);
+                    }
+                    lineOffset += (0, utils_1.countLines)(output) + 1;
+                }
+                i++;
+            }
+            assets += wrapped;
+            first = false;
+        });
+        let entries = this.bundle.getEntryAssets();
+        let mainEntry = this.bundle.getMainEntry();
+        if ((!this.isEntry() && this.bundle.env.outputFormat === 'global') ||
+            this.bundle.env.sourceType === 'script') {
+            // In async bundles we don't want the main entry to execute until we require it
+            // as there might be dependencies in a sibling bundle that hasn't loaded yet.
+            entries = entries.filter((a) => a.id !== mainEntry?.id);
+            mainEntry = null;
+        }
+        let contents = prefix +
+            '({' +
+            assets +
+            '},' +
+            JSON.stringify(entries.map((asset) => this.bundleGraph.getAssetPublicId(asset))) +
+            ', ' +
+            JSON.stringify(mainEntry ? this.bundleGraph.getAssetPublicId(mainEntry) : null) +
+            ', ' +
+            JSON.stringify(this.parcelRequireName) +
+            ')' +
+            '\n';
+        // The entry asset of a script bundle gets hoisted outside the bundle wrapper function
+        // so that its variables become globals. We need to replace any require calls for
+        // runtimes with a parcelRequire call.
+        if (this.bundle.env.sourceType === 'script' && script) {
+            let entryMap;
+            // @ts-expect-error TS2339
+            let mapBuffer = script.mapBuffer;
+            if (mapBuffer) {
+                entryMap = new source_map_1.default(this.options.projectRoot, mapBuffer);
+            }
+            contents += (0, utils_2.replaceScriptDependencies)(this.bundleGraph, this.bundle, 
+            // @ts-expect-error TS2339
+            script.code, entryMap, this.parcelRequireName);
+            if (this.bundle.env.sourceMap && entryMap) {
+                // @ts-expect-error TS2551
+                map.addSourceMap(entryMap, lineOffset);
+            }
+        }
+        return {
+            contents,
+            map,
+        };
+    }
+    getPrefix() {
+        let interpreter;
+        let mainEntry = this.bundle.getMainEntry();
+        if (mainEntry && this.isEntry() && !this.bundle.target.env.isBrowser()) {
+            let _interpreter = mainEntry.meta.interpreter;
+            (0, assert_1.default)(_interpreter == null || typeof _interpreter === 'string');
+            interpreter = _interpreter;
+        }
+        let importScripts = '';
+        if (this.bundle.env.isWorker() || this.bundle.env.isTesseract()) {
+            let bundles = this.bundleGraph.getReferencedBundles(this.bundle);
+            for (let b of bundles) {
+                importScripts += `importScripts("${(0, utils_1.relativeBundlePath)(this.bundle, b)}");\n`;
+            }
+        }
+        return (
+        // If the entry asset included a hashbang, repeat it at the top of the bundle
+        (interpreter != null ? `#!${interpreter}\n` : '') +
+            importScripts +
+            PRELUDE);
+    }
+    isEntry() {
+        return (!this.bundleGraph.hasParentBundleOfType(this.bundle, 'js') ||
+            this.bundle.env.isIsolated() ||
+            this.bundle.bundleBehavior === 'isolated' ||
+            this.bundle.bundleBehavior === 'inlineIsolated');
+    }
+}
+exports.DevPackager = DevPackager;

package/dist/ESMOutputFormat.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ESMOutputFormat = void 0;
+const utils_1 = require("./utils");
+class ESMOutputFormat {
+    constructor(packager) {
+        this.packager = packager;
+    }
+    buildBundlePrelude() {
+        let res = '';
+        let lines = 0;
+        for (let [source, specifiers] of this.packager.externals) {
+            let defaultSpecifier = null;
+            let namespaceSpecifier = null;
+            let namedSpecifiers = [];
+            for (let [imported, symbol] of specifiers) {
+                if (imported === 'default' /* || isCommonJS*/) {
+                    defaultSpecifier = symbol;
+                }
+                else if (imported === '*') {
+                    namespaceSpecifier = `* as ${symbol}`;
+                }
+                else {
+                    let specifier = imported;
+                    if (!(0, utils_1.isValidIdentifier)(specifier)) {
+                        specifier = JSON.stringify(specifier);
+                    }
+                    if (symbol !== imported) {
+                        specifier += ` as ${symbol}`;
+                    }
+                    namedSpecifiers.push(specifier);
+                }
+            }
+            // ESModule syntax allows combining default and namespace specifiers, or default and named, but not all three.
+            let imported = '';
+            if (namespaceSpecifier) {
+                let s = namespaceSpecifier;
+                if (defaultSpecifier) {
+                    s = `${defaultSpecifier}, ${namespaceSpecifier}`;
+                }
+                res += `import ${s} from ${JSON.stringify(source)};\n`;
+                lines++;
+            }
+            else if (defaultSpecifier) {
+                imported = defaultSpecifier;
+                if (namedSpecifiers.length > 0) {
+                    imported += `, {${namedSpecifiers.join(', ')}}`;
+                }
+            }
+            else if (namedSpecifiers.length > 0) {
+                imported = `{${namedSpecifiers.join(', ')}}`;
+            }
+            if (imported.length > 0) {
+                res += `import ${imported} from ${JSON.stringify(source)};\n`;
+                lines++;
+            }
+            else if (!namespaceSpecifier) {
+                res += `import ${JSON.stringify(source)};\n`;
+                lines++;
+            }
+        }
+        if (res.length > 0) {
+            res += '\n';
+            lines++;
+        }
+        return [res, lines];
+    }
+    buildBundlePostlude() {
+        let res = '';
+        let lines = 0;
+        let exportSpecifiers = [];
+        for (let { asset, exportSymbol, local, exportAs, } of this.packager.exportedSymbols.values()) {
+            if (this.packager.wrappedAssets.has(asset)) {
+                let obj = `parcelRequire("${this.packager.bundleGraph.getAssetPublicId(asset)}")`;
+                res += `\nvar ${local} = ${this.packager.getPropertyAccess(obj, exportSymbol)};`;
+                lines++;
+            }
+            for (let as of exportAs) {
+                let specifier = local;
+                if (as !== local) {
+                    if (!(0, utils_1.isValidIdentifier)(as)) {
+                        as = JSON.stringify(as);
+                    }
+                    specifier += ` as ${as}`;
+                }
+                exportSpecifiers.push(specifier);
+            }
+        }
+        if (exportSpecifiers.length > 0) {
+            res += `\nexport {${exportSpecifiers.join(', ')}};`;
+            lines++;
+        }
+        if (this.packager.needsPrelude &&
+            this.packager.shouldBundleQueue(this.packager.bundle)) {
+            // Should be last thing the bundle executes on intial eval
+            res += `\n$parcel$global.rlb(${JSON.stringify(this.packager.bundle.publicId)})`;
+            lines++;
+        }
+        return [res, lines];
+    }
+}
+exports.ESMOutputFormat = ESMOutputFormat;

package/dist/GlobalOutputFormat.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GlobalOutputFormat = void 0;
+class GlobalOutputFormat {
+    constructor(packager) {
+        this.packager = packager;
+    }
+    buildBundlePrelude() {
+        let prelude = this.packager.bundle.env.supports('arrow-functions', true)
+            ? '(() => {\n'
+            : '(function () {\n';
+        return [prelude, 1];
+    }
+    buildBundlePostlude() {
+        return ['})();', 0];
+    }
+}
+exports.GlobalOutputFormat = GlobalOutputFormat;