rollup-plugin-zephyr 0.0.25 → 0.0.27

package/dist/lib/rollup-plugin-zephyr.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withZephyr = void 0;
-const tslib_1 = require("tslib");
-const isCI = require("is-ci");
 const zephyr_agent_1 = require("zephyr-agent");
-const zephyr_edge_contract_1 = require("zephyr-edge-contract");
-const get_assets_map_1 = require("./utils/get-assets-map");
-const get_dash_data_1 = require("./utils/get-dash-data");
+const get_assets_map_1 = require("./transform/get-assets-map");
+const node_process_1 = require("node:process");
 const getInputFolder = (options) => {
     if (typeof options.input === 'string')
         return options.input;
@@ -14,105 +11,25 @@ const getInputFolder = (options) => {
         return options.input[0];
     if (typeof options.input === 'object')
         return Object.values(options.input)[0];
-    return process.cwd();
+    return (0, node_process_1.cwd)();
 };
 function withZephyr() {
-    let _state;
+    const { zephyr_engine_defer, zephyr_defer_create } = zephyr_agent_1.ZephyrEngine.defer_create();
     return {
         name: 'with-zephyr',
-        buildStart: (options) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            _state = (function zephyr_init() {
-                return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    (0, zephyr_edge_contract_1.ze_log)('Setting up zephyr agent configuration.');
-                    const _zephyrOptions = { wait_for_index_html: false };
-                    const path_to_execution_dir = getInputFolder(options);
-                    const [packageJson, gitInfo] = yield Promise.all([(0, zephyr_agent_1.getPackageJson)(path_to_execution_dir), (0, zephyr_agent_1.getGitInfo)()]);
-                    const application_uid = (0, zephyr_edge_contract_1.createApplicationUID)({
-                        org: gitInfo.app.org,
-                        project: gitInfo.app.project,
-                        name: packageJson.name,
-                    });
-                    yield (0, zephyr_agent_1.checkAuth)();
-                    const [appConfig, buildId, hash_set] = yield Promise.all([
-                        (0, zephyr_agent_1.getApplicationConfiguration)({ application_uid }),
-                        (0, zephyr_agent_1.getBuildId)(application_uid),
-                        (0, zephyr_agent_1.get_hash_list)(application_uid),
-                    ]);
-                    const { username, email, EDGE_URL } = appConfig;
-                    (0, zephyr_edge_contract_1.ze_log)('Got application configuration: ', {
-                        username,
-                        email,
-                        EDGE_URL,
-                    });
-                    if (!buildId)
-                        return (0, zephyr_edge_contract_1.ze_error)('ERR_GET_BUILD_ID');
-                    (0, zephyr_edge_contract_1.ze_log)(`Got build id: ${buildId}`);
-                    const pluginOptions = {
-                        pluginName: 'rollup-plugin-zephyr',
-                        application_uid,
-                        buildEnv: 'local',
-                        username,
-                        app: {
-                            name: packageJson.name,
-                            version: packageJson.version,
-                            org: gitInfo.app.org,
-                            project: gitInfo.app.project,
-                        },
-                        git: gitInfo.git,
-                        isCI: isCI,
-                        zeConfig: {
-                            user: username,
-                            edge_url: EDGE_URL,
-                            buildId: buildId,
-                        },
-                        mfConfig: void 0,
-                        wait_for_index_html: _zephyrOptions === null || _zephyrOptions === void 0 ? void 0 : _zephyrOptions.wait_for_index_html,
-                    };
-                    const logEvent = (0, zephyr_agent_1.logger)(pluginOptions);
-                    logEvent({
-                        level: 'info',
-                        action: 'build:info:user',
-                        ignore: true,
-                        message: `Hi ${(0, zephyr_edge_contract_1.cyanBright)(username)}!\n${(0, zephyr_edge_contract_1.white)(application_uid)}${(0, zephyr_edge_contract_1.yellow)(`#${buildId}`)}\n`,
-                    });
-                    return {
-                        appConfig,
-                        buildId,
-                        hash_set,
-                        pluginOptions,
-                    };
-                });
-            })();
-        }),
-        writeBundle: (options, bundle) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const zeStart = Date.now();
-            yield (function zephyr_upload(props) {
-                return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    (0, zephyr_edge_contract_1.ze_log)('zephyr agent started...');
-                    const { state, bundle } = props;
-                    const _state = yield state;
-                    if (!_state)
-                        return (0, zephyr_edge_contract_1.ze_error)('ERR_INITIALIZE_ZEPHYR_AGENT');
-                    const { appConfig, hash_set, pluginOptions } = _state;
-                    const assetsMap = (0, get_assets_map_1.getAssetsMap)(bundle);
-                    const missingAssets = (0, zephyr_agent_1.get_missing_assets)({ assetsMap, hash_set });
-                    yield (0, zephyr_agent_1.upload)({
-                        pluginOptions,
-                        assets: {
-                            assetsMap,
-                            missingAssets,
-                            outputPath: options.dir,
-                            count: Object.keys(bundle).length,
-                        },
-                        // @ts-expect-error TODO: fix this types to get legacy and current working
-                        getDashData: get_dash_data_1.getDashData,
-                        appConfig,
-                        zeStart,
-                    });
-                });
-            })({ state: _state, bundle });
-            console.log('zephyr agent done in', Date.now() - zeStart, 'ms');
-        }),
+        buildStart: async (options) => {
+            const path_to_execution_dir = getInputFolder(options);
+            zephyr_defer_create(path_to_execution_dir);
+        },
+        writeBundle: async (options, bundle) => {
+            const zephyr_engine = await zephyr_engine_defer;
+            await zephyr_engine.start_new_build();
+            await zephyr_engine.upload_assets({
+                assetsMap: (0, get_assets_map_1.getAssetsMap)(bundle),
+                buildStats: await (0, zephyr_agent_1.zeBuildDashData)(zephyr_engine),
+            });
+            await zephyr_engine.build_finished();
+        },
     };
 }
 exports.withZephyr = withZephyr;

