fixed moment dependency issue

changelog.md

@@ -24,6 +24,7 @@
 * **Premium**: You can now comment and discuss rows with others in your group, click the
   expand row button at the start of the row to view and add comments.
 * Added "Last Modified" and "Created On" field types.
+* Fixed moment issue if core is installed as a dependency.
 * New templates:
   * Blog Post Management
 * Updated templates:

premium/web-frontend/modules/baserow_premium/components/crud_table/fields/LocalDateField.vue

@@ -5,7 +5,8 @@
 </template>
 
 <script>
-import moment from 'moment'
+import moment from '@baserow/modules/core/moment'
+
 export default {
   name: 'LocalDateField',
   functional: true,

premium/web-frontend/modules/baserow_premium/components/row_comments/RowComment.vue

@@ -21,9 +21,10 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { mapGetters } from 'vuex'
 
+import moment from '@baserow/modules/core/moment'
+
 export default {
   name: 'RowComment',
   props: {

premium/web-frontend/modules/baserow_premium/store/row_comments.js

@@ -1,6 +1,8 @@
-import RowCommentService from '@baserow_premium/services/row_comments/row_comments'
 import _ from 'lodash'
-import moment from 'moment'
+
+import moment from '@baserow/modules/core/moment'
+
+import RowCommentService from '@baserow_premium/services/row_comments/row_comments'
 
 export const state = () => ({
   comments: [],

premium/web-frontend/test/unit/premium/admin/users/userAdmin.spec.js

@@ -1,6 +1,6 @@
 import { TestApp } from '@baserow/test/helpers/testApp'
 import UsersAdminTable from '@baserow_premium/components/admin/users/UsersAdminTable'
-import moment from 'moment'
+import moment from '@baserow/modules/core/moment'
 import flushPromises from 'flush-promises'
 import UserAdminUserHelpers from '../../../../fixtures/uiHelpers'
 import MockPremiumServer from '@baserow_premium/../../test/fixtures/mockPremiumServer'

web-frontend/modules/core/components/TimeSelectContext.vue

@@ -11,8 +11,7 @@
 </template>
 
 <script>
-import moment from 'moment'
-
+import moment from '@baserow/modules/core/moment'
 import context from '@baserow/modules/core/mixins/context'
 
 export default {

web-frontend/modules/core/components/group/GroupMembersModal.vue

@@ -49,8 +49,8 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import moment from 'moment'
 
+import moment from '@baserow/modules/core/moment'
 import modal from '@baserow/modules/core/mixins/modal'
 import error from '@baserow/modules/core/mixins/error'
 import { notifyIf } from '@baserow/modules/core/utils/error'

web-frontend/modules/core/components/trash/TrashContents.vue

@@ -68,7 +68,7 @@
  * contents.
  */
 
-import moment from 'moment'
+import moment from '@baserow/modules/core/moment'
 import TrashEntry from '@baserow/modules/core/components/trash/TrashEntry'
 import InfiniteScroll from '@baserow/modules/core/components/helpers/InfiniteScroll'
 import TrashEmptyModal from '@baserow/modules/core/components/trash/TrashEmptyModal'

web-frontend/modules/core/components/trash/TrashEntry.vue

@@ -41,7 +41,7 @@
  * trashed entry. Shows extra information about the entry like it's name, who trashed it
  * , how long ago it was trashed etc.
  */
-import moment from 'moment'
+import moment from '@baserow/modules/core/moment'
 
 export default {
   name: 'TrashEntry',

web-frontend/modules/core/moment.js

@@ -0,0 +1,5 @@
+// Moment should always be imported from here. This will enforce that the timezone
+// is always included. There were some problems when Baserow is installed as a
+// dependency and then moment-timezone does not work. Still will resolve that issue.
+export { default } from 'moment'
+export { tz } from 'moment-timezone'

web-frontend/modules/core/plugins/global.js

@@ -1,10 +1,5 @@
 import Vue from 'vue'
 
-// Make sure that moment timezone is imported because it extends moment to enable
-// moment().tz(...) which we need in a couple of places.
-// eslint-disable-next-line
-import { tz } from 'moment-timezone'
-
 import Context from '@baserow/modules/core/components/Context'
 import Modal from '@baserow/modules/core/components/Modal'
 import Editable from '@baserow/modules/core/components/Editable'

web-frontend/modules/database/components/row/RowEditFieldFile.vue

@@ -80,8 +80,7 @@
 </template>
 
 <script>
-import moment from 'moment'
-
+import moment from '@baserow/modules/core/moment'
 import { UploadFileUserFileUploadType } from '@baserow/modules/core/userFileUploadTypes'
 import UserFilesModal from '@baserow/modules/core/components/files/UserFilesModal'
 import FileFieldModal from '@baserow/modules/database/components/field/FileFieldModal'

web-frontend/modules/database/components/view/ViewFilterTypeDate.vue

@@ -35,8 +35,7 @@
 </template>
 
 <script>
-import moment from 'moment'
-
+import moment from '@baserow/modules/core/moment'
 import {
   getDateMomentFormat,
   getDateHumanReadableFormat,

web-frontend/modules/database/fieldTypes.js

@@ -1,6 +1,6 @@
-import moment from 'moment'
 import BigNumber from 'bignumber.js'
 
+import moment from '@baserow/modules/core/moment'
 import {
   isValidURL,
   isValidEmail,

web-frontend/modules/database/mixins/dateField.js

@@ -1,5 +1,4 @@
-import moment from 'moment'
-
+import moment from '@baserow/modules/core/moment'
 import {
   getDateMomentFormat,
   getTimeMomentFormat,

web-frontend/modules/database/mixins/readOnlyDateField.js

@@ -1,4 +1,4 @@
-import moment from 'moment'
+import moment from '@baserow/modules/core/moment'
 import {
   getDateMomentFormat,
   getTimeMomentFormat,

web-frontend/modules/database/viewFilters.js

@@ -1,5 +1,4 @@
-import moment from 'moment'
-
+import moment from '@baserow/modules/core/moment'
 import { Registerable } from '@baserow/modules/core/registry'
 import ViewFilterTypeText from '@baserow/modules/database/components/view/ViewFilterTypeText'
 import ViewFilterTypeNumber from '@baserow/modules/database/components/view/ViewFilterTypeNumber'

web-frontend/test/unit/database/viewFiltersMatch.spec.js

@@ -1,5 +1,5 @@
 import { TestApp } from '@baserow/test/helpers/testApp'
-import moment from 'moment'
+import moment from '@baserow/modules/core/moment'
 import {
   DateBeforeViewFilterType,
   DateAfterViewFilterType,