Skip to content

Commit

Permalink
Merge branch 'feature/js-deps'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jasonvarga
jasonvarga committed Dec 9, 2019
2 parents 0d92179 + 07c619c commit ff70da6
Show file tree
Hide file tree
Showing 26 changed files with 9,447 additions and 13,296 deletions.
2 changes: 1 addition & 1 deletion .babelrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"env": {
"test": {
"presets": [
["env", {
["@babel/preset-env", {
"targets": {
"node": "current"
}
Expand Down
21,156 changes: 9,121 additions & 12,035 deletions package-lock.json
View file

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,66 +14,66 @@
},
"dependencies": {
"@shopify/draggable": "^1.0.0-beta.8",
"@simonwep/pickr": "^1.2.0",
"@simonwep/pickr": "^1.4.7",
"autosize": "~3.0.12",
"axios": "^0.19.0",
"body-scroll-lock": "^2.6.1",
"codemirror": "^5.35.0",
"body-scroll-lock": "^2.6.4",
"codemirror": "^5.49.2",
"cookies-js": "^1.2.2",
"dmuploader": "file:resources/js/vendor/dmuploader",
"dropzone": "^4.0.1",
"element-resize-detector": "^1.1.14",
"eqcss": "^1.9.1",
"fuse.js": "^3.2.1",
"generate-password": "^1.4.1",
"highlight.js": "^9.15.8",
"element-resize-detector": "^1.1.15",
"eqcss": "^1.9.2",
"fuse.js": "^3.4.6",
"generate-password": "^1.4.2",
"highlight.js": "^9.16.2",
"jquery": "^3.4.1",
"jquery-ui": "file:resources/js/vendor/jquery-ui",
"laravel-echo": "^1.5.3",
"lazysizes": "^4.1.7",
"laravel-echo": "^1.6.1",
"lazysizes": "^4.1.8",
"luminous-lightbox": "^0.2.0",
"marked": "^0.6.2",
"marked": "^0.7.0",
"marked-plaintext": "0.0.2",
"moment": "^2.24.0",
"mousetrap": "~1.5.3",
"nprogress": "^0.2.0",
"portal-vue": "^1.3.0",
"portal-vue": "^1.5.1",
"pretty": "^2.0.0",
"pusher-js": "^4.4.0",
"qs": "^6.6.0",
"qs": "^6.9.1",
"rangy": "^1.3.0",
"read-time-estimate": "0.0.2",
"resize-observer-polyfill": "^1.5.1",
"selectize": "^0.12.5",
"speakingurl": "^14.0.1",
"striptags": "^3.1.1",
"sweetalert": "~1.0.1",
"tiptap": "^1.26.4",
"tiptap-extensions": "^1.28.4",
"tiptap": "^1.26.5",
"tiptap-extensions": "^1.28.5",
"underscore": "^1.8.3",
"uniqid": "^5.0.3",
"v-calendar": "^1.0.0-beta.21",
"v-tooltip": "^2.0.0-rc.33",
"uniqid": "^5.2.0",
"v-calendar": "^1.0.0-beta.23",
"v-tooltip": "^2.0.2",
"validator": "^10.11.0",
"vue": "^2.6.10",
"vue-clickaway": "~2.2.2",
"vue-draggable-nested-tree": "^2.2.17",
"vue-draggable-nested-tree": "^2.2.18",
"vue-js-modal": "^1.3.31",
"vue-js-popover": "^1.1.7",
"vue-popperjs": "^1.5.3",
"vue-js-popover": "^1.1.8",
"vue-popperjs": "^1.6.3",
"vue-reactive-provide": "^0.3.0",
"vue-select": "^3.2.0",
"vue-toasted": "^1.1.26",
"vuex": "^3.0.1"
"vue-select": "^3.4.0",
"vue-toasted": "^1.1.27",
"vuex": "^3.1.2"
},
"devDependencies": {
"babel-jest": "^24.1.0",
"cross-env": "^5.1",
"jest": "^24.1.0",
"laravel-mix": "^2.0",
"node-sass": "^4.12.0",
"tailwindcss": "^0.6",
"tar": ">=2.2.2",
"babel-jest": "^24.9.0",
"cross-env": "^5.2.1",
"jest": "^24.9.0",
"laravel-mix": "^5.0.0",
"sass": "^1.23.7",
"sass-loader": "^8.0.0",
"tailwindcss": "^0.6.6",
"tar": "^5.0.5",
"vue-template-compiler": "^2.6.10"
},
"jest": {
Expand Down
70 changes: 35 additions & 35 deletions resources/js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,43 +103,43 @@ Statamic.app({
store: Statamic.$store,

components: {
GlobalSearch: require('./components/GlobalSearch.vue'),
SiteSelector: require('./components/SiteSelector.vue'),
PageTree: require('./components/structures/PageTree.vue'),
GlobalSearch: require('./components/GlobalSearch.vue').default,
SiteSelector: require('./components/SiteSelector.vue').default,
PageTree: require('./components/structures/PageTree.vue').default,
Login: require('./components/login/login'),
LoginModal: require('./components/login/LoginModal.vue'),
BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue'),
BaseTermCreateForm: require('./components/terms/BaseCreateForm.vue'),
CreateEntryButton: require('./components/entries/CreateEntryButton.vue'),
CreateTermButton: require('./components/terms/CreateTermButton.vue'),
LoginModal: require('./components/login/LoginModal.vue').default,
BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
BaseTermCreateForm: require('./components/terms/BaseCreateForm.vue').default,
CreateEntryButton: require('./components/entries/CreateEntryButton.vue').default,
CreateTermButton: require('./components/terms/CreateTermButton.vue').default,
Importer: require('./components/importer/importer'),
FieldsetListing: require('./components/fieldsets/Listing.vue'),
FieldsetEditForm: require('./components/fieldsets/EditForm.vue'),
BlueprintListing: require('./components/blueprints/Listing.vue'),
BlueprintBuilder: require('./components/blueprints/Builder.vue'),
FormListing: require('./components/forms/Listing.vue'),
FormSubmissionListing: require('./components/forms/SubmissionListing.vue'),
GlobalListing: require('./components/globals/Listing.vue'),
GlobalPublishForm: require('./components/globals/PublishForm.vue'),
GlobalCreateForm: require('./components/globals/Create.vue'),
UserListing: require('./components/users/Listing.vue'),
UserWizard: require('./components/users/Wizard.vue'),
RoleListing: require('./components/roles/Listing.vue'),
RolePublishForm: require('./components/roles/PublishForm.vue'),
UserGroupListing: require('./components/user-groups/Listing.vue'),
UserGroupPublishForm: require('./components/user-groups/PublishForm.vue'),
CollectionWizard: require('./components/collections/Wizard.vue'),
CollectionEditForm: require('./components/collections/EditForm.vue'),
SessionExpiry: require('./components/SessionExpiry.vue'),
StructureWizard: require('./components/structures/Wizard.vue'),
StructureListing: require('./components/structures/Listing.vue'),
StructureEditForm: require('./components/structures/EditForm.vue'),
Stacks: require('./components/stacks/Stacks.vue'),
TaxonomyWizard: require('./components/taxonomies/Wizard.vue'),
TaxonomyEditForm: require('./components/taxonomies/EditForm.vue'),
AssetContainerCreateForm: require('./components/asset-containers/CreateForm.vue'),
AssetContainerEditForm: require('./components/asset-containers/EditForm.vue'),
FormWizard: require('./components/forms/Wizard.vue'),
FieldsetListing: require('./components/fieldsets/Listing.vue').default,
FieldsetEditForm: require('./components/fieldsets/EditForm.vue').default,
BlueprintListing: require('./components/blueprints/Listing.vue').default,
BlueprintBuilder: require('./components/blueprints/Builder.vue').default,
FormListing: require('./components/forms/Listing.vue').default,
FormSubmissionListing: require('./components/forms/SubmissionListing.vue').default,
GlobalListing: require('./components/globals/Listing.vue').default,
GlobalPublishForm: require('./components/globals/PublishForm.vue').default,
GlobalCreateForm: require('./components/globals/Create.vue').default,
UserListing: require('./components/users/Listing.vue').default,
UserWizard: require('./components/users/Wizard.vue').default,
RoleListing: require('./components/roles/Listing.vue').default,
RolePublishForm: require('./components/roles/PublishForm.vue').default,
UserGroupListing: require('./components/user-groups/Listing.vue').default,
UserGroupPublishForm: require('./components/user-groups/PublishForm.vue').default,
CollectionWizard: require('./components/collections/Wizard.vue').default,
CollectionEditForm: require('./components/collections/EditForm.vue').default,
SessionExpiry: require('./components/SessionExpiry.vue').default,
StructureWizard: require('./components/structures/Wizard.vue').default,
StructureListing: require('./components/structures/Listing.vue').default,
StructureEditForm: require('./components/structures/EditForm.vue').default,
Stacks: require('./components/stacks/Stacks.vue').default,
TaxonomyWizard: require('./components/taxonomies/Wizard.vue').default,
TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
AssetContainerCreateForm: require('./components/asset-containers/CreateForm.vue').default,
AssetContainerEditForm: require('./components/asset-containers/EditForm.vue').default,
FormWizard: require('./components/forms/Wizard.vue').default,
},

data: {
Expand Down
108 changes: 54 additions & 54 deletions resources/js/bootstrap/components.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,75 +5,75 @@ import vSelect from 'vue-select'
Vue.component('v-select', vSelect)

// Core
Vue.component('asset-manager', require('../components/assets/AssetManager.vue'));
Vue.component('asset-browser', require('../components/assets/Browser/Browser.vue'));
Vue.component('updater', require('../components/Updater.vue'));
Vue.component('updates-badge', require('../components/UpdatesBadge.vue'));
Vue.component('composer-output', require('../components/ComposerOutput.vue'));
Vue.component('asset-manager', require('../components/assets/AssetManager.vue').default);
Vue.component('asset-browser', require('../components/assets/Browser/Browser.vue').default);
Vue.component('updater', require('../components/Updater.vue').default);
Vue.component('updates-badge', require('../components/UpdatesBadge.vue').default);
Vue.component('composer-output', require('../components/ComposerOutput.vue').default);

// Publish
Vue.component('publish-container', require('../components/publish/Container.vue'));
Vue.component('publish-form', require('../components/publish/PublishForm.vue'));
Vue.component('publish-fields', require('../components/publish/Fields.vue'));
Vue.component('publish-field-meta', require('../components/publish/FieldMeta.vue'));
Vue.component('publish-sections', require('../components/publish/Sections.vue'));
Vue.component('publish-validation-errors', require('../components/publish/ValidationErrors'));
Vue.component('form-group', require('../components/publish/FormGroup.vue'));
Vue.component('publish-container', require('../components/publish/Container.vue').default);
Vue.component('publish-form', require('../components/publish/PublishForm.vue').default);
Vue.component('publish-fields', require('../components/publish/Fields.vue').default);
Vue.component('publish-field-meta', require('../components/publish/FieldMeta.vue').default);
Vue.component('publish-sections', require('../components/publish/Sections.vue').default);
Vue.component('publish-validation-errors', require('../components/publish/ValidationErrors').default);
Vue.component('form-group', require('../components/publish/FormGroup.vue').default);

Vue.component('live-preview', require('../components/live-preview/LivePreview.vue'));
Vue.component('live-preview-popout', require('../components/live-preview/Popout.vue'));
Vue.component('live-preview', require('../components/live-preview/LivePreview.vue').default);
Vue.component('live-preview-popout', require('../components/live-preview/Popout.vue').default);

Vue.component('EntryPublishForm', require('../components/entries/PublishForm.vue'));
Vue.component('TermPublishForm', require('../components/terms/PublishForm.vue'));
Vue.component('UserPublishForm', require('../components/users/PublishForm.vue'));
Vue.component('EntryPublishForm', require('../components/entries/PublishForm.vue').default);
Vue.component('TermPublishForm', require('../components/terms/PublishForm.vue').default);
Vue.component('UserPublishForm', require('../components/users/PublishForm.vue').default);

// Data List
Vue.component('data-list', require('../components/data-list/DataList.vue'));
Vue.component('data-list-search', require('../components/data-list/Search.vue'));
Vue.component('data-list-bulk-actions', require('../components/data-list/BulkActions.vue'));
Vue.component('data-list-inline-actions', require('../components/data-list/InlineActions.vue'));
Vue.component('data-list-column-picker', require('../components/data-list/ColumnPicker.vue'));
Vue.component('data-list-toggle-all', require('../components/data-list/ToggleAll.vue'));
Vue.component('data-list-pagination', require('../components/data-list/Pagination.vue'));
Vue.component('data-list-filters', require('../components/data-list/Filters.vue'));
Vue.component('data-list-table', require('../components/data-list/Table.vue'));
Vue.component('data-list', require('../components/data-list/DataList.vue').default);
Vue.component('data-list-search', require('../components/data-list/Search.vue').default);
Vue.component('data-list-bulk-actions', require('../components/data-list/BulkActions.vue').default);
Vue.component('data-list-inline-actions', require('../components/data-list/InlineActions.vue').default);
Vue.component('data-list-column-picker', require('../components/data-list/ColumnPicker.vue').default);
Vue.component('data-list-toggle-all', require('../components/data-list/ToggleAll.vue').default);
Vue.component('data-list-pagination', require('../components/data-list/Pagination.vue').default);
Vue.component('data-list-filters', require('../components/data-list/Filters.vue').default);
Vue.component('data-list-table', require('../components/data-list/Table.vue').default);

// Resource Type Lists
Vue.component('entry-list', require('../components/entries/Listing.vue'));
Vue.component('collection-list', require('../components/collections/Listing.vue'));
Vue.component('taxonomy-list', require('../components/taxonomies/Listing.vue'));
Vue.component('term-list', require('../components/terms/Listing.vue'));
Vue.component('asset-container-list', require('../components/AssetContainerList.vue'));
Vue.component('addon-list', require('../components/AddonList.vue'));
Vue.component('addon-details', require('../components/AddonDetails.vue'));
Vue.component('entry-list', require('../components/entries/Listing.vue').default);
Vue.component('collection-list', require('../components/collections/Listing.vue').default);
Vue.component('taxonomy-list', require('../components/taxonomies/Listing.vue').default);
Vue.component('term-list', require('../components/terms/Listing.vue').default);
Vue.component('asset-container-list', require('../components/AssetContainerList.vue').default);
Vue.component('addon-list', require('../components/AddonList.vue').default);
Vue.component('addon-details', require('../components/AddonDetails.vue').default);

// Widgets
Vue.component('collection-widget', require('../components/entries/Widget.vue'));
Vue.component('collection-widget', require('../components/entries/Widget.vue').default);

// Reusable
Vue.component('svg-icon', require('../components/SvgIcon.vue'));
Vue.component('file-icon', require('../components/FileIcon.vue'));
Vue.component('loading-graphic', require('../components/LoadingGraphic.vue'));
Vue.component('dropdown-list', require('../components/DropdownList.vue'));
Vue.component('dropdown-item', require('../components/DropdownItem.vue'));
Vue.component('validation-errors', require('../components/ValidationErrors'));
Vue.component('slugify', require('../components/Slugify.vue'));
Vue.component('element-container', require('../components/ElementContainer.vue'));
Vue.component('avatar', require('../components/Avatar.vue'));
Vue.component('breadcrumbs', require('../components/Breadcrumbs.vue'));
Vue.component('svg-icon', require('../components/SvgIcon.vue').default);
Vue.component('file-icon', require('../components/FileIcon.vue').default);
Vue.component('loading-graphic', require('../components/LoadingGraphic.vue').default);
Vue.component('dropdown-list', require('../components/DropdownList.vue').default);
Vue.component('dropdown-item', require('../components/DropdownItem.vue').default);
Vue.component('validation-errors', require('../components/ValidationErrors').default);
Vue.component('slugify', require('../components/Slugify.vue').default);
Vue.component('element-container', require('../components/ElementContainer.vue').default);
Vue.component('avatar', require('../components/Avatar.vue').default);
Vue.component('breadcrumbs', require('../components/Breadcrumbs.vue').default);

// Recursive
Vue.component('role-permission-tree', require('../components/roles/PermissionTree.vue'));
Vue.component('role-permission-tree', require('../components/roles/PermissionTree.vue').default);

// Modals
Vue.component('modal', require('../components/Modal.vue'));
Vue.component('confirmation-modal', require('../components/modals/ConfirmationModal.vue'));
Vue.component('favorite-creator', require('../components/FavoriteCreator.vue'));
Vue.component('keyboard-shortcuts-modal', require('../components/modals/KeyboardShortcutsModal.vue'));
Vue.component('resource-deleter', require('../components/ResourceDeleter.vue'));
// Vue.component('modal-dialog', require('../components/ModalDialog.vue'));
Vue.component('modal', require('../components/Modal.vue').default);
Vue.component('confirmation-modal', require('../components/modals/ConfirmationModal.vue').default);
Vue.component('favorite-creator', require('../components/FavoriteCreator.vue').default);
Vue.component('keyboard-shortcuts-modal', require('../components/modals/KeyboardShortcutsModal.vue').default);
Vue.component('resource-deleter', require('../components/ResourceDeleter.vue').default);
// Vue.component('modal-dialog', require('../components/ModalDialog.vue').default);

Vue.component('stack', require('../components/stacks/Stack.vue'));
Vue.component('stack-test', require('../components/stacks/StackTest.vue'));
Vue.component('stack', require('../components/stacks/Stack.vue').default);
Vue.component('stack-test', require('../components/stacks/StackTest.vue').default);

Vue.component('pane', require('../components/panes/Pane.vue'));
Vue.component('pane', require('../components/panes/Pane.vue').default);
Loading

0 comments on commit ff70da6

Please sign in to comment.