From c5bb8076e6c5df2cffdee3ef4bf818d2f8049d89 Mon Sep 17 00:00:00 2001
From: Zaytsev Kirill <Zaytzev.Kirill@yandex.ru>
Date: Sun, 11 Oct 2020 18:12:00 +0300
Subject: [PATCH] fix: Fixed build config

---
 build/rollup.config.js      | 21 +++++++++------------
 build/rollup.iife.config.js | 24 +++++++++++-------------
 package.json                |  2 +-
 src/FormularioForm.vue      |  8 ++++----
 src/libs/utils.ts           |  2 +-
 yarn.lock                   | 35 ++++++++++++++++++++++++++---------
 6 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/build/rollup.config.js b/build/rollup.config.js
index 5fd17aa..172ebc2 100644
--- a/build/rollup.config.js
+++ b/build/rollup.config.js
@@ -1,8 +1,8 @@
+import alias from '@rollup/plugin-alias'
 import autoExternal from 'rollup-plugin-auto-external'
-import buble from '@rollup/plugin-buble' // Transpile/polyfill with reasonable browser support
-import commonjs from '@rollup/plugin-commonjs' // Convert CommonJS modules to ES6
+import commonjs from '@rollup/plugin-commonjs'
 import { terser } from 'rollup-plugin-terser'
-import typescript from '@rollup/plugin-typescript'
+import typescript from 'rollup-plugin-typescript2'
 import vue from 'rollup-plugin-vue'
 
 // noinspection JSUnusedGlobalSymbols
@@ -15,21 +15,18 @@ export default {
             'is-plain-object': 'isPlainObject',
             'is-url': 'isUrl',
             'nanoid/non-secure': 'nanoid',
+            vue: 'Vue',
+            'vue-property-decorator': 'vuePropertyDecorator',
         },
         sourcemap: false,
     }],
-    external: ['nanoid/non-secure'],
+    external: ['nanoid/non-secure', 'vue', 'vue-property-decorator'],
     plugins: [
+        typescript({ check: false, sourceMap: false }),
+        vue({ css: true, compileTemplate: true }),
+        alias({ entries: [{ find: /^@\/(.+)/, replacement: './$1' }] }),
         commonjs(),
         autoExternal(),
-        typescript({ sourceMap: false }),
-        vue({
-            css: true, // Dynamically inject css as a <style> tag
-            compileTemplate: true // Explicitly convert template to render function
-        }),
-        buble({
-            objectAssign: 'Object.assign',
-        }), // Transpile to ES5,
         terser(),
     ]
 }
diff --git a/build/rollup.iife.config.js b/build/rollup.iife.config.js
index 14bee32..a0f2499 100644
--- a/build/rollup.iife.config.js
+++ b/build/rollup.iife.config.js
@@ -1,14 +1,14 @@
-import commonjs from '@rollup/plugin-commonjs' // Convert CommonJS modules to ES6
-import buble from '@rollup/plugin-buble' // Transpile/polyfill with reasonable browser support
+import alias from '@rollup/plugin-alias'
+import commonjs from '@rollup/plugin-commonjs'
 import internal from 'rollup-plugin-internal'
 import resolve from '@rollup/plugin-node-resolve'
 import { terser } from 'rollup-plugin-terser'
-import typescript from '@rollup/plugin-typescript'
-import vue from 'rollup-plugin-vue' // Handle .vue SFC files
+import typescript from 'rollup-plugin-typescript2'
+import vue from 'rollup-plugin-vue'
 
 // noinspection JSUnusedGlobalSymbols
 export default {
-    input: 'src/index.ts', // Path relative to package.json
+    input: 'src/index.ts',
     output: {
         name: 'VueFormulario',
         exports: 'default',
@@ -17,23 +17,21 @@ export default {
             'is-plain-object': 'isPlainObject',
             'is-url': 'isUrl',
             'nanoid/non-secure': 'nanoid',
+            vue: 'Vue',
+            'vue-property-decorator': 'vuePropertyDecorator',
         },
     },
+    external: ['vue', 'vue-property-decorator'],
     plugins: [
         resolve({
             browser: true,
             preferBuiltins: false,
         }),
+        typescript({ check: false, sourceMap: false }),
+        vue({ css: true, compileTemplate: true }),
+        alias({ entries: [{ find: /^@\/(.+)/, replacement: './$1' }] }),
         commonjs(),
         internal(['is-plain-object', 'nanoid/non-secure', 'is-url']),
-        typescript({ sourceMap: false }),
-        vue({
-            css: true, // Dynamically inject css as a <style> tag
-            compileTemplate: true // Explicitly convert template to render function
-        }),
-        buble({
-            objectAssign: 'Object.assign',
-        }), // Transpile to ES5,
         terser(),
     ]
 }
