@movable/rollup-plugin-manifest-merger 3.4.0-pin-rollup-plugin → 3.4.1

package/build/src/plugins/manifest-merger.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const pluginutils_1 = require("@rollup/pluginutils");
-const yamljs_1 = __importDefault(require("yamljs"));
 const resolve_1 = __importDefault(require("resolve"));
 const pkg_dir_1 = __importDefault(require("pkg-dir"));
 const fs_1 = require("fs");
+const js_yaml_1 = __importDefault(require("js-yaml"));
 const APP_FILTER = pluginutils_1.createFilter(/app-manifest\.yml$/);
 const PACKAGE_FILTER = pluginutils_1.createFilter(/\.yml$/);
 function manifestMerger(opts) {
@@ -28,7 +28,7 @@ function manifestMerger(opts) {
         buildStart() {
             if (opts.appManifest) {
                 this.addWatchFile(opts.appManifest);
-                appManifest = yamljs_1.default.parse(fs_1.readFileSync(opts.appManifest).toString('utf-8'));
+                appManifest = js_yaml_1.default.load(fs_1.readFileSync(opts.appManifest, 'utf-8'));
             }
         },
         buildEnd(error) {
@@ -55,11 +55,11 @@ function manifestMerger(opts) {
                 map: { mappings: '' }
             };
             if (APP_FILTER(id)) {
-                appManifest = yamljs_1.default.parse(yml);
+                appManifest = js_yaml_1.default.load(yml);
                 return noCode;
             }
             if (PACKAGE_FILTER(id)) {
-                const packageManifest = yamljs_1.default.parse(yml);
+                const packageManifest = js_yaml_1.default.load(yml);
                 const name = pathPackageMap.get(id);
                 if (name) {
                     packageManifest.name = name;
@@ -99,7 +99,7 @@ function manifestMerger(opts) {
                 const indent = 2; // The amount of spaces to use for indentation of nested nodes.
                 const source = outputJSON
                     ? JSON.stringify(appManifest)
-                    : yamljs_1.default.stringify(appManifest, inline, indent);
+                    : js_yaml_1.default.dump(appManifest, { flowLevel: inline, indent: indent });
                 // eslint-disable-next-line no-param-reassign
                 this.emitFile({
                     type: 'asset',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movable/rollup-plugin-manifest-merger",
-  "version": "3.4.0-pin-rollup-plugin",
+  "version": "3.4.1",
   "description": "Merges package manifests into an App manifest",
   "main": "build/src/index.js",
   "keywords": [],
@@ -36,16 +36,17 @@
   },
   "dependencies": {
     "@rollup/pluginutils": "^4.1.0",
+    "@types/js-yaml": "^4.0.9",
     "ast-types": "^0.14.2",
     "copyfiles": "^2.4.1",
+    "js-yaml": "^4.1.0",
     "pkg-dir": "^5.0.0",
     "recast": "^0.20.4",
     "resolve": "^1.20.0",
-    "uuid": "^8.3.2",
-    "yamljs": "^0.3.0"
+    "uuid": "^8.3.2"
   },
   "volta": {
     "extends": "../../package.json"
   },
-  "gitHead": "959079fa1b56fe499180aaa1e95ddd178e0928e0"
+  "gitHead": "aff3e903d9e302b90bbf80f583b108008a0717b4"
 }

package/src/plugins/manifest-merger.ts

@@ -1,10 +1,10 @@
 import { createFilter } from '@rollup/pluginutils';
 import { Plugin, SourceDescription } from 'rollup';
 import { PackageJSON } from '../types/packages';
-import YAML from 'yamljs';
 import resolve from 'resolve';
 import pkgDir from 'pkg-dir';
 import { readFileSync } from 'fs';
+import YAML from 'js-yaml';
 
 interface Options {
   output: string;
@@ -53,7 +53,7 @@ export default function manifestMerger(opts: Options): Plugin {
     buildStart() {
       if (opts.appManifest) {
         this.addWatchFile(opts.appManifest);
-        appManifest = YAML.parse(readFileSync(opts.appManifest).toString('utf-8'));
+        appManifest = YAML.load(readFileSync(opts.appManifest, 'utf-8')) as Manifest;
       }
     },
     buildEnd(error) {
@@ -87,12 +87,12 @@ export default function manifestMerger(opts: Options): Plugin {
       };
 
       if (APP_FILTER(id)) {
-        appManifest = YAML.parse(yml);
+        appManifest = YAML.load(yml) as Manifest;
         return noCode;
       }
 
       if (PACKAGE_FILTER(id)) {
-        const packageManifest: Manifest = YAML.parse(yml);
+        const packageManifest: Manifest = YAML.load(yml) as Manifest;
 
         const name = pathPackageMap.get(id);
 
@@ -144,7 +144,7 @@ export default function manifestMerger(opts: Options): Plugin {
 
         const source = outputJSON
           ? JSON.stringify(appManifest)
-          : YAML.stringify(appManifest, inline, indent);
+          : YAML.dump(appManifest, { flowLevel: inline, indent: indent });
 
         // eslint-disable-next-line no-param-reassign
         this.emitFile({