@movable/rollup-plugin-manifest-merger 3.11.0 → 3.12.0

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

@@ -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)
-                    : js_yaml_1.default.dump(appManifest, { flowLevel: inline, indent: indent });
+                    : js_yaml_1.default.dump(appManifest, { flowLevel: inline, indent: indent, forceQuotes: true });
                 // eslint-disable-next-line no-param-reassign
                 this.emitFile({
                     type: 'asset',

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

@@ -73,6 +73,33 @@ mocha_1.describe('manifestMerger - app test', async () => {
         chai_1.expect(manifest).to.deep.equal(expectedAppManifest);
     });
 });
+mocha_1.describe('manifestMerger - placeholder strings', () => {
+    setup_fixture_1.default('test-app-custom-yaml');
+    mocha_1.it('should add quotes around string values', async () => {
+        const bundle = await rollup_1.rollup({
+            input: 'index.js',
+            plugins: [
+                index_1.manifestMerger({
+                    outputJSON: false,
+                    output: 'manifest.yml'
+                }),
+                plugin_node_resolve_1.default()
+            ]
+        });
+        const { output } = await bundle.generate({
+            format: 'es'
+        });
+        const file = output.find(({ fileName }) => fileName === 'manifest.yml');
+        // @ts-ignore
+        const yamlOutput = file.source;
+        chai_1.expect(yamlOutput).to.include("placeholder: '60218907,60218908,60218909'");
+        chai_1.expect(yamlOutput).to.include("placeholder: '12345678, 60218908, 60218909'");
+        chai_1.expect(yamlOutput).to.include('placeholder: 3.1415926535');
+        chai_1.expect(yamlOutput).to.include("placeholder: '60,218,907'");
+        chai_1.expect(yamlOutput).to.include('placeholder: 987654321');
+        chai_1.expect(yamlOutput).to.include('placeholder: true');
+    });
+});
 mocha_1.describe('manifest merger - integration ids', () => {
     mocha_1.describe('app with existing ids / dependencies with ids', () => {
         setup_fixture_1.default('test-app-with-app-and-package-integration-ids');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movable/rollup-plugin-manifest-merger",
-  "version": "3.11.0",
+  "version": "3.12.0",
   "description": "Merges package manifests into an App manifest",
   "main": "build/src/index.js",
   "keywords": [],
@@ -48,5 +48,5 @@
   "volta": {
     "extends": "../../package.json"
   },
-  "gitHead": "fcc8d059827d84c36d0504c2708a3cacb290ed4b"
+  "gitHead": "b5864fdff154ca098482bb45ec9b9a53c18499b2"
 }

package/src/plugins/manifest-merger.ts

@@ -144,7 +144,7 @@ export default function manifestMerger(opts: Options): Plugin {
 
         const source = outputJSON
           ? JSON.stringify(appManifest)
-          : YAML.dump(appManifest, { flowLevel: inline, indent: indent });
+          : YAML.dump(appManifest, { flowLevel: inline, indent: indent, forceQuotes: true });
 
         // eslint-disable-next-line no-param-reassign
         this.emitFile({

package/test/fixtures/test-app-custom-yaml/app-manifest.yml

@@ -0,0 +1,20 @@
+name: Test App
+fields:
+  - name: quotesCommasString
+    type: text
+    placeholder: '60218907,60218908,60218909'
+  - name: commasSpacesString
+    type: text
+    placeholder: 12345678, 60218908, 60218909
+  - name: decimalNumber
+    type: number
+    placeholder: 3.1415926535
+  - name: commaString
+    type: text
+    placeholder: 60,218,907
+  - name: justNumbers
+    type: number
+    placeholder: 987654321
+  - name: booleanValue
+    type: boolean
+    placeholder: true

package/test/fixtures/test-app-custom-yaml/index.js

@@ -0,0 +1,2 @@
+/* eslint-disable import/no-unresolved */
+import './app-manifest.yml';

package/test/fixtures/test-app-custom-yaml/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "test-app-custom-yaml",
+  "version": "1.0.0",
+  "dependencies": {
+    "@movable/studio-framework": "*"
+  }
+}

package/test/plugins/manifest-merger-test.ts

@@ -83,6 +83,38 @@ describe('manifestMerger - app test', async () => {
     expect(manifest).to.deep.equal(expectedAppManifest);
   });
 });
+
+describe('manifestMerger - placeholder strings', () => {
+  setupFixture('test-app-custom-yaml');
+
+  it('should add quotes around string values', async () => {
+    const bundle = await rollup({
+      input: 'index.js',
+      plugins: [
+        manifestMerger({
+          outputJSON: false,
+          output: 'manifest.yml'
+        }),
+        nodeResolve()
+      ]
+    });
+
+    const { output } = await bundle.generate({
+      format: 'es'
+    });
+
+    const file = output.find(({ fileName }) => fileName === 'manifest.yml');
+    // @ts-ignore
+    const yamlOutput = file.source as string;
+    expect(yamlOutput).to.include("placeholder: '60218907,60218908,60218909'");
+    expect(yamlOutput).to.include("placeholder: '12345678, 60218908, 60218909'");
+    expect(yamlOutput).to.include('placeholder: 3.1415926535');
+    expect(yamlOutput).to.include("placeholder: '60,218,907'");
+    expect(yamlOutput).to.include('placeholder: 987654321');
+    expect(yamlOutput).to.include('placeholder: true');
+  });
+});
+
 describe('manifest merger - integration ids', () => {
   describe('app with existing ids / dependencies with ids', () => {
     setupFixture('test-app-with-app-and-package-integration-ids');