diff --git a/package.json b/package.json
index 23329b2..7853011 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,6 @@
         "@rollup/plugin-buble": "^0.21.3",
         "@rollup/plugin-commonjs": "^11.1.0",
         "@rollup/plugin-node-resolve": "^7.1.3",
-        "@rollup/plugin-typescript": "^6.0.0",
         "@types/is-url": "^1.2.28",
         "@types/jest": "^26.0.14",
         "@types/nanoid": "^2.1.0",
@@ -68,6 +67,7 @@
         "rollup-plugin-internal": "^1.0.4",
         "rollup-plugin-multi-input": "^1.1.1",
         "rollup-plugin-terser": "^5.3.0",
+        "rollup-plugin-typescript2": "^0.27.3",
         "rollup-plugin-vue": "^5.1.7",
         "ts-jest": "^26.4.1",
         "typescript": "~3.9.3",
diff --git a/src/FormularioForm.vue b/src/FormularioForm.vue
index fe46216..d21defd 100644
--- a/src/FormularioForm.vue
+++ b/src/FormularioForm.vue
@@ -16,11 +16,11 @@ import {
     Provide,
     Watch,
 } from 'vue-property-decorator'
-import { arrayify, getNested, has, setNested, shallowEqualObjects } from './libs/utils'
+import { arrayify, getNested, has, setNested, shallowEqualObjects } from '@/libs/utils'
 import { ObjectType } from '@/common.types'
-import Registry from './libs/registry'
-import FormSubmission from './FormSubmission'
-import FormularioInput from '@/FormularioInput.vue'
+import Registry from '@/libs/registry'
+import FormSubmission from '@/FormSubmission'
+import FormularioInput from '@/FormularioInput'
 
 @Component
 export default class FormularioForm extends Vue {
diff --git a/src/libs/utils.ts b/src/libs/utils.ts
index b4d0962..fe23e01 100644
--- a/src/libs/utils.ts
+++ b/src/libs/utils.ts
@@ -1,4 +1,4 @@
-import FileUpload from '../FileUpload'
+import FileUpload from '@/FileUpload'
 
 type ArrayType = [any]
 type ObjectType = { [key: string]: any }
diff --git a/yarn.lock b/yarn.lock
index 54d58dc..e0d8664 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1268,14 +1268,6 @@
     is-module "^1.0.0"
     resolve "^1.14.2"
 
-"@rollup/plugin-typescript@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-6.0.0.tgz#08635d9d04dc3a099ef0150c289ba5735200bc63"
-  integrity sha512-Y5U2L4eaF3wUSgCZRMdvNmuzWkKMyN3OwvhAdbzAi5sUqedaBk/XbzO4T7RlViDJ78MOPhwAIv2FtId/jhMtbg==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    resolve "^1.17.0"
-
 "@rollup/pluginutils@^3.0.8":
   version "3.0.10"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.0.10.tgz#a659b9025920378494cd8f8c59fbf9b3a50d5f12"
@@ -5592,6 +5584,15 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
+fs-extra@8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-extra@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
@@ -9828,7 +9829,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.8.1:
+resolve@1.17.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.8.1:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@@ -9951,6 +9952,17 @@ rollup-plugin-terser@^5.3.0:
     serialize-javascript "^2.1.2"
     terser "^4.6.2"
 
+rollup-plugin-typescript2@^0.27.3:
+  version "0.27.3"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.27.3.tgz#cd9455ac026d325b20c5728d2cc54a08a771b68b"
+  integrity sha512-gmYPIFmALj9D3Ga1ZbTZAKTXq1JKlTQBtj299DXhqYz9cL3g/AQfUvbb2UhH+Nf++cCq941W2Mv7UcrcgLzJJg==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    find-cache-dir "^3.3.1"
+    fs-extra "8.1.0"
+    resolve "1.17.0"
+    tslib "2.0.1"
+
 rollup-plugin-vue@^5.1.7:
   version "5.1.7"
   resolved "https://registry.yarnpkg.com/rollup-plugin-vue/-/rollup-plugin-vue-5.1.7.tgz#1093c105de1edffa20030cc87abc805b0af88285"
@@ -11095,6 +11107,11 @@ tsconfig@^7.0.0:
     strip-bom "^3.0.0"
     strip-json-comments "^2.0.0"
 
+tslib@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
+  integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
+
 tslib@^1.10.0, tslib@^1.9.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"