package/dist/lib/rollup-plugin-zephyr.js.map

@@ -1 +1 @@
-{"version":3,"file":"rollup-plugin-zephyr.js","sourceRoot":"","sources":["../../src/lib/rollup-plugin-zephyr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rollup-plugin-zephyr.js","sourceRoot":"","sources":["../../src/lib/rollup-plugin-zephyr.ts"],"names":[],"mappings":";;;AACA,+CAA6D;AAC7D,+DAA0D;AAC1D,+CAAmC;AAEnC,MAAM,cAAc,GAAG,CAAC,OAAqB,EAAU,EAAE;IACvD,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ;QAAE,OAAO,OAAO,CAAC,KAAK,CAAC;IAC5D,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC1D,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9E,OAAO,IAAA,kBAAG,GAAE,CAAC;AACf,CAAC,CAAC;AAEF,SAAgB,UAAU;IACxB,MAAM,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,GAAG,2BAAY,CAAC,YAAY,EAAE,CAAC;IAEjF,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,UAAU,EAAE,KAAK,EAAE,OAAqB,EAAE,EAAE;YAC1C,MAAM,qBAAqB,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;YACtD,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;QAC7C,CAAC;QACD,WAAW,EAAE,KAAK,EAAE,OAAgC,EAAE,MAAoB,EAAE,EAAE;YAC5E,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC;YAChD,MAAM,aAAa,CAAC,eAAe,EAAE,CAAC;YACtC,MAAM,aAAa,CAAC,aAAa,CAAC;gBAChC,SAAS,EAAE,IAAA,6BAAY,EAAC,MAAM,CAAC;gBAC/B,UAAU,EAAE,MAAM,IAAA,8BAAe,EAAC,aAAa,CAAC;aACjD,CAAC,CAAC;YACH,MAAM,aAAa,CAAC,cAAc,EAAE,CAAC;QACvC,CAAC;KACF,CAAC;AACJ,CAAC;AAnBD,gCAmBC"}

package/dist/lib/{utils → transform}/get-assets-map.d.ts

@@ -1,3 +1,3 @@
 import { OutputBundle } from 'rollup';
-import { ZeBuildAssetsMap } from 'zephyr-edge-contract';
+import { ZeBuildAssetsMap } from 'zephyr-agent';
 export declare function getAssetsMap(assets: OutputBundle): ZeBuildAssetsMap;

package/dist/lib/transform/get-assets-map.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-assets-map.js","sourceRoot":"","sources":["../../../src/lib/transform/get-assets-map.ts"],"names":[],"mappings":";;;AACA,+CAAgE;AAEhE,SAAgB,YAAY,CAAC,MAAoB;IAC/C,OAAO,IAAA,6BAAc,EAAC,MAAM,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;AAC7D,CAAC;AAFD,oCAEC;AAED,MAAM,aAAa,GAAG,CAAC,KAAgC,EAAsB,EAAE;IAC7E,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,OAAO;YACV,OAAO,KAAK,CAAC,IAAI,CAAC;QACpB,KAAK,OAAO;YACV,OAAO,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ;gBACrC,CAAC,CAAC,KAAK,CAAC,MAAM;gBACd,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7C;YACE,OAAO,KAAK,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,KAAgC,EAAU,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC"}

package/dist/package.json

@@ -1,16 +1,18 @@
 {
   "name": "rollup-plugin-zephyr",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "license": "Apache-2.0",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "scripts": {
+    "build": "nx run rollup-plugin-zephyr:build"
+  },
   "dependencies": {
     "is-ci": "^3.0.1",
     "rollup": "^4",
     "tslib": "^2",
-    "zephyr-agent": "workspace:*",
-    "zephyr-edge-contract": "workspace:*"
+    "zephyr-agent": "workspace:*"
   },
   "keywords": [
     "rollup",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup-plugin-zephyr",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "license": "Apache-2.0",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -9,8 +9,7 @@
     "is-ci": "^3.0.1",
     "rollup": "^4",
     "tslib": "^2",
-    "zephyr-agent": "0.0.25",
-    "zephyr-edge-contract": "0.0.25"
+    "zephyr-agent": "0.0.27"
   },
   "keywords": [
     "rollup",
@@ -20,5 +19,8 @@
   ],
   "devDependencies": {
     "@types/is-ci": "^3.0.4"
+  },
+  "scripts": {
+    "build": "nx run rollup-plugin-zephyr:build"
   }
 }

package/dist/lib/utils/get-assets-map.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-assets-map.js","sourceRoot":"","sources":["../../../src/lib/utils/get-assets-map.ts"],"names":[],"mappings":";;;AACA,+CAA8C;AAG9C,SAAgB,YAAY,CAAC,MAAoB;IAC/C,OAAO,IAAA,6BAAc,EAAC,MAAM,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;AAC7D,CAAC;AAFD,oCAEC;AAED,MAAM,aAAa,GAAG,CACpB,KAAgC,EACZ,EAAE;IACtB,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,OAAO;YACV,OAAO,KAAK,CAAC,IAAI,CAAC;QACpB,KAAK,OAAO;YACV,OAAO,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ;gBACrC,CAAC,CAAC,KAAK,CAAC,MAAM;gBACd,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7C;YACE,OAAO,KAAK,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,KAAgC,EAAU,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC"}

package/dist/lib/utils/get-dash-data.d.ts

@@ -1,39 +0,0 @@
-import { ZeApplicationConfig, ZephyrPluginOptions } from 'zephyr-edge-contract';
-interface GetDashDataOptions {
-    appConfig: ZeApplicationConfig;
-    pluginOptions: ZephyrPluginOptions;
-}
-export declare function getDashData({ pluginOptions, appConfig }: GetDashDataOptions): {
-    id: string;
-    name: string;
-    environment: string;
-    edge: {
-        url: string;
-    };
-    app: {
-        org: string;
-        project: string;
-        name: string;
-        version: string;
-    } & {
-        buildId: string;
-    };
-    version: string;
-    git: {
-        name: string;
-        email: string;
-        branch: string;
-        commit: string;
-    };
-    context: {
-        isCI: boolean;
-    };
-    dependencies: never[];
-    devDependencies: never[];
-    optionalDependencies: never[];
-    metadata: {};
-    overrides: never[];
-    consumes: never[];
-    modules: never[];
-};
-export {};

package/dist/lib/utils/get-dash-data.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDashData = void 0;
-const zephyr_agent_1 = require("zephyr-agent");
-function getDashData({ pluginOptions, appConfig }) {
-    return (0, zephyr_agent_1.zeGetDashData)({ pluginOptions, appConfig });
-}
-exports.getDashData = getDashData;
-//# sourceMappingURL=get-dash-data.js.map

package/dist/lib/utils/get-dash-data.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-dash-data.js","sourceRoot":"","sources":["../../../src/lib/utils/get-dash-data.ts"],"names":[],"mappings":";;;AACA,+CAA6C;AAO7C,SAAgB,WAAW,CAAC,EAAE,aAAa,EAAE,SAAS,EAAsB;IAC1E,OAAO,IAAA,4BAAa,EAAC,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC;AACrD,CAAC;AAFD,kCAEC"}