[4.x] Migrate to Vite#7485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonvarga merged 13 commits into from
Feb 7, 2023
Merged

[4.x] Migrate to Vite #7485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
96b8cc4
wip
jasonvarga Feb 6, 2023
6370531
read valet tls from env file
jasonvarga Feb 7, 2023
9eb891b
require @babel/preset-env for jest. it worked previously because lara…
jasonvarga Feb 7, 2023
f608be5
Put config in a regular script rather than base64 encoding the whole …
jasonvarga Feb 7, 2023
7219b82
Don't use vite in tests
jasonvarga Feb 7, 2023
567fbe4
Remove jquery ui
jasonvarga Feb 7, 2023
27a8255
remove now unnecessary file
jasonvarga Feb 7, 2023
8fede77
Merge branch 'master' into vite
jasonvarga Feb 7, 2023
e959235
Require version of laravel that supports vite
jasonvarga Feb 7, 2023
2726a20
there was a vite bug. but instead of bumping just to the fix, bump al…
jasonvarga Feb 7, 2023
0e30582
apply to frontend.
jasonvarga Feb 7, 2023
2a5f116
Use the updated npm commands
jasonvarga Feb 7, 2023
25840e9
defer so things like Statamic and Fieldtype are available to scripts
jasonvarga Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,10 @@ jobs:
run: npm ci

- name: Compile assets
run: npm run production
run: npm run build

- name: Compile frontend assets
run: npm run frontend-prod
run: npm run frontend-build

- name: Create dist zip
run: cd resources && tar -czvf dist.tar.gz dist
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,4 @@ tests/Fakes/Composer/Package/test-package/composer.json
resources/dist
resources/dist-frontend
composer.lock
.env
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
"facade/ignition-contracts": "^1.0",
"guzzlehttp/guzzle": "^6.3 || ^7.0",
"james-heinrich/getid3": "^1.9.21",
"laravel/framework": "^9.0",
"laravel/framework": "^9.49.0",
"laravel/helpers": "^1.1",
"league/commonmark": "^1.5 || ^2.2",
"league/csv": "^9.0",
Expand Down
30,953 changes: 9,676 additions & 21,277 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 11 additions & 17 deletions package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,13 @@
"name": "statamic",
"private": true,
"scripts": {
"dev": "npm run development",
"development": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch-poll": "npm run watch -- --watch-poll",
"hot": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "npm run production",
"production": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"dev": "vite",
"build": "vite build",
"svgo": "svgo -f ./resources/svg/ -r",
"test": "cross-env NODE_ENV=test jest --silent",
"test-watch": "npm run test -- --watch --notify",
"frontend-dev": "npm run development -- --env.mixfile=frontend.mix",
"frontend-prod": "npm run production -- --env.mixfile=frontend.mix",
"frontend-watch": "npm run watch -- --env.mixfile=frontend.mix"
"frontend-dev": "vite -c vite-frontend.config.js",
"frontend-build": "vite build -c vite-frontend.config.js"
},
"dependencies": {
"@popperjs/core": "^2.5.3",
Expand DownExpand Up@@ -56,14 +50,13 @@
"body-scroll-lock": "^2.6.4",
"codemirror": "^5.58.2",
"cookies-js": "^1.2.2",
"dmuploader": "file:resources/js/vendor/dmuploader",
"dm-file-uploader": "^1.0.2",
"dropzone": "^4.0.1",
"element-resize-detector": "^1.2.1",
"fuse.js": "^3.4.6",
"generate-password": "^1.5.1",
"highlight.js": "^9.18.1",
"jquery": "^3.5.0",
"jquery-ui": "file:resources/js/vendor/jquery-ui",
"laravel-echo": "^1.6.1",
"lowlight": "^2.6.1",
"luminous-lightbox": "^0.2.0",
Expand All@@ -90,7 +83,7 @@
"v-calendar": "^2.3.0",
"v-tooltip": "^2.0.3",
"validator": "^13.7.0",
"vue": "^2.6.11",
"vue": "^2.7.14",
"vue-clickaway": "~2.2.2",
"vue-countable": "^1.0.9",
"vue-draggable-nested-tree": "^2.2.20",
Expand All@@ -102,15 +95,16 @@
"vuex": "^3.1.2"
},
"devDependencies": {
"@babel/preset-env": "^7.20.2",
"@rollup/plugin-inject": "^5.0.3",
"@vitejs/plugin-vue2": "^2.2.0",
"babel-jest": "^24.9.0",
"cross-env": "^5.2.1",
"jest": "^24.9.0",
"kind-of": ">=6.0.3",
"laravel-mix": "^5.0.9",
"sass": "^1.26.2",
"sass-loader": "^8.0.2",
"laravel-vite-plugin": "^0.7.2",
"tailwindcss": "^1.9.0",
"vue-template-compiler": "^2.6.11"
"vite": "^4.0.0"
},
"jest": {
"roots": [
Expand Down
6 changes: 6 additions & 0 deletions postcss.config.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
module.exports = {
plugins: [
require('tailwindcss'),
require('autoprefixer'),
],
};
190 changes: 121 additions & 69 deletions resources/js/app.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,31 +4,34 @@ import Statamic from './components/Statamic.js';
import Alpine from 'alpinejs'
import * as Globals from './bootstrap/globals'
import { default as underscore } from 'underscore'
import Cookies from 'cookies-js';
import jQuery from 'jquery';
import rangy from 'rangy';

let global_functions = Object.keys(Globals)
global_functions.forEach(fnName => { global[fnName] = Globals[fnName] })
global.Cookies = require('cookies-js');
global_functions.forEach(fnName => { window[fnName] = Globals[fnName] })

Vue.config.silent = false;
Vue.config.devtools = true;
Vue.config.productionTip = false

window.Cookies = Cookies;
window.Alpine = Alpine
window.Vue = Vue;
window.Statamic = Statamic;
window._ = underscore;
window.$ = window.jQuery = require('jquery');
window.rangy = require('rangy');

require('./bootstrap/polyfills');
require('./bootstrap/underscore-mixins');
require('./bootstrap/jquery-plugins');
require('./bootstrap/plugins');
require('./bootstrap/filters');
require('./bootstrap/mixins');
require('./bootstrap/components');
require('./bootstrap/fieldtypes');
require('./bootstrap/directives');
window.$ = window.jQuery = jQuery;
window.rangy = rangy;

import './bootstrap/polyfills';
import './bootstrap/underscore-mixins';
import './bootstrap/jquery-plugins';
import './bootstrap/plugins';
import './bootstrap/filters';
import './bootstrap/mixins';
import './bootstrap/components';
import './bootstrap/fieldtypes';
import './bootstrap/directives';

import axios from 'axios';
import PortalVue from "portal-vue";
Expand DownExpand Up@@ -69,7 +72,8 @@ Vue.prototype.$echo = Statamic.$echo;
Vue.prototype.$bard = Statamic.$bard;
Vue.prototype.$keys = Statamic.$keys;

window.moment = Vue.moment = Vue.prototype.$moment = require('moment');
import Moment from 'moment';
window.moment = Vue.moment = Vue.prototype.$moment = Moment;

Vue.use(Popover, { tooltip: true })
Vue.use(PortalVue)
Expand All@@ -90,15 +94,63 @@ Statamic.$store = new Vuex.Store({
}
});

require('./components/ToastBus');
require('./components/ModalBus');
require('./components/stacks/Stacks');
require('./components/panes/Panes');
require('./components/ProgressBar');
require('./components/DirtyState');
require('./components/Config');
require('./components/Preference');
require('./components/Permission');
import './components/ToastBus';
import './components/ModalBus';
import './components/stacks/Stacks';
import './components/panes/Panes';
import './components/ProgressBar';
import './components/DirtyState';
import './components/Config';
import './components/Preference';
import './components/Permission';


import GlobalSearch from './components/GlobalSearch.vue';
import GlobalSiteSelector from './components/GlobalSiteSelector.vue';
import Login from './components/login/login';
import LoginModal from './components/login/LoginModal.vue';
import BaseEntryCreateForm from './components/entries/BaseCreateForm.vue';
import BaseTermCreateForm from './components/terms/BaseCreateForm.vue';
import CreateTermButton from './components/terms/CreateTermButton.vue';
import Importer from './components/importer/importer';
import FieldsetListing from './components/fieldsets/Listing.vue';
import FieldsetCreateForm from './components/fieldsets/CreateForm.vue';
import FieldsetEditForm from './components/fieldsets/EditForm.vue';
import BlueprintListing from './components/blueprints/Listing.vue';
import BlueprintBuilder from './components/blueprints/Builder.vue';
import FormCreateForm from './components/forms/CreateForm.vue';
import FormListing from './components/forms/Listing.vue';
import FormSubmissionListing from './components/forms/SubmissionListing.vue';
import GlobalListing from './components/globals/Listing.vue';
import GlobalEditForm from './components/globals/EditForm.vue';
import GlobalPublishForm from './components/globals/PublishForm.vue';
import GlobalCreateForm from './components/globals/Create.vue';
import UserListing from './components/users/Listing.vue';
import UserWizard from './components/users/Wizard.vue';
import RoleListing from './components/roles/Listing.vue';
import RolePublishForm from './components/roles/PublishForm.vue';
import UserGroupListing from './components/user-groups/Listing.vue';
import UserGroupPublishForm from './components/user-groups/PublishForm.vue';
import CollectionCreateForm from './components/collections/CreateForm.vue';
import CollectionScaffolder from './components/collections/Scaffolder.vue';
import CollectionEditForm from './components/collections/EditForm.vue';
import CollectionView from './components/collections/View.vue';
import CollectionBlueprintListing from './components/collections/BlueprintListing.vue';
import SessionExpiry from './components/SessionExpiry.vue';
import NavigationListing from './components/navigation/Listing.vue';
import NavigationCreateForm from './components/navigation/CreateForm.vue';
import NavigationEditForm from './components/navigation/EditForm.vue';
import PreferencesEditForm from './components/preferences/EditForm.vue';
import NavigationView from './components/navigation/View.vue';
import TaxonomyCreateForm from './components/taxonomies/CreateForm.vue';
import TaxonomyEditForm from './components/taxonomies/EditForm.vue';
import TaxonomyBlueprintListing from './components/taxonomies/BlueprintListing.vue';
import AssetContainerCreateForm from './components/asset-containers/CreateForm.vue';
import AssetContainerEditForm from './components/asset-containers/EditForm.vue';
import NavBuilder from './components/nav/Builder.vue';
import Updater from './components/updater/Updater.vue';
import PortalTargets from './components/PortalTargets.vue';


Statamic.app({
el: '#statamic',
Expand All@@ -108,51 +160,51 @@ Statamic.app({
store: Statamic.$store,

components: {
GlobalSearch: require('./components/GlobalSearch.vue').default,
GlobalSiteSelector: require('./components/GlobalSiteSelector.vue').default,
Login: require('./components/login/login'),
LoginModal: require('./components/login/LoginModal.vue').default,
BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
BaseTermCreateForm: require('./components/terms/BaseCreateForm.vue').default,
CreateTermButton: require('./components/terms/CreateTermButton.vue').default,
Importer: require('./components/importer/importer'),
FieldsetListing: require('./components/fieldsets/Listing.vue').default,
FieldsetCreateForm: require('./components/fieldsets/CreateForm.vue').default,
FieldsetEditForm: require('./components/fieldsets/EditForm.vue').default,
BlueprintListing: require('./components/blueprints/Listing.vue').default,
BlueprintBuilder: require('./components/blueprints/Builder.vue').default,
FormCreateForm: require('./components/forms/CreateForm.vue').default,
FormListing: require('./components/forms/Listing.vue').default,
FormSubmissionListing: require('./components/forms/SubmissionListing.vue').default,
GlobalListing: require('./components/globals/Listing.vue').default,
GlobalEditForm: require('./components/globals/EditForm.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,
CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
CollectionEditForm: require('./components/collections/EditForm.vue').default,
CollectionView: require('./components/collections/View.vue').default,
CollectionBlueprintListing: require('./components/collections/BlueprintListing.vue').default,
SessionExpiry: require('./components/SessionExpiry.vue').default,
NavigationListing: require('./components/navigation/Listing.vue').default,
NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
NavigationEditForm: require('./components/navigation/EditForm.vue').default,
PreferencesEditForm: require('./components/preferences/EditForm.vue').default,
NavigationView: require('./components/navigation/View.vue').default,
TaxonomyCreateForm: require('./components/taxonomies/CreateForm.vue').default,
TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
TaxonomyBlueprintListing: require('./components/taxonomies/BlueprintListing.vue').default,
AssetContainerCreateForm: require('./components/asset-containers/CreateForm.vue').default,
AssetContainerEditForm: require('./components/asset-containers/EditForm.vue').default,
NavBuilder: require('./components/nav/Builder.vue').default,
Updater: require('./components/updater/Updater.vue').default,
PortalTargets: require('./components/PortalTargets.vue').default,
GlobalSearch,
GlobalSiteSelector,
Login,
LoginModal,
BaseEntryCreateForm,
BaseTermCreateForm,
CreateTermButton,
Importer,
FieldsetListing,
FieldsetCreateForm,
FieldsetEditForm,
BlueprintListing,
BlueprintBuilder,
FormCreateForm,
FormListing,
FormSubmissionListing,
GlobalListing,
GlobalEditForm,
GlobalPublishForm,
GlobalCreateForm,
UserListing,
UserWizard,
RoleListing,
RolePublishForm,
UserGroupListing,
UserGroupPublishForm,
CollectionCreateForm,
CollectionScaffolder,
CollectionEditForm,
CollectionView,
CollectionBlueprintListing,
SessionExpiry,
NavigationListing,
NavigationCreateForm,
NavigationEditForm,
PreferencesEditForm,
NavigationView,
TaxonomyCreateForm,
TaxonomyEditForm,
TaxonomyBlueprintListing,
AssetContainerCreateForm,
AssetContainerEditForm,
NavBuilder,
Updater,
PortalTargets,
},

data: {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[4.x] Migrate to Vite#7485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 13 commits into

from

Feb 7, 2023
 Merged


[4.x] Migrate to Vite
#7485
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
96b8cc4

wip


jasonvarga Feb 6, 2023
6370531

read valet tls from env file


jasonvarga Feb 7, 2023
9eb891b

require @babel/preset-env for jest. it worked previously because lara…


jasonvarga Feb 7, 2023
f608be5

Put config in a regular script rather than base64 encoding the whole …


jasonvarga Feb 7, 2023
7219b82

Don't use vite in tests


jasonvarga Feb 7, 2023
567fbe4

Remove jquery ui


jasonvarga Feb 7, 2023
27a8255

remove now unnecessary file


jasonvarga Feb 7, 2023
8fede77

Merge branch 'master' into vite


jasonvarga Feb 7, 2023
e959235

Require version of laravel that supports vite


jasonvarga Feb 7, 2023
2726a20

there was a vite bug. but instead of bumping just to the fix, bump al…


jasonvarga Feb 7, 2023
0e30582

apply to frontend.


jasonvarga Feb 7, 2023
2a5f116

Use the updated npm commands


jasonvarga Feb 7, 2023
25840e9

defer so things like Statamic and Fieldtype are available to scripts


jasonvarga Feb 7, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.github/workflows/release.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,10 @@ jobs:
 run: npm ci

 - name: Compile assets
 run: npm run production
 run: npm run build

 - name: Compile frontend assets
 run: npm run frontend-prod
 run: npm run frontend-build

 - name: Create dist zip
 run: cd resources && tar -czvf dist.tar.gz dist
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,4 @@ tests/Fakes/Composer/Package/test-package/composer.json
resources/dist
resources/dist-frontend
composer.lock
.env

2 changes: 1 addition & 1 deletion
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
 "facade/ignition-contracts": "^1.0",
 "guzzlehttp/guzzle": "^6.3 || ^7.0",
 "james-heinrich/getid3": "^1.9.21",
 "laravel/framework": "^9.0",
 "laravel/framework": "^9.49.0",
 "laravel/helpers": "^1.1",
 "league/commonmark": "^1.5 || ^2.2",
 "league/csv": "^9.0",
Expand Down

30,953 changes: 9,676 additions & 21,277 deletions
package-lock.json

View file


Open in desktop


Large diffs are not rendered by default.


28 changes: 11 additions & 17 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,13 @@
 "name": "statamic",
 "private": true,
 "scripts": {
 "dev": "npm run development",
 "development": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch-poll": "npm run watch -- --watch-poll",
 "hot": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
 "prod": "npm run production",
 "production": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "dev": "vite",
 "build": "vite build",
 "svgo": "svgo -f ./resources/svg/ -r",
 "test": "cross-env NODE_ENV=test jest --silent",
 "test-watch": "npm run test -- --watch --notify",
 "frontend-dev": "npm run development -- --env.mixfile=frontend.mix",
 "frontend-prod": "npm run production -- --env.mixfile=frontend.mix",
 "frontend-watch": "npm run watch -- --env.mixfile=frontend.mix"
 "frontend-dev": "vite -c vite-frontend.config.js",
 "frontend-build": "vite build -c vite-frontend.config.js"
 },
 "dependencies": {
 "@popperjs/core": "^2.5.3",
Expand DownExpand Up@@ -56,14 +50,13 @@
 "body-scroll-lock": "^2.6.4",
 "codemirror": "^5.58.2",
 "cookies-js": "^1.2.2",
 "dmuploader": "file:resources/js/vendor/dmuploader",
 "dm-file-uploader": "^1.0.2",
 "dropzone": "^4.0.1",
 "element-resize-detector": "^1.2.1",
 "fuse.js": "^3.4.6",
 "generate-password": "^1.5.1",
 "highlight.js": "^9.18.1",
 "jquery": "^3.5.0",
 "jquery-ui": "file:resources/js/vendor/jquery-ui",
 "laravel-echo": "^1.6.1",
 "lowlight": "^2.6.1",
 "luminous-lightbox": "^0.2.0",
Expand All@@ -90,7 +83,7 @@
 "v-calendar": "^2.3.0",
 "v-tooltip": "^2.0.3",
 "validator": "^13.7.0",
 "vue": "^2.6.11",
 "vue": "^2.7.14",
 "vue-clickaway": "~2.2.2",
 "vue-countable": "^1.0.9",
 "vue-draggable-nested-tree": "^2.2.20",
Expand All@@ -102,15 +95,16 @@
 "vuex": "^3.1.2"
 },
 "devDependencies": {
 "@babel/preset-env": "^7.20.2",
 "@rollup/plugin-inject": "^5.0.3",
 "@vitejs/plugin-vue2": "^2.2.0",
 "babel-jest": "^24.9.0",
 "cross-env": "^5.2.1",
 "jest": "^24.9.0",
 "kind-of": ">=6.0.3",
 "laravel-mix": "^5.0.9",
 "sass": "^1.26.2",
 "sass-loader": "^8.0.2",
 "laravel-vite-plugin": "^0.7.2",
 "tailwindcss": "^1.9.0",
 "vue-template-compiler": "^2.6.11"
 "vite": "^4.0.0"
 },
 "jest": {
 "roots": [
Expand Down

6 changes: 6 additions & 0 deletions
postcss.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
module.exports = {
 plugins: [
 require('tailwindcss'),
 require('autoprefixer'),
 ],
};

190 changes: 121 additions & 69 deletions
resources/js/app.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,31 +4,34 @@ import Statamic from './components/Statamic.js';
import Alpine from 'alpinejs'
import * as Globals from './bootstrap/globals'
import { default as underscore } from 'underscore'
import Cookies from 'cookies-js';
import jQuery from 'jquery';
import rangy from 'rangy';

let global_functions = Object.keys(Globals)
global_functions.forEach(fnName => { global[fnName] = Globals[fnName] })
global.Cookies = require('cookies-js');
global_functions.forEach(fnName => { window[fnName] = Globals[fnName] })

Vue.config.silent = false;
Vue.config.devtools = true;
Vue.config.productionTip = false

window.Cookies = Cookies;
window.Alpine = Alpine
window.Vue = Vue;
window.Statamic = Statamic;
window._ = underscore;
window.$ = window.jQuery = require('jquery');
window.rangy = require('rangy');

require('./bootstrap/polyfills');
require('./bootstrap/underscore-mixins');
require('./bootstrap/jquery-plugins');
require('./bootstrap/plugins');
require('./bootstrap/filters');
require('./bootstrap/mixins');
require('./bootstrap/components');
require('./bootstrap/fieldtypes');
require('./bootstrap/directives');
window.$ = window.jQuery = jQuery;
window.rangy = rangy;

import './bootstrap/polyfills';
import './bootstrap/underscore-mixins';
import './bootstrap/jquery-plugins';
import './bootstrap/plugins';
import './bootstrap/filters';
import './bootstrap/mixins';
import './bootstrap/components';
import './bootstrap/fieldtypes';
import './bootstrap/directives';

import axios from 'axios';
import PortalVue from "portal-vue";
Expand DownExpand Up@@ -69,7 +72,8 @@ Vue.prototype.$echo = Statamic.$echo;
Vue.prototype.$bard = Statamic.$bard;
Vue.prototype.$keys = Statamic.$keys;

window.moment = Vue.moment = Vue.prototype.$moment = require('moment');
import Moment from 'moment';
window.moment = Vue.moment = Vue.prototype.$moment = Moment;

Vue.use(Popover, { tooltip: true })
Vue.use(PortalVue)
Expand All@@ -90,15 +94,63 @@ Statamic.$store = new Vuex.Store({
 }
});

require('./components/ToastBus');
require('./components/ModalBus');
require('./components/stacks/Stacks');
require('./components/panes/Panes');
require('./components/ProgressBar');
require('./components/DirtyState');
require('./components/Config');
require('./components/Preference');
require('./components/Permission');
import './components/ToastBus';
import './components/ModalBus';
import './components/stacks/Stacks';
import './components/panes/Panes';
import './components/ProgressBar';
import './components/DirtyState';
import './components/Config';
import './components/Preference';
import './components/Permission';


import GlobalSearch from './components/GlobalSearch.vue';
import GlobalSiteSelector from './components/GlobalSiteSelector.vue';
import Login from './components/login/login';
import LoginModal from './components/login/LoginModal.vue';
import BaseEntryCreateForm from './components/entries/BaseCreateForm.vue';
import BaseTermCreateForm from './components/terms/BaseCreateForm.vue';
import CreateTermButton from './components/terms/CreateTermButton.vue';
import Importer from './components/importer/importer';
import FieldsetListing from './components/fieldsets/Listing.vue';
import FieldsetCreateForm from './components/fieldsets/CreateForm.vue';
import FieldsetEditForm from './components/fieldsets/EditForm.vue';
import BlueprintListing from './components/blueprints/Listing.vue';
import BlueprintBuilder from './components/blueprints/Builder.vue';
import FormCreateForm from './components/forms/CreateForm.vue';
import FormListing from './components/forms/Listing.vue';
import FormSubmissionListing from './components/forms/SubmissionListing.vue';
import GlobalListing from './components/globals/Listing.vue';
import GlobalEditForm from './components/globals/EditForm.vue';
import GlobalPublishForm from './components/globals/PublishForm.vue';
import GlobalCreateForm from './components/globals/Create.vue';
import UserListing from './components/users/Listing.vue';
import UserWizard from './components/users/Wizard.vue';
import RoleListing from './components/roles/Listing.vue';
import RolePublishForm from './components/roles/PublishForm.vue';
import UserGroupListing from './components/user-groups/Listing.vue';
import UserGroupPublishForm from './components/user-groups/PublishForm.vue';
import CollectionCreateForm from './components/collections/CreateForm.vue';
import CollectionScaffolder from './components/collections/Scaffolder.vue';
import CollectionEditForm from './components/collections/EditForm.vue';
import CollectionView from './components/collections/View.vue';
import CollectionBlueprintListing from './components/collections/BlueprintListing.vue';
import SessionExpiry from './components/SessionExpiry.vue';
import NavigationListing from './components/navigation/Listing.vue';
import NavigationCreateForm from './components/navigation/CreateForm.vue';
import NavigationEditForm from './components/navigation/EditForm.vue';
import PreferencesEditForm from './components/preferences/EditForm.vue';
import NavigationView from './components/navigation/View.vue';
import TaxonomyCreateForm from './components/taxonomies/CreateForm.vue';
import TaxonomyEditForm from './components/taxonomies/EditForm.vue';
import TaxonomyBlueprintListing from './components/taxonomies/BlueprintListing.vue';
import AssetContainerCreateForm from './components/asset-containers/CreateForm.vue';
import AssetContainerEditForm from './components/asset-containers/EditForm.vue';
import NavBuilder from './components/nav/Builder.vue';
import Updater from './components/updater/Updater.vue';
import PortalTargets from './components/PortalTargets.vue';


Statamic.app({
 el: '#statamic',
Expand All@@ -108,51 +160,51 @@ Statamic.app({
 store: Statamic.$store,

 components: {
 GlobalSearch: require('./components/GlobalSearch.vue').default,
 GlobalSiteSelector: require('./components/GlobalSiteSelector.vue').default,
 Login: require('./components/login/login'),
 LoginModal: require('./components/login/LoginModal.vue').default,
 BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
 BaseTermCreateForm: require('./components/terms/BaseCreateForm.vue').default,
 CreateTermButton: require('./components/terms/CreateTermButton.vue').default,
 Importer: require('./components/importer/importer'),
 FieldsetListing: require('./components/fieldsets/Listing.vue').default,
 FieldsetCreateForm: require('./components/fieldsets/CreateForm.vue').default,
 FieldsetEditForm: require('./components/fieldsets/EditForm.vue').default,
 BlueprintListing: require('./components/blueprints/Listing.vue').default,
 BlueprintBuilder: require('./components/blueprints/Builder.vue').default,
 FormCreateForm: require('./components/forms/CreateForm.vue').default,
 FormListing: require('./components/forms/Listing.vue').default,
 FormSubmissionListing: require('./components/forms/SubmissionListing.vue').default,
 GlobalListing: require('./components/globals/Listing.vue').default,
 GlobalEditForm: require('./components/globals/EditForm.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,
 CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
 CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
 CollectionEditForm: require('./components/collections/EditForm.vue').default,
 CollectionView: require('./components/collections/View.vue').default,
 CollectionBlueprintListing: require('./components/collections/BlueprintListing.vue').default,
 SessionExpiry: require('./components/SessionExpiry.vue').default,
 NavigationListing: require('./components/navigation/Listing.vue').default,
 NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
 NavigationEditForm: require('./components/navigation/EditForm.vue').default,
 PreferencesEditForm: require('./components/preferences/EditForm.vue').default,
 NavigationView: require('./components/navigation/View.vue').default,
 TaxonomyCreateForm: require('./components/taxonomies/CreateForm.vue').default,
 TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
 TaxonomyBlueprintListing: require('./components/taxonomies/BlueprintListing.vue').default,
 AssetContainerCreateForm: require('./components/asset-containers/CreateForm.vue').default,
 AssetContainerEditForm: require('./components/asset-containers/EditForm.vue').default,
 NavBuilder: require('./components/nav/Builder.vue').default,
 Updater: require('./components/updater/Updater.vue').default,
 PortalTargets: require('./components/PortalTargets.vue').default,
 GlobalSearch,
 GlobalSiteSelector,
 Login,
 LoginModal,
 BaseEntryCreateForm,
 BaseTermCreateForm,
 CreateTermButton,
 Importer,
 FieldsetListing,
 FieldsetCreateForm,
 FieldsetEditForm,
 BlueprintListing,
 BlueprintBuilder,
 FormCreateForm,
 FormListing,
 FormSubmissionListing,
 GlobalListing,
 GlobalEditForm,
 GlobalPublishForm,
 GlobalCreateForm,
 UserListing,
 UserWizard,
 RoleListing,
 RolePublishForm,
 UserGroupListing,
 UserGroupPublishForm,
 CollectionCreateForm,
 CollectionScaffolder,
 CollectionEditForm,
 CollectionView,
 CollectionBlueprintListing,
 SessionExpiry,
 NavigationListing,
 NavigationCreateForm,
 NavigationEditForm,
 PreferencesEditForm,
 NavigationView,
 TaxonomyCreateForm,
 TaxonomyEditForm,
 TaxonomyBlueprintListing,
 AssetContainerCreateForm,
 AssetContainerEditForm,
 NavBuilder,
 Updater,
 PortalTargets,
 },

 data: {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[4.x] Migrate to Vite#7485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 13 commits into

from

Feb 7, 2023
 Merged


[4.x] Migrate to Vite
#7485
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
96b8cc4

wip


jasonvarga Feb 6, 2023
6370531

read valet tls from env file


jasonvarga Feb 7, 2023
9eb891b

require @babel/preset-env for jest. it worked previously because lara…


jasonvarga Feb 7, 2023
f608be5

Put config in a regular script rather than base64 encoding the whole …


jasonvarga Feb 7, 2023
7219b82

Don't use vite in tests


jasonvarga Feb 7, 2023
567fbe4

Remove jquery ui


jasonvarga Feb 7, 2023
27a8255

remove now unnecessary file


jasonvarga Feb 7, 2023
8fede77

Merge branch 'master' into vite


jasonvarga Feb 7, 2023
e959235

Require version of laravel that supports vite


jasonvarga Feb 7, 2023
2726a20

there was a vite bug. but instead of bumping just to the fix, bump al…


jasonvarga Feb 7, 2023
0e30582

apply to frontend.


jasonvarga Feb 7, 2023
2a5f116

Use the updated npm commands


jasonvarga Feb 7, 2023
25840e9

defer so things like Statamic and Fieldtype are available to scripts


jasonvarga Feb 7, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.github/workflows/release.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,10 @@ jobs:
 run: npm ci

 - name: Compile assets
 run: npm run production
 run: npm run build

 - name: Compile frontend assets
 run: npm run frontend-prod
 run: npm run frontend-build

 - name: Create dist zip
 run: cd resources && tar -czvf dist.tar.gz dist
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,4 @@ tests/Fakes/Composer/Package/test-package/composer.json
resources/dist
resources/dist-frontend
composer.lock
.env

2 changes: 1 addition & 1 deletion
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
 "facade/ignition-contracts": "^1.0",
 "guzzlehttp/guzzle": "^6.3 || ^7.0",
 "james-heinrich/getid3": "^1.9.21",
 "laravel/framework": "^9.0",
 "laravel/framework": "^9.49.0",
 "laravel/helpers": "^1.1",
 "league/commonmark": "^1.5 || ^2.2",
 "league/csv": "^9.0",
Expand Down

30,953 changes: 9,676 additions & 21,277 deletions
package-lock.json

View file


Open in desktop


Large diffs are not rendered by default.


28 changes: 11 additions & 17 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,13 @@
 "name": "statamic",
 "private": true,
 "scripts": {
 "dev": "npm run development",
 "development": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch-poll": "npm run watch -- --watch-poll",
 "hot": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
 "prod": "npm run production",
 "production": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "dev": "vite",
 "build": "vite build",
 "svgo": "svgo -f ./resources/svg/ -r",
 "test": "cross-env NODE_ENV=test jest --silent",
 "test-watch": "npm run test -- --watch --notify",
 "frontend-dev": "npm run development -- --env.mixfile=frontend.mix",
 "frontend-prod": "npm run production -- --env.mixfile=frontend.mix",
 "frontend-watch": "npm run watch -- --env.mixfile=frontend.mix"
 "frontend-dev": "vite -c vite-frontend.config.js",
 "frontend-build": "vite build -c vite-frontend.config.js"
 },
 "dependencies": {
 "@popperjs/core": "^2.5.3",
Expand DownExpand Up@@ -56,14 +50,13 @@
 "body-scroll-lock": "^2.6.4",
 "codemirror": "^5.58.2",
 "cookies-js": "^1.2.2",
 "dmuploader": "file:resources/js/vendor/dmuploader",
 "dm-file-uploader": "^1.0.2",
 "dropzone": "^4.0.1",
 "element-resize-detector": "^1.2.1",
 "fuse.js": "^3.4.6",
 "generate-password": "^1.5.1",
 "highlight.js": "^9.18.1",
 "jquery": "^3.5.0",
 "jquery-ui": "file:resources/js/vendor/jquery-ui",
 "laravel-echo": "^1.6.1",
 "lowlight": "^2.6.1",
 "luminous-lightbox": "^0.2.0",
Expand All@@ -90,7 +83,7 @@
 "v-calendar": "^2.3.0",
 "v-tooltip": "^2.0.3",
 "validator": "^13.7.0",
 "vue": "^2.6.11",
 "vue": "^2.7.14",
 "vue-clickaway": "~2.2.2",
 "vue-countable": "^1.0.9",
 "vue-draggable-nested-tree": "^2.2.20",
Expand All@@ -102,15 +95,16 @@
 "vuex": "^3.1.2"
 },
 "devDependencies": {
 "@babel/preset-env": "^7.20.2",
 "@rollup/plugin-inject": "^5.0.3",
 "@vitejs/plugin-vue2": "^2.2.0",
 "babel-jest": "^24.9.0",
 "cross-env": "^5.2.1",
 "jest": "^24.9.0",
 "kind-of": ">=6.0.3",
 "laravel-mix": "^5.0.9",
 "sass": "^1.26.2",
 "sass-loader": "^8.0.2",
 "laravel-vite-plugin": "^0.7.2",
 "tailwindcss": "^1.9.0",
 "vue-template-compiler": "^2.6.11"
 "vite": "^4.0.0"
 },
 "jest": {
 "roots": [
Expand Down

6 changes: 6 additions & 0 deletions
postcss.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
module.exports = {
 plugins: [
 require('tailwindcss'),
 require('autoprefixer'),
 ],
};

190 changes: 121 additions & 69 deletions
resources/js/app.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,31 +4,34 @@ import Statamic from './components/Statamic.js';
import Alpine from 'alpinejs'
import * as Globals from './bootstrap/globals'
import { default as underscore } from 'underscore'
import Cookies from 'cookies-js';
import jQuery from 'jquery';
import rangy from 'rangy';

let global_functions = Object.keys(Globals)
global_functions.forEach(fnName => { global[fnName] = Globals[fnName] })
global.Cookies = require('cookies-js');
global_functions.forEach(fnName => { window[fnName] = Globals[fnName] })

Vue.config.silent = false;
Vue.config.devtools = true;
Vue.config.productionTip = false

window.Cookies = Cookies;
window.Alpine = Alpine
window.Vue = Vue;
window.Statamic = Statamic;
window._ = underscore;
window.$ = window.jQuery = require('jquery');
window.rangy = require('rangy');

require('./bootstrap/polyfills');
require('./bootstrap/underscore-mixins');
require('./bootstrap/jquery-plugins');
require('./bootstrap/plugins');
require('./bootstrap/filters');
require('./bootstrap/mixins');
require('./bootstrap/components');
require('./bootstrap/fieldtypes');
require('./bootstrap/directives');
window.$ = window.jQuery = jQuery;
window.rangy = rangy;

import './bootstrap/polyfills';
import './bootstrap/underscore-mixins';
import './bootstrap/jquery-plugins';
import './bootstrap/plugins';
import './bootstrap/filters';
import './bootstrap/mixins';
import './bootstrap/components';
import './bootstrap/fieldtypes';
import './bootstrap/directives';

import axios from 'axios';
import PortalVue from "portal-vue";
Expand DownExpand Up@@ -69,7 +72,8 @@ Vue.prototype.$echo = Statamic.$echo;
Vue.prototype.$bard = Statamic.$bard;
Vue.prototype.$keys = Statamic.$keys;

window.moment = Vue.moment = Vue.prototype.$moment = require('moment');
import Moment from 'moment';
window.moment = Vue.moment = Vue.prototype.$moment = Moment;

Vue.use(Popover, { tooltip: true })
Vue.use(PortalVue)
Expand All@@ -90,15 +94,63 @@ Statamic.$store = new Vuex.Store({
 }
});

require('./components/ToastBus');
require('./components/ModalBus');
require('./components/stacks/Stacks');
require('./components/panes/Panes');
require('./components/ProgressBar');
require('./components/DirtyState');
require('./components/Config');
require('./components/Preference');
require('./components/Permission');
import './components/ToastBus';
import './components/ModalBus';
import './components/stacks/Stacks';
import './components/panes/Panes';
import './components/ProgressBar';
import './components/DirtyState';
import './components/Config';
import './components/Preference';
import './components/Permission';


import GlobalSearch from './components/GlobalSearch.vue';
import GlobalSiteSelector from './components/GlobalSiteSelector.vue';
import Login from './components/login/login';
import LoginModal from './components/login/LoginModal.vue';
import BaseEntryCreateForm from './components/entries/BaseCreateForm.vue';
import BaseTermCreateForm from './components/terms/BaseCreateForm.vue';
import CreateTermButton from './components/terms/CreateTermButton.vue';
import Importer from './components/importer/importer';
import FieldsetListing from './components/fieldsets/Listing.vue';
import FieldsetCreateForm from './components/fieldsets/CreateForm.vue';
import FieldsetEditForm from './components/fieldsets/EditForm.vue';
import BlueprintListing from './components/blueprints/Listing.vue';
import BlueprintBuilder from './components/blueprints/Builder.vue';
import FormCreateForm from './components/forms/CreateForm.vue';
import FormListing from './components/forms/Listing.vue';
import FormSubmissionListing from './components/forms/SubmissionListing.vue';
import GlobalListing from './components/globals/Listing.vue';
import GlobalEditForm from './components/globals/EditForm.vue';
import GlobalPublishForm from './components/globals/PublishForm.vue';
import GlobalCreateForm from './components/globals/Create.vue';
import UserListing from './components/users/Listing.vue';
import UserWizard from './components/users/Wizard.vue';
import RoleListing from './components/roles/Listing.vue';
import RolePublishForm from './components/roles/PublishForm.vue';
import UserGroupListing from './components/user-groups/Listing.vue';
import UserGroupPublishForm from './components/user-groups/PublishForm.vue';
import CollectionCreateForm from './components/collections/CreateForm.vue';
import CollectionScaffolder from './components/collections/Scaffolder.vue';
import CollectionEditForm from './components/collections/EditForm.vue';
import CollectionView from './components/collections/View.vue';
import CollectionBlueprintListing from './components/collections/BlueprintListing.vue';
import SessionExpiry from './components/SessionExpiry.vue';
import NavigationListing from './components/navigation/Listing.vue';
import NavigationCreateForm from './components/navigation/CreateForm.vue';
import NavigationEditForm from './components/navigation/EditForm.vue';
import PreferencesEditForm from './components/preferences/EditForm.vue';
import NavigationView from './components/navigation/View.vue';
import TaxonomyCreateForm from './components/taxonomies/CreateForm.vue';
import TaxonomyEditForm from './components/taxonomies/EditForm.vue';
import TaxonomyBlueprintListing from './components/taxonomies/BlueprintListing.vue';
import AssetContainerCreateForm from './components/asset-containers/CreateForm.vue';
import AssetContainerEditForm from './components/asset-containers/EditForm.vue';
import NavBuilder from './components/nav/Builder.vue';
import Updater from './components/updater/Updater.vue';
import PortalTargets from './components/PortalTargets.vue';


Statamic.app({
 el: '#statamic',
Expand All@@ -108,51 +160,51 @@ Statamic.app({
 store: Statamic.$store,

 components: {
 GlobalSearch: require('./components/GlobalSearch.vue').default,
 GlobalSiteSelector: require('./components/GlobalSiteSelector.vue').default,
 Login: require('./components/login/login'),
 LoginModal: require('./components/login/LoginModal.vue').default,
 BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
 BaseTermCreateForm: require('./components/terms/BaseCreateForm.vue').default,
 CreateTermButton: require('./components/terms/CreateTermButton.vue').default,
 Importer: require('./components/importer/importer'),
 FieldsetListing: require('./components/fieldsets/Listing.vue').default,
 FieldsetCreateForm: require('./components/fieldsets/CreateForm.vue').default,
 FieldsetEditForm: require('./components/fieldsets/EditForm.vue').default,
 BlueprintListing: require('./components/blueprints/Listing.vue').default,
 BlueprintBuilder: require('./components/blueprints/Builder.vue').default,
 FormCreateForm: require('./components/forms/CreateForm.vue').default,
 FormListing: require('./components/forms/Listing.vue').default,
 FormSubmissionListing: require('./components/forms/SubmissionListing.vue').default,
 GlobalListing: require('./components/globals/Listing.vue').default,
 GlobalEditForm: require('./components/globals/EditForm.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,
 CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
 CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
 CollectionEditForm: require('./components/collections/EditForm.vue').default,
 CollectionView: require('./components/collections/View.vue').default,
 CollectionBlueprintListing: require('./components/collections/BlueprintListing.vue').default,
 SessionExpiry: require('./components/SessionExpiry.vue').default,
 NavigationListing: require('./components/navigation/Listing.vue').default,
 NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
 NavigationEditForm: require('./components/navigation/EditForm.vue').default,
 PreferencesEditForm: require('./components/preferences/EditForm.vue').default,
 NavigationView: require('./components/navigation/View.vue').default,
 TaxonomyCreateForm: require('./components/taxonomies/CreateForm.vue').default,
 TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
 TaxonomyBlueprintListing: require('./components/taxonomies/BlueprintListing.vue').default,
 AssetContainerCreateForm: require('./components/asset-containers/CreateForm.vue').default,
 AssetContainerEditForm: require('./components/asset-containers/EditForm.vue').default,
 NavBuilder: require('./components/nav/Builder.vue').default,
 Updater: require('./components/updater/Updater.vue').default,
 PortalTargets: require('./components/PortalTargets.vue').default,
 GlobalSearch,
 GlobalSiteSelector,
 Login,
 LoginModal,
 BaseEntryCreateForm,
 BaseTermCreateForm,
 CreateTermButton,
 Importer,
 FieldsetListing,
 FieldsetCreateForm,
 FieldsetEditForm,
 BlueprintListing,
 BlueprintBuilder,
 FormCreateForm,
 FormListing,
 FormSubmissionListing,
 GlobalListing,
 GlobalEditForm,
 GlobalPublishForm,
 GlobalCreateForm,
 UserListing,
 UserWizard,
 RoleListing,
 RolePublishForm,
 UserGroupListing,
 UserGroupPublishForm,
 CollectionCreateForm,
 CollectionScaffolder,
 CollectionEditForm,
 CollectionView,
 CollectionBlueprintListing,
 SessionExpiry,
 NavigationListing,
 NavigationCreateForm,
 NavigationEditForm,
 PreferencesEditForm,
 NavigationView,
 TaxonomyCreateForm,
 TaxonomyEditForm,
 TaxonomyBlueprintListing,
 AssetContainerCreateForm,
 AssetContainerEditForm,
 NavBuilder,
 Updater,
 PortalTargets,
 },

 data: {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[4.x] Migrate to Vite#7485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 13 commits into

from

Feb 7, 2023
 Merged


[4.x] Migrate to Vite
#7485
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
96b8cc4

wip


jasonvarga Feb 6, 2023
6370531

read valet tls from env file


jasonvarga Feb 7, 2023
9eb891b

require @babel/preset-env for jest. it worked previously because lara…


jasonvarga Feb 7, 2023
f608be5

Put config in a regular script rather than base64 encoding the whole …


jasonvarga Feb 7, 2023
7219b82

Don't use vite in tests


jasonvarga Feb 7, 2023
567fbe4

Remove jquery ui


jasonvarga Feb 7, 2023
27a8255

remove now unnecessary file


jasonvarga Feb 7, 2023
8fede77

Merge branch 'master' into vite


jasonvarga Feb 7, 2023
e959235

Require version of laravel that supports vite


jasonvarga Feb 7, 2023
2726a20

there was a vite bug. but instead of bumping just to the fix, bump al…


jasonvarga Feb 7, 2023
0e30582

apply to frontend.


jasonvarga Feb 7, 2023
2a5f116

Use the updated npm commands


jasonvarga Feb 7, 2023
25840e9

defer so things like Statamic and Fieldtype are available to scripts


jasonvarga Feb 7, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.github/workflows/release.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,10 @@ jobs:
 run: npm ci

 - name: Compile assets
 run: npm run production
 run: npm run build

 - name: Compile frontend assets
 run: npm run frontend-prod
 run: npm run frontend-build

 - name: Create dist zip
 run: cd resources && tar -czvf dist.tar.gz dist
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,4 @@ tests/Fakes/Composer/Package/test-package/composer.json
resources/dist
resources/dist-frontend
composer.lock
.env

2 changes: 1 addition & 1 deletion
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
 "facade/ignition-contracts": "^1.0",
 "guzzlehttp/guzzle": "^6.3 || ^7.0",
 "james-heinrich/getid3": "^1.9.21",
 "laravel/framework": "^9.0",
 "laravel/framework": "^9.49.0",
 "laravel/helpers": "^1.1",
 "league/commonmark": "^1.5 || ^2.2",
 "league/csv": "^9.0",
Expand Down

30,953 changes: 9,676 additions & 21,277 deletions
package-lock.json

View file


Open in desktop


Large diffs are not rendered by default.


28 changes: 11 additions & 17 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,13 @@
 "name": "statamic",
 "private": true,
 "scripts": {
 "dev": "npm run development",
 "development": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch-poll": "npm run watch -- --watch-poll",
 "hot": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
 "prod": "npm run production",
 "production": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "dev": "vite",
 "build": "vite build",
 "svgo": "svgo -f ./resources/svg/ -r",
 "test": "cross-env NODE_ENV=test jest --silent",
 "test-watch": "npm run test -- --watch --notify",
 "frontend-dev": "npm run development -- --env.mixfile=frontend.mix",
 "frontend-prod": "npm run production -- --env.mixfile=frontend.mix",
 "frontend-watch": "npm run watch -- --env.mixfile=frontend.mix"
 "frontend-dev": "vite -c vite-frontend.config.js",
 "frontend-build": "vite build -c vite-frontend.config.js"
 },
 "dependencies": {
 "@popperjs/core": "^2.5.3",
Expand DownExpand Up@@ -56,14 +50,13 @@
 "body-scroll-lock": "^2.6.4",
 "codemirror": "^5.58.2",
 "cookies-js": "^1.2.2",
 "dmuploader": "file:resources/js/vendor/dmuploader",
 "dm-file-uploader": "^1.0.2",
 "dropzone": "^4.0.1",
 "element-resize-detector": "^1.2.1",
 "fuse.js": "^3.4.6",
 "generate-password": "^1.5.1",
 "highlight.js": "^9.18.1",
 "jquery": "^3.5.0",
 "jquery-ui": "file:resources/js/vendor/jquery-ui",
 "laravel-echo": "^1.6.1",
 "lowlight": "^2.6.1",
 "luminous-lightbox": "^0.2.0",
Expand All@@ -90,7 +83,7 @@
 "v-calendar": "^2.3.0",
 "v-tooltip": "^2.0.3",
 "validator": "^13.7.0",
 "vue": "^2.6.11",
 "vue": "^2.7.14",
 "vue-clickaway": "~2.2.2",
 "vue-countable": "^1.0.9",
 "vue-draggable-nested-tree": "^2.2.20",
Expand All@@ -102,15 +95,16 @@
 "vuex": "^3.1.2"
 },
 "devDependencies": {
 "@babel/preset-env": "^7.20.2",
 "@rollup/plugin-inject": "^5.0.3",
 "@vitejs/plugin-vue2": "^2.2.0",
 "babel-jest": "^24.9.0",
 "cross-env": "^5.2.1",
 "jest": "^24.9.0",
 "kind-of": ">=6.0.3",
 "laravel-mix": "^5.0.9",
 "sass": "^1.26.2",
 "sass-loader": "^8.0.2",
 "laravel-vite-plugin": "^0.7.2",
 "tailwindcss": "^1.9.0",
 "vue-template-compiler": "^2.6.11"
 "vite": "^4.0.0"
 },
 "jest": {
 "roots": [
Expand Down

6 changes: 6 additions & 0 deletions
postcss.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
module.exports = {
 plugins: [
 require('tailwindcss'),
 require('autoprefixer'),
 ],
};

190 changes: 121 additions & 69 deletions
resources/js/app.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,31 +4,34 @@ import Statamic from './components/Statamic.js';
import Alpine from 'alpinejs'
import * as Globals from './bootstrap/globals'
import { default as underscore } from 'underscore'
import Cookies from 'cookies-js';
import jQuery from 'jquery';
import rangy from 'rangy';

let global_functions = Object.keys(Globals)
global_functions.forEach(fnName => { global[fnName] = Globals[fnName] })
global.Cookies = require('cookies-js');
global_functions.forEach(fnName => { window[fnName] = Globals[fnName] })

Vue.config.silent = false;
Vue.config.devtools = true;
Vue.config.productionTip = false

window.Cookies = Cookies;
window.Alpine = Alpine
window.Vue = Vue;
window.Statamic = Statamic;
window._ = underscore;
window.$ = window.jQuery = require('jquery');
window.rangy = require('rangy');

require('./bootstrap/polyfills');
require('./bootstrap/underscore-mixins');
require('./bootstrap/jquery-plugins');
require('./bootstrap/plugins');
require('./bootstrap/filters');
require('./bootstrap/mixins');
require('./bootstrap/components');
require('./bootstrap/fieldtypes');
require('./bootstrap/directives');
window.$ = window.jQuery = jQuery;
window.rangy = rangy;

import './bootstrap/polyfills';
import './bootstrap/underscore-mixins';
import './bootstrap/jquery-plugins';
import './bootstrap/plugins';
import './bootstrap/filters';
import './bootstrap/mixins';
import './bootstrap/components';
import './bootstrap/fieldtypes';
import './bootstrap/directives';

import axios from 'axios';
import PortalVue from "portal-vue";
Expand DownExpand Up@@ -69,7 +72,8 @@ Vue.prototype.$echo = Statamic.$echo;
Vue.prototype.$bard = Statamic.$bard;
Vue.prototype.$keys = Statamic.$keys;

window.moment = Vue.moment = Vue.prototype.$moment = require('moment');
import Moment from 'moment';
window.moment = Vue.moment = Vue.prototype.$moment = Moment;

Vue.use(Popover, { tooltip: true })
Vue.use(PortalVue)
Expand All@@ -90,15 +94,63 @@ Statamic.$store = new Vuex.Store({
 }
});

require('./components/ToastBus');
require('./components/ModalBus');
require('./components/stacks/Stacks');
require('./components/panes/Panes');
require('./components/ProgressBar');
require('./components/DirtyState');
require('./components/Config');
require('./components/Preference');
require('./components/Permission');
import './components/ToastBus';
import './components/ModalBus';
import './components/stacks/Stacks';
import './components/panes/Panes';
import './components/ProgressBar';
import './components/DirtyState';
import './components/Config';
import './components/Preference';
import './components/Permission';


import GlobalSearch from './components/GlobalSearch.vue';
import GlobalSiteSelector from './components/GlobalSiteSelector.vue';
import Login from './components/login/login';
import LoginModal from './components/login/LoginModal.vue';
import BaseEntryCreateForm from './components/entries/BaseCreateForm.vue';
import BaseTermCreateForm from './components/terms/BaseCreateForm.vue';
import CreateTermButton from './components/terms/CreateTermButton.vue';
import Importer from './components/importer/importer';
import FieldsetListing from './components/fieldsets/Listing.vue';
import FieldsetCreateForm from './components/fieldsets/CreateForm.vue';
import FieldsetEditForm from './components/fieldsets/EditForm.vue';
import BlueprintListing from './components/blueprints/Listing.vue';
import BlueprintBuilder from './components/blueprints/Builder.vue';
import FormCreateForm from './components/forms/CreateForm.vue';
import FormListing from './components/forms/Listing.vue';
import FormSubmissionListing from './components/forms/SubmissionListing.vue';
import GlobalListing from './components/globals/Listing.vue';
import GlobalEditForm from './components/globals/EditForm.vue';
import GlobalPublishForm from './components/globals/PublishForm.vue';
import GlobalCreateForm from './components/globals/Create.vue';
import UserListing from './components/users/Listing.vue';
import UserWizard from './components/users/Wizard.vue';
import RoleListing from './components/roles/Listing.vue';
import RolePublishForm from './components/roles/PublishForm.vue';
import UserGroupListing from './components/user-groups/Listing.vue';
import UserGroupPublishForm from './components/user-groups/PublishForm.vue';
import CollectionCreateForm from './components/collections/CreateForm.vue';
import CollectionScaffolder from './components/collections/Scaffolder.vue';
import CollectionEditForm from './components/collections/EditForm.vue';
import CollectionView from './components/collections/View.vue';
import CollectionBlueprintListing from './components/collections/BlueprintListing.vue';
import SessionExpiry from './components/SessionExpiry.vue';
import NavigationListing from './components/navigation/Listing.vue';
import NavigationCreateForm from './components/navigation/CreateForm.vue';
import NavigationEditForm from './components/navigation/EditForm.vue';
import PreferencesEditForm from './components/preferences/EditForm.vue';
import NavigationView from './components/navigation/View.vue';
import TaxonomyCreateForm from './components/taxonomies/CreateForm.vue';
import TaxonomyEditForm from './components/taxonomies/EditForm.vue';
import TaxonomyBlueprintListing from './components/taxonomies/BlueprintListing.vue';
import AssetContainerCreateForm from './components/asset-containers/CreateForm.vue';
import AssetContainerEditForm from './components/asset-containers/EditForm.vue';
import NavBuilder from './components/nav/Builder.vue';
import Updater from './components/updater/Updater.vue';
import PortalTargets from './components/PortalTargets.vue';


Statamic.app({
 el: '#statamic',
Expand All@@ -108,51 +160,51 @@ Statamic.app({
 store: Statamic.$store,

 components: {
 GlobalSearch: require('./components/GlobalSearch.vue').default,
 GlobalSiteSelector: require('./components/GlobalSiteSelector.vue').default,
 Login: require('./components/login/login'),
 LoginModal: require('./components/login/LoginModal.vue').default,
 BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
 BaseTermCreateForm: require('./components/terms/BaseCreateForm.vue').default,
 CreateTermButton: require('./components/terms/CreateTermButton.vue').default,
 Importer: require('./components/importer/importer'),
 FieldsetListing: require('./components/fieldsets/Listing.vue').default,
 FieldsetCreateForm: require('./components/fieldsets/CreateForm.vue').default,
 FieldsetEditForm: require('./components/fieldsets/EditForm.vue').default,
 BlueprintListing: require('./components/blueprints/Listing.vue').default,
 BlueprintBuilder: require('./components/blueprints/Builder.vue').default,
 FormCreateForm: require('./components/forms/CreateForm.vue').default,
 FormListing: require('./components/forms/Listing.vue').default,
 FormSubmissionListing: require('./components/forms/SubmissionListing.vue').default,
 GlobalListing: require('./components/globals/Listing.vue').default,
 GlobalEditForm: require('./components/globals/EditForm.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,
 CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
 CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
 CollectionEditForm: require('./components/collections/EditForm.vue').default,
 CollectionView: require('./components/collections/View.vue').default,
 CollectionBlueprintListing: require('./components/collections/BlueprintListing.vue').default,
 SessionExpiry: require('./components/SessionExpiry.vue').default,
 NavigationListing: require('./components/navigation/Listing.vue').default,
 NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
 NavigationEditForm: require('./components/navigation/EditForm.vue').default,
 PreferencesEditForm: require('./components/preferences/EditForm.vue').default,
 NavigationView: require('./components/navigation/View.vue').default,
 TaxonomyCreateForm: require('./components/taxonomies/CreateForm.vue').default,
 TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
 TaxonomyBlueprintListing: require('./components/taxonomies/BlueprintListing.vue').default,
 AssetContainerCreateForm: require('./components/asset-containers/CreateForm.vue').default,
 AssetContainerEditForm: require('./components/asset-containers/EditForm.vue').default,
 NavBuilder: require('./components/nav/Builder.vue').default,
 Updater: require('./components/updater/Updater.vue').default,
 PortalTargets: require('./components/PortalTargets.vue').default,
 GlobalSearch,
 GlobalSiteSelector,
 Login,
 LoginModal,
 BaseEntryCreateForm,
 BaseTermCreateForm,
 CreateTermButton,
 Importer,
 FieldsetListing,
 FieldsetCreateForm,
 FieldsetEditForm,
 BlueprintListing,
 BlueprintBuilder,
 FormCreateForm,
 FormListing,
 FormSubmissionListing,
 GlobalListing,
 GlobalEditForm,
 GlobalPublishForm,
 GlobalCreateForm,
 UserListing,
 UserWizard,
 RoleListing,
 RolePublishForm,
 UserGroupListing,
 UserGroupPublishForm,
 CollectionCreateForm,
 CollectionScaffolder,
 CollectionEditForm,
 CollectionView,
 CollectionBlueprintListing,
 SessionExpiry,
 NavigationListing,
 NavigationCreateForm,
 NavigationEditForm,
 PreferencesEditForm,
 NavigationView,
 TaxonomyCreateForm,
 TaxonomyEditForm,
 TaxonomyBlueprintListing,
 AssetContainerCreateForm,
 AssetContainerEditForm,
 NavBuilder,
 Updater,
 PortalTargets,
 },

 data: {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[4.x] Migrate to Vite#7485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 13 commits into

from

Feb 7, 2023
 Merged


[4.x] Migrate to Vite
#7485
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
96b8cc4

wip


jasonvarga Feb 6, 2023
6370531

read valet tls from env file


jasonvarga Feb 7, 2023
9eb891b

require @babel/preset-env for jest. it worked previously because lara…


jasonvarga Feb 7, 2023
f608be5

Put config in a regular script rather than base64 encoding the whole …


jasonvarga Feb 7, 2023
7219b82

Don't use vite in tests


jasonvarga Feb 7, 2023
567fbe4

Remove jquery ui


jasonvarga Feb 7, 2023
27a8255

remove now unnecessary file


jasonvarga Feb 7, 2023
8fede77

Merge branch 'master' into vite


jasonvarga Feb 7, 2023
e959235

Require version of laravel that supports vite


jasonvarga Feb 7, 2023
2726a20

there was a vite bug. but instead of bumping just to the fix, bump al…


jasonvarga Feb 7, 2023
0e30582

apply to frontend.


jasonvarga Feb 7, 2023
2a5f116

Use the updated npm commands


jasonvarga Feb 7, 2023
25840e9

defer so things like Statamic and Fieldtype are available to scripts


jasonvarga Feb 7, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.github/workflows/release.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,10 @@ jobs:
 run: npm ci

 - name: Compile assets
 run: npm run production
 run: npm run build

 - name: Compile frontend assets
 run: npm run frontend-prod
 run: npm run frontend-build

 - name: Create dist zip
 run: cd resources && tar -czvf dist.tar.gz dist
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,4 @@ tests/Fakes/Composer/Package/test-package/composer.json
resources/dist
resources/dist-frontend
composer.lock
.env

2 changes: 1 addition & 1 deletion
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
 "facade/ignition-contracts": "^1.0",
 "guzzlehttp/guzzle": "^6.3 || ^7.0",
 "james-heinrich/getid3": "^1.9.21",
 "laravel/framework": "^9.0",
 "laravel/framework": "^9.49.0",
 "laravel/helpers": "^1.1",
 "league/commonmark": "^1.5 || ^2.2",
 "league/csv": "^9.0",
Expand Down

30,953 changes: 9,676 additions & 21,277 deletions
package-lock.json

View file


Open in desktop


Large diffs are not rendered by default.


28 changes: 11 additions & 17 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,13 @@
 "name": "statamic",
 "private": true,
 "scripts": {
 "dev": "npm run development",
 "development": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch-poll": "npm run watch -- --watch-poll",
 "hot": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
 "prod": "npm run production",
 "production": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "dev": "vite",
 "build": "vite build",
 "svgo": "svgo -f ./resources/svg/ -r",
 "test": "cross-env NODE_ENV=test jest --silent",
 "test-watch": "npm run test -- --watch --notify",
 "frontend-dev": "npm run development -- --env.mixfile=frontend.mix",
 "frontend-prod": "npm run production -- --env.mixfile=frontend.mix",
 "frontend-watch": "npm run watch -- --env.mixfile=frontend.mix"
 "frontend-dev": "vite -c vite-frontend.config.js",
 "frontend-build": "vite build -c vite-frontend.config.js"
 },
 "dependencies": {
 "@popperjs/core": "^2.5.3",
Expand DownExpand Up@@ -56,14 +50,13 @@
 "body-scroll-lock": "^2.6.4",
 "codemirror": "^5.58.2",
 "cookies-js": "^1.2.2",
 "dmuploader": "file:resources/js/vendor/dmuploader",
 "dm-file-uploader": "^1.0.2",
 "dropzone": "^4.0.1",
 "element-resize-detector": "^1.2.1",
 "fuse.js": "^3.4.6",
 "generate-password": "^1.5.1",
 "highlight.js": "^9.18.1",
 "jquery": "^3.5.0",
 "jquery-ui": "file:resources/js/vendor/jquery-ui",
 "laravel-echo": "^1.6.1",
 "lowlight": "^2.6.1",
 "luminous-lightbox": "^0.2.0",
Expand All@@ -90,7 +83,7 @@
 "v-calendar": "^2.3.0",
 "v-tooltip": "^2.0.3",
 "validator": "^13.7.0",
 "vue": "^2.6.11",
 "vue": "^2.7.14",
 "vue-clickaway": "~2.2.2",
 "vue-countable": "^1.0.9",
 "vue-draggable-nested-tree": "^2.2.20",
Expand All@@ -102,15 +95,16 @@
 "vuex": "^3.1.2"
 },
 "devDependencies": {
 "@babel/preset-env": "^7.20.2",
 "@rollup/plugin-inject": "^5.0.3",
 "@vitejs/plugin-vue2": "^2.2.0",
 "babel-jest": "^24.9.0",
 "cross-env": "^5.2.1",
 "jest": "^24.9.0",
 "kind-of": ">=6.0.3",
 "laravel-mix": "^5.0.9",
 "sass": "^1.26.2",
 "sass-loader": "^8.0.2",
 "laravel-vite-plugin": "^0.7.2",
 "tailwindcss": "^1.9.0",
 "vue-template-compiler": "^2.6.11"
 "vite": "^4.0.0"
 },
 "jest": {
 "roots": [
Expand Down

6 changes: 6 additions & 0 deletions
postcss.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
module.exports = {
 plugins: [
 require('tailwindcss'),
 require('autoprefixer'),
 ],
};

190 changes: 121 additions & 69 deletions
resources/js/app.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,31 +4,34 @@ import Statamic from './components/Statamic.js';
import Alpine from 'alpinejs'
import * as Globals from './bootstrap/globals'
import { default as underscore } from 'underscore'
import Cookies from 'cookies-js';
import jQuery from 'jquery';
import rangy from 'rangy';

let global_functions = Object.keys(Globals)
global_functions.forEach(fnName => { global[fnName] = Globals[fnName] })
global.Cookies = require('cookies-js');
global_functions.forEach(fnName => { window[fnName] = Globals[fnName] })

Vue.config.silent = false;
Vue.config.devtools = true;
Vue.config.productionTip = false

window.Cookies = Cookies;
window.Alpine = Alpine
window.Vue = Vue;
window.Statamic = Statamic;
window._ = underscore;
window.$ = window.jQuery = require('jquery');
window.rangy = require('rangy');

require('./bootstrap/polyfills');
require('./bootstrap/underscore-mixins');
require('./bootstrap/jquery-plugins');
require('./bootstrap/plugins');
require('./bootstrap/filters');
require('./bootstrap/mixins');
require('./bootstrap/components');
require('./bootstrap/fieldtypes');
require('./bootstrap/directives');
window.$ = window.jQuery = jQuery;
window.rangy = rangy;

import './bootstrap/polyfills';
import './bootstrap/underscore-mixins';
import './bootstrap/jquery-plugins';
import './bootstrap/plugins';
import './bootstrap/filters';
import './bootstrap/mixins';
import './bootstrap/components';
import './bootstrap/fieldtypes';
import './bootstrap/directives';

import axios from 'axios';
import PortalVue from "portal-vue";
Expand DownExpand Up@@ -69,7 +72,8 @@ Vue.prototype.$echo = Statamic.$echo;
Vue.prototype.$bard = Statamic.$bard;
Vue.prototype.$keys = Statamic.$keys;

window.moment = Vue.moment = Vue.prototype.$moment = require('moment');
import Moment from 'moment';
window.moment = Vue.moment = Vue.prototype.$moment = Moment;

Vue.use(Popover, { tooltip: true })
Vue.use(PortalVue)
Expand All@@ -90,15 +94,63 @@ Statamic.$store = new Vuex.Store({
 }
});

require('./components/ToastBus');
require('./components/ModalBus');
require('./components/stacks/Stacks');
require('./components/panes/Panes');
require('./components/ProgressBar');
require('./components/DirtyState');
require('./components/Config');
require('./components/Preference');
require('./components/Permission');
import './components/ToastBus';
import './components/ModalBus';
import './components/stacks/Stacks';
import './components/panes/Panes';
import './components/ProgressBar';
import './components/DirtyState';
import './components/Config';
import './components/Preference';
import './components/Permission';


import GlobalSearch from './components/GlobalSearch.vue';
import GlobalSiteSelector from './components/GlobalSiteSelector.vue';
import Login from './components/login/login';
import LoginModal from './components/login/LoginModal.vue';
import BaseEntryCreateForm from './components/entries/BaseCreateForm.vue';
import BaseTermCreateForm from './components/terms/BaseCreateForm.vue';
import CreateTermButton from './components/terms/CreateTermButton.vue';
import Importer from './components/importer/importer';
import FieldsetListing from './components/fieldsets/Listing.vue';
import FieldsetCreateForm from './components/fieldsets/CreateForm.vue';
import FieldsetEditForm from './components/fieldsets/EditForm.vue';
import BlueprintListing from './components/blueprints/Listing.vue';
import BlueprintBuilder from './components/blueprints/Builder.vue';
import FormCreateForm from './components/forms/CreateForm.vue';
import FormListing from './components/forms/Listing.vue';
import FormSubmissionListing from './components/forms/SubmissionListing.vue';
import GlobalListing from './components/globals/Listing.vue';
import GlobalEditForm from './components/globals/EditForm.vue';
import GlobalPublishForm from './components/globals/PublishForm.vue';
import GlobalCreateForm from './components/globals/Create.vue';
import UserListing from './components/users/Listing.vue';
import UserWizard from './components/users/Wizard.vue';
import RoleListing from './components/roles/Listing.vue';
import RolePublishForm from './components/roles/PublishForm.vue';
import UserGroupListing from './components/user-groups/Listing.vue';
import UserGroupPublishForm from './components/user-groups/PublishForm.vue';
import CollectionCreateForm from './components/collections/CreateForm.vue';
import CollectionScaffolder from './components/collections/Scaffolder.vue';
import CollectionEditForm from './components/collections/EditForm.vue';
import CollectionView from './components/collections/View.vue';
import CollectionBlueprintListing from './components/collections/BlueprintListing.vue';
import SessionExpiry from './components/SessionExpiry.vue';
import NavigationListing from './components/navigation/Listing.vue';
import NavigationCreateForm from './components/navigation/CreateForm.vue';
import NavigationEditForm from './components/navigation/EditForm.vue';
import PreferencesEditForm from './components/preferences/EditForm.vue';
import NavigationView from './components/navigation/View.vue';
import TaxonomyCreateForm from './components/taxonomies/CreateForm.vue';
import TaxonomyEditForm from './components/taxonomies/EditForm.vue';
import TaxonomyBlueprintListing from './components/taxonomies/BlueprintListing.vue';
import AssetContainerCreateForm from './components/asset-containers/CreateForm.vue';
import AssetContainerEditForm from './components/asset-containers/EditForm.vue';
import NavBuilder from './components/nav/Builder.vue';
import Updater from './components/updater/Updater.vue';
import PortalTargets from './components/PortalTargets.vue';


Statamic.app({
 el: '#statamic',
Expand All@@ -108,51 +160,51 @@ Statamic.app({
 store: Statamic.$store,

 components: {
 GlobalSearch: require('./components/GlobalSearch.vue').default,
 GlobalSiteSelector: require('./components/GlobalSiteSelector.vue').default,
 Login: require('./components/login/login'),
 LoginModal: require('./components/login/LoginModal.vue').default,
 BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
 BaseTermCreateForm: require('./components/terms/BaseCreateForm.vue').default,
 CreateTermButton: require('./components/terms/CreateTermButton.vue').default,
 Importer: require('./components/importer/importer'),
 FieldsetListing: require('./components/fieldsets/Listing.vue').default,
 FieldsetCreateForm: require('./components/fieldsets/CreateForm.vue').default,
 FieldsetEditForm: require('./components/fieldsets/EditForm.vue').default,
 BlueprintListing: require('./components/blueprints/Listing.vue').default,
 BlueprintBuilder: require('./components/blueprints/Builder.vue').default,
 FormCreateForm: require('./components/forms/CreateForm.vue').default,
 FormListing: require('./components/forms/Listing.vue').default,
 FormSubmissionListing: require('./components/forms/SubmissionListing.vue').default,
 GlobalListing: require('./components/globals/Listing.vue').default,
 GlobalEditForm: require('./components/globals/EditForm.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,
 CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
 CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
 CollectionEditForm: require('./components/collections/EditForm.vue').default,
 CollectionView: require('./components/collections/View.vue').default,
 CollectionBlueprintListing: require('./components/collections/BlueprintListing.vue').default,
 SessionExpiry: require('./components/SessionExpiry.vue').default,
 NavigationListing: require('./components/navigation/Listing.vue').default,
 NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
 NavigationEditForm: require('./components/navigation/EditForm.vue').default,
 PreferencesEditForm: require('./components/preferences/EditForm.vue').default,
 NavigationView: require('./components/navigation/View.vue').default,
 TaxonomyCreateForm: require('./components/taxonomies/CreateForm.vue').default,
 TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
 TaxonomyBlueprintListing: require('./components/taxonomies/BlueprintListing.vue').default,
 AssetContainerCreateForm: require('./components/asset-containers/CreateForm.vue').default,
 AssetContainerEditForm: require('./components/asset-containers/EditForm.vue').default,
 NavBuilder: require('./components/nav/Builder.vue').default,
 Updater: require('./components/updater/Updater.vue').default,
 PortalTargets: require('./components/PortalTargets.vue').default,
 GlobalSearch,
 GlobalSiteSelector,
 Login,
 LoginModal,
 BaseEntryCreateForm,
 BaseTermCreateForm,
 CreateTermButton,
 Importer,
 FieldsetListing,
 FieldsetCreateForm,
 FieldsetEditForm,
 BlueprintListing,
 BlueprintBuilder,
 FormCreateForm,
 FormListing,
 FormSubmissionListing,
 GlobalListing,
 GlobalEditForm,
 GlobalPublishForm,
 GlobalCreateForm,
 UserListing,
 UserWizard,
 RoleListing,
 RolePublishForm,
 UserGroupListing,
 UserGroupPublishForm,
 CollectionCreateForm,
 CollectionScaffolder,
 CollectionEditForm,
 CollectionView,
 CollectionBlueprintListing,
 SessionExpiry,
 NavigationListing,
 NavigationCreateForm,
 NavigationEditForm,
 PreferencesEditForm,
 NavigationView,
 TaxonomyCreateForm,
 TaxonomyEditForm,
 TaxonomyBlueprintListing,
 AssetContainerCreateForm,
 AssetContainerEditForm,
 NavBuilder,
 Updater,
 PortalTargets,
 },

 data: {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[4.x] Migrate to Vite#7485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 13 commits into

from

Feb 7, 2023
 Merged


[4.x] Migrate to Vite
#7485
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
96b8cc4

wip


jasonvarga Feb 6, 2023
6370531

read valet tls from env file


jasonvarga Feb 7, 2023
9eb891b

require @babel/preset-env for jest. it worked previously because lara…


jasonvarga Feb 7, 2023
f608be5

Put config in a regular script rather than base64 encoding the whole …


jasonvarga Feb 7, 2023
7219b82

Don't use vite in tests


jasonvarga Feb 7, 2023
567fbe4

Remove jquery ui


jasonvarga Feb 7, 2023
27a8255

remove now unnecessary file


jasonvarga Feb 7, 2023
8fede77

Merge branch 'master' into vite


jasonvarga Feb 7, 2023
e959235

Require version of laravel that supports vite


jasonvarga Feb 7, 2023
2726a20

there was a vite bug. but instead of bumping just to the fix, bump al…


jasonvarga Feb 7, 2023
0e30582

apply to frontend.


jasonvarga Feb 7, 2023
2a5f116

Use the updated npm commands


jasonvarga Feb 7, 2023
25840e9

defer so things like Statamic and Fieldtype are available to scripts


jasonvarga Feb 7, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.github/workflows/release.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,10 @@ jobs:
 run: npm ci

 - name: Compile assets
 run: npm run production
 run: npm run build

 - name: Compile frontend assets
 run: npm run frontend-prod
 run: npm run frontend-build

 - name: Create dist zip
 run: cd resources && tar -czvf dist.tar.gz dist
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,4 @@ tests/Fakes/Composer/Package/test-package/composer.json
resources/dist
resources/dist-frontend
composer.lock
.env

2 changes: 1 addition & 1 deletion
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
 "facade/ignition-contracts": "^1.0",
 "guzzlehttp/guzzle": "^6.3 || ^7.0",
 "james-heinrich/getid3": "^1.9.21",
 "laravel/framework": "^9.0",
 "laravel/framework": "^9.49.0",
 "laravel/helpers": "^1.1",
 "league/commonmark": "^1.5 || ^2.2",
 "league/csv": "^9.0",
Expand Down

30,953 changes: 9,676 additions & 21,277 deletions
package-lock.json

View file


Open in desktop


Large diffs are not rendered by default.


28 changes: 11 additions & 17 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,13 @@
 "name": "statamic",
 "private": true,
 "scripts": {
 "dev": "npm run development",
 "development": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch-poll": "npm run watch -- --watch-poll",
 "hot": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
 "prod": "npm run production",
 "production": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "dev": "vite",
 "build": "vite build",
 "svgo": "svgo -f ./resources/svg/ -r",
 "test": "cross-env NODE_ENV=test jest --silent",
 "test-watch": "npm run test -- --watch --notify",
 "frontend-dev": "npm run development -- --env.mixfile=frontend.mix",
 "frontend-prod": "npm run production -- --env.mixfile=frontend.mix",
 "frontend-watch": "npm run watch -- --env.mixfile=frontend.mix"
 "frontend-dev": "vite -c vite-frontend.config.js",
 "frontend-build": "vite build -c vite-frontend.config.js"
 },
 "dependencies": {
 "@popperjs/core": "^2.5.3",
Expand DownExpand Up@@ -56,14 +50,13 @@
 "body-scroll-lock": "^2.6.4",
 "codemirror": "^5.58.2",
 "cookies-js": "^1.2.2",
 "dmuploader": "file:resources/js/vendor/dmuploader",
 "dm-file-uploader": "^1.0.2",
 "dropzone": "^4.0.1",
 "element-resize-detector": "^1.2.1",
 "fuse.js": "^3.4.6",
 "generate-password": "^1.5.1",
 "highlight.js": "^9.18.1",
 "jquery": "^3.5.0",
 "jquery-ui": "file:resources/js/vendor/jquery-ui",
 "laravel-echo": "^1.6.1",
 "lowlight": "^2.6.1",
 "luminous-lightbox": "^0.2.0",
Expand All@@ -90,7 +83,7 @@
 "v-calendar": "^2.3.0",
 "v-tooltip": "^2.0.3",
 "validator": "^13.7.0",
 "vue": "^2.6.11",
 "vue": "^2.7.14",
 "vue-clickaway": "~2.2.2",
 "vue-countable": "^1.0.9",
 "vue-draggable-nested-tree": "^2.2.20",
Expand All@@ -102,15 +95,16 @@
 "vuex": "^3.1.2"
 },
 "devDependencies": {
 "@babel/preset-env": "^7.20.2",
 "@rollup/plugin-inject": "^5.0.3",
 "@vitejs/plugin-vue2": "^2.2.0",
 "babel-jest": "^24.9.0",
 "cross-env": "^5.2.1",
 "jest": "^24.9.0",
 "kind-of": ">=6.0.3",
 "laravel-mix": "^5.0.9",
 "sass": "^1.26.2",
 "sass-loader": "^8.0.2",
 "laravel-vite-plugin": "^0.7.2",
 "tailwindcss": "^1.9.0",
 "vue-template-compiler": "^2.6.11"
 "vite": "^4.0.0"
 },
 "jest": {
 "roots": [
Expand Down

6 changes: 6 additions & 0 deletions
postcss.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
module.exports = {
 plugins: [
 require('tailwindcss'),
 require('autoprefixer'),
 ],
};

190 changes: 121 additions & 69 deletions
resources/js/app.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,31 +4,34 @@ import Statamic from './components/Statamic.js';
import Alpine from 'alpinejs'
import * as Globals from './bootstrap/globals'
import { default as underscore } from 'underscore'
import Cookies from 'cookies-js';
import jQuery from 'jquery';
import rangy from 'rangy';

let global_functions = Object.keys(Globals)
global_functions.forEach(fnName => { global[fnName] = Globals[fnName] })
global.Cookies = require('cookies-js');
global_functions.forEach(fnName => { window[fnName] = Globals[fnName] })

Vue.config.silent = false;
Vue.config.devtools = true;
Vue.config.productionTip = false

window.Cookies = Cookies;
window.Alpine = Alpine
window.Vue = Vue;
window.Statamic = Statamic;
window._ = underscore;
window.$ = window.jQuery = require('jquery');
window.rangy = require('rangy');

require('./bootstrap/polyfills');
require('./bootstrap/underscore-mixins');
require('./bootstrap/jquery-plugins');
require('./bootstrap/plugins');
require('./bootstrap/filters');
require('./bootstrap/mixins');
require('./bootstrap/components');
require('./bootstrap/fieldtypes');
require('./bootstrap/directives');
window.$ = window.jQuery = jQuery;
window.rangy = rangy;

import './bootstrap/polyfills';
import './bootstrap/underscore-mixins';
import './bootstrap/jquery-plugins';
import './bootstrap/plugins';
import './bootstrap/filters';
import './bootstrap/mixins';
import './bootstrap/components';
import './bootstrap/fieldtypes';
import './bootstrap/directives';

import axios from 'axios';
import PortalVue from "portal-vue";
Expand DownExpand Up@@ -69,7 +72,8 @@ Vue.prototype.$echo = Statamic.$echo;
Vue.prototype.$bard = Statamic.$bard;
Vue.prototype.$keys = Statamic.$keys;

window.moment = Vue.moment = Vue.prototype.$moment = require('moment');
import Moment from 'moment';
window.moment = Vue.moment = Vue.prototype.$moment = Moment;

Vue.use(Popover, { tooltip: true })
Vue.use(PortalVue)
Expand All@@ -90,15 +94,63 @@ Statamic.$store = new Vuex.Store({
 }
});

require('./components/ToastBus');
require('./components/ModalBus');
require('./components/stacks/Stacks');
require('./components/panes/Panes');
require('./components/ProgressBar');
require('./components/DirtyState');
require('./components/Config');
require('./components/Preference');
require('./components/Permission');
import './components/ToastBus';
import './components/ModalBus';
import './components/stacks/Stacks';
import './components/panes/Panes';
import './components/ProgressBar';
import './components/DirtyState';
import './components/Config';
import './components/Preference';
import './components/Permission';


import GlobalSearch from './components/GlobalSearch.vue';
import GlobalSiteSelector from './components/GlobalSiteSelector.vue';
import Login from './components/login/login';
import LoginModal from './components/login/LoginModal.vue';
import BaseEntryCreateForm from './components/entries/BaseCreateForm.vue';
import BaseTermCreateForm from './components/terms/BaseCreateForm.vue';
import CreateTermButton from './components/terms/CreateTermButton.vue';
import Importer from './components/importer/importer';
import FieldsetListing from './components/fieldsets/Listing.vue';
import FieldsetCreateForm from './components/fieldsets/CreateForm.vue';
import FieldsetEditForm from './components/fieldsets/EditForm.vue';
import BlueprintListing from './components/blueprints/Listing.vue';
import BlueprintBuilder from './components/blueprints/Builder.vue';
import FormCreateForm from './components/forms/CreateForm.vue';
import FormListing from './components/forms/Listing.vue';
import FormSubmissionListing from './components/forms/SubmissionListing.vue';
import GlobalListing from './components/globals/Listing.vue';
import GlobalEditForm from './components/globals/EditForm.vue';
import GlobalPublishForm from './components/globals/PublishForm.vue';
import GlobalCreateForm from './components/globals/Create.vue';
import UserListing from './components/users/Listing.vue';
import UserWizard from './components/users/Wizard.vue';
import RoleListing from './components/roles/Listing.vue';
import RolePublishForm from './components/roles/PublishForm.vue';
import UserGroupListing from './components/user-groups/Listing.vue';
import UserGroupPublishForm from './components/user-groups/PublishForm.vue';
import CollectionCreateForm from './components/collections/CreateForm.vue';
import CollectionScaffolder from './components/collections/Scaffolder.vue';
import CollectionEditForm from './components/collections/EditForm.vue';
import CollectionView from './components/collections/View.vue';
import CollectionBlueprintListing from './components/collections/BlueprintListing.vue';
import SessionExpiry from './components/SessionExpiry.vue';
import NavigationListing from './components/navigation/Listing.vue';
import NavigationCreateForm from './components/navigation/CreateForm.vue';
import NavigationEditForm from './components/navigation/EditForm.vue';
import PreferencesEditForm from './components/preferences/EditForm.vue';
import NavigationView from './components/navigation/View.vue';
import TaxonomyCreateForm from './components/taxonomies/CreateForm.vue';
import TaxonomyEditForm from './components/taxonomies/EditForm.vue';
import TaxonomyBlueprintListing from './components/taxonomies/BlueprintListing.vue';
import AssetContainerCreateForm from './components/asset-containers/CreateForm.vue';
import AssetContainerEditForm from './components/asset-containers/EditForm.vue';
import NavBuilder from './components/nav/Builder.vue';
import Updater from './components/updater/Updater.vue';
import PortalTargets from './components/PortalTargets.vue';


Statamic.app({
 el: '#statamic',
Expand All@@ -108,51 +160,51 @@ Statamic.app({
 store: Statamic.$store,

 components: {
 GlobalSearch: require('./components/GlobalSearch.vue').default,
 GlobalSiteSelector: require('./components/GlobalSiteSelector.vue').default,
 Login: require('./components/login/login'),
 LoginModal: require('./components/login/LoginModal.vue').default,
 BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
 BaseTermCreateForm: require('./components/terms/BaseCreateForm.vue').default,
 CreateTermButton: require('./components/terms/CreateTermButton.vue').default,
 Importer: require('./components/importer/importer'),
 FieldsetListing: require('./components/fieldsets/Listing.vue').default,
 FieldsetCreateForm: require('./components/fieldsets/CreateForm.vue').default,
 FieldsetEditForm: require('./components/fieldsets/EditForm.vue').default,
 BlueprintListing: require('./components/blueprints/Listing.vue').default,
 BlueprintBuilder: require('./components/blueprints/Builder.vue').default,
 FormCreateForm: require('./components/forms/CreateForm.vue').default,
 FormListing: require('./components/forms/Listing.vue').default,
 FormSubmissionListing: require('./components/forms/SubmissionListing.vue').default,
 GlobalListing: require('./components/globals/Listing.vue').default,
 GlobalEditForm: require('./components/globals/EditForm.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,
 CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
 CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
 CollectionEditForm: require('./components/collections/EditForm.vue').default,
 CollectionView: require('./components/collections/View.vue').default,
 CollectionBlueprintListing: require('./components/collections/BlueprintListing.vue').default,
 SessionExpiry: require('./components/SessionExpiry.vue').default,
 NavigationListing: require('./components/navigation/Listing.vue').default,
 NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
 NavigationEditForm: require('./components/navigation/EditForm.vue').default,
 PreferencesEditForm: require('./components/preferences/EditForm.vue').default,
 NavigationView: require('./components/navigation/View.vue').default,
 TaxonomyCreateForm: require('./components/taxonomies/CreateForm.vue').default,
 TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
 TaxonomyBlueprintListing: require('./components/taxonomies/BlueprintListing.vue').default,
 AssetContainerCreateForm: require('./components/asset-containers/CreateForm.vue').default,
 AssetContainerEditForm: require('./components/asset-containers/EditForm.vue').default,
 NavBuilder: require('./components/nav/Builder.vue').default,
 Updater: require('./components/updater/Updater.vue').default,
 PortalTargets: require('./components/PortalTargets.vue').default,
 GlobalSearch,
 GlobalSiteSelector,
 Login,
 LoginModal,
 BaseEntryCreateForm,
 BaseTermCreateForm,
 CreateTermButton,
 Importer,
 FieldsetListing,
 FieldsetCreateForm,
 FieldsetEditForm,
 BlueprintListing,
 BlueprintBuilder,
 FormCreateForm,
 FormListing,
 FormSubmissionListing,
 GlobalListing,
 GlobalEditForm,
 GlobalPublishForm,
 GlobalCreateForm,
 UserListing,
 UserWizard,
 RoleListing,
 RolePublishForm,
 UserGroupListing,
 UserGroupPublishForm,
 CollectionCreateForm,
 CollectionScaffolder,
 CollectionEditForm,
 CollectionView,
 CollectionBlueprintListing,
 SessionExpiry,
 NavigationListing,
 NavigationCreateForm,
 NavigationEditForm,
 PreferencesEditForm,
 NavigationView,
 TaxonomyCreateForm,
 TaxonomyEditForm,
 TaxonomyBlueprintListing,
 AssetContainerCreateForm,
 AssetContainerEditForm,
 NavBuilder,
 Updater,
 PortalTargets,
 },

 data: {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[4.x] Migrate to Vite#7485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 13 commits into

from

Feb 7, 2023
 Merged


[4.x] Migrate to Vite
#7485
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
96b8cc4

wip


jasonvarga Feb 6, 2023
6370531

read valet tls from env file


jasonvarga Feb 7, 2023
9eb891b

require @babel/preset-env for jest. it worked previously because lara…


jasonvarga Feb 7, 2023
f608be5

Put config in a regular script rather than base64 encoding the whole …


jasonvarga Feb 7, 2023
7219b82

Don't use vite in tests


jasonvarga Feb 7, 2023
567fbe4

Remove jquery ui


jasonvarga Feb 7, 2023
27a8255

remove now unnecessary file


jasonvarga Feb 7, 2023
8fede77

Merge branch 'master' into vite


jasonvarga Feb 7, 2023
e959235

Require version of laravel that supports vite


jasonvarga Feb 7, 2023
2726a20

there was a vite bug. but instead of bumping just to the fix, bump al…


jasonvarga Feb 7, 2023
0e30582

apply to frontend.


jasonvarga Feb 7, 2023
2a5f116

Use the updated npm commands


jasonvarga Feb 7, 2023
25840e9

defer so things like Statamic and Fieldtype are available to scripts


jasonvarga Feb 7, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.github/workflows/release.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,10 @@ jobs:
 run: npm ci

 - name: Compile assets
 run: npm run production
 run: npm run build

 - name: Compile frontend assets
 run: npm run frontend-prod
 run: npm run frontend-build

 - name: Create dist zip
 run: cd resources && tar -czvf dist.tar.gz dist
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,4 @@ tests/Fakes/Composer/Package/test-package/composer.json
resources/dist
resources/dist-frontend
composer.lock
.env

2 changes: 1 addition & 1 deletion
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
 "facade/ignition-contracts": "^1.0",
 "guzzlehttp/guzzle": "^6.3 || ^7.0",
 "james-heinrich/getid3": "^1.9.21",
 "laravel/framework": "^9.0",
 "laravel/framework": "^9.49.0",
 "laravel/helpers": "^1.1",
 "league/commonmark": "^1.5 || ^2.2",
 "league/csv": "^9.0",
Expand Down

30,953 changes: 9,676 additions & 21,277 deletions
package-lock.json

View file


Open in desktop


Large diffs are not rendered by default.


28 changes: 11 additions & 17 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,13 @@
 "name": "statamic",
 "private": true,
 "scripts": {
 "dev": "npm run development",
 "development": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch-poll": "npm run watch -- --watch-poll",
 "hot": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
 "prod": "npm run production",
 "production": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "dev": "vite",
 "build": "vite build",
 "svgo": "svgo -f ./resources/svg/ -r",
 "test": "cross-env NODE_ENV=test jest --silent",
 "test-watch": "npm run test -- --watch --notify",
 "frontend-dev": "npm run development -- --env.mixfile=frontend.mix",
 "frontend-prod": "npm run production -- --env.mixfile=frontend.mix",
 "frontend-watch": "npm run watch -- --env.mixfile=frontend.mix"
 "frontend-dev": "vite -c vite-frontend.config.js",
 "frontend-build": "vite build -c vite-frontend.config.js"
 },
 "dependencies": {
 "@popperjs/core": "^2.5.3",
Expand DownExpand Up@@ -56,14 +50,13 @@
 "body-scroll-lock": "^2.6.4",
 "codemirror": "^5.58.2",
 "cookies-js": "^1.2.2",
 "dmuploader": "file:resources/js/vendor/dmuploader",
 "dm-file-uploader": "^1.0.2",
 "dropzone": "^4.0.1",
 "element-resize-detector": "^1.2.1",
 "fuse.js": "^3.4.6",
 "generate-password": "^1.5.1",
 "highlight.js": "^9.18.1",
 "jquery": "^3.5.0",
 "jquery-ui": "file:resources/js/vendor/jquery-ui",
 "laravel-echo": "^1.6.1",
 "lowlight": "^2.6.1",
 "luminous-lightbox": "^0.2.0",
Expand All@@ -90,7 +83,7 @@
 "v-calendar": "^2.3.0",
 "v-tooltip": "^2.0.3",
 "validator": "^13.7.0",
 "vue": "^2.6.11",
 "vue": "^2.7.14",
 "vue-clickaway": "~2.2.2",
 "vue-countable": "^1.0.9",
 "vue-draggable-nested-tree": "^2.2.20",
Expand All@@ -102,15 +95,16 @@
 "vuex": "^3.1.2"
 },
 "devDependencies": {
 "@babel/preset-env": "^7.20.2",
 "@rollup/plugin-inject": "^5.0.3",
 "@vitejs/plugin-vue2": "^2.2.0",
 "babel-jest": "^24.9.0",
 "cross-env": "^5.2.1",
 "jest": "^24.9.0",
 "kind-of": ">=6.0.3",
 "laravel-mix": "^5.0.9",
 "sass": "^1.26.2",
 "sass-loader": "^8.0.2",
 "laravel-vite-plugin": "^0.7.2",
 "tailwindcss": "^1.9.0",
 "vue-template-compiler": "^2.6.11"
 "vite": "^4.0.0"
 },
 "jest": {
 "roots": [
Expand Down

6 changes: 6 additions & 0 deletions
postcss.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
module.exports = {
 plugins: [
 require('tailwindcss'),
 require('autoprefixer'),
 ],
};

190 changes: 121 additions & 69 deletions
resources/js/app.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,31 +4,34 @@ import Statamic from './components/Statamic.js';
import Alpine from 'alpinejs'
import * as Globals from './bootstrap/globals'
import { default as underscore } from 'underscore'
import Cookies from 'cookies-js';
import jQuery from 'jquery';
import rangy from 'rangy';

let global_functions = Object.keys(Globals)
global_functions.forEach(fnName => { global[fnName] = Globals[fnName] })
global.Cookies = require('cookies-js');
global_functions.forEach(fnName => { window[fnName] = Globals[fnName] })

Vue.config.silent = false;
Vue.config.devtools = true;
Vue.config.productionTip = false

window.Cookies = Cookies;
window.Alpine = Alpine
window.Vue = Vue;
window.Statamic = Statamic;
window._ = underscore;
window.$ = window.jQuery = require('jquery');
window.rangy = require('rangy');

require('./bootstrap/polyfills');
require('./bootstrap/underscore-mixins');
require('./bootstrap/jquery-plugins');
require('./bootstrap/plugins');
require('./bootstrap/filters');
require('./bootstrap/mixins');
require('./bootstrap/components');
require('./bootstrap/fieldtypes');
require('./bootstrap/directives');
window.$ = window.jQuery = jQuery;
window.rangy = rangy;

import './bootstrap/polyfills';
import './bootstrap/underscore-mixins';
import './bootstrap/jquery-plugins';
import './bootstrap/plugins';
import './bootstrap/filters';
import './bootstrap/mixins';
import './bootstrap/components';
import './bootstrap/fieldtypes';
import './bootstrap/directives';

import axios from 'axios';
import PortalVue from "portal-vue";
Expand DownExpand Up@@ -69,7 +72,8 @@ Vue.prototype.$echo = Statamic.$echo;
Vue.prototype.$bard = Statamic.$bard;
Vue.prototype.$keys = Statamic.$keys;

window.moment = Vue.moment = Vue.prototype.$moment = require('moment');
import Moment from 'moment';
window.moment = Vue.moment = Vue.prototype.$moment = Moment;

Vue.use(Popover, { tooltip: true })
Vue.use(PortalVue)
Expand All@@ -90,15 +94,63 @@ Statamic.$store = new Vuex.Store({
 }
});

require('./components/ToastBus');
require('./components/ModalBus');
require('./components/stacks/Stacks');
require('./components/panes/Panes');
require('./components/ProgressBar');
require('./components/DirtyState');
require('./components/Config');
require('./components/Preference');
require('./components/Permission');
import './components/ToastBus';
import './components/ModalBus';
import './components/stacks/Stacks';
import './components/panes/Panes';
import './components/ProgressBar';
import './components/DirtyState';
import './components/Config';
import './components/Preference';
import './components/Permission';


import GlobalSearch from './components/GlobalSearch.vue';
import GlobalSiteSelector from './components/GlobalSiteSelector.vue';
import Login from './components/login/login';
import LoginModal from './components/login/LoginModal.vue';
import BaseEntryCreateForm from './components/entries/BaseCreateForm.vue';
import BaseTermCreateForm from './components/terms/BaseCreateForm.vue';
import CreateTermButton from './components/terms/CreateTermButton.vue';
import Importer from './components/importer/importer';
import FieldsetListing from './components/fieldsets/Listing.vue';
import FieldsetCreateForm from './components/fieldsets/CreateForm.vue';
import FieldsetEditForm from './components/fieldsets/EditForm.vue';
import BlueprintListing from './components/blueprints/Listing.vue';
import BlueprintBuilder from './components/blueprints/Builder.vue';
import FormCreateForm from './components/forms/CreateForm.vue';
import FormListing from './components/forms/Listing.vue';
import FormSubmissionListing from './components/forms/SubmissionListing.vue';
import GlobalListing from './components/globals/Listing.vue';
import GlobalEditForm from './components/globals/EditForm.vue';
import GlobalPublishForm from './components/globals/PublishForm.vue';
import GlobalCreateForm from './components/globals/Create.vue';
import UserListing from './components/users/Listing.vue';
import UserWizard from './components/users/Wizard.vue';
import RoleListing from './components/roles/Listing.vue';
import RolePublishForm from './components/roles/PublishForm.vue';
import UserGroupListing from './components/user-groups/Listing.vue';
import UserGroupPublishForm from './components/user-groups/PublishForm.vue';
import CollectionCreateForm from './components/collections/CreateForm.vue';
import CollectionScaffolder from './components/collections/Scaffolder.vue';
import CollectionEditForm from './components/collections/EditForm.vue';
import CollectionView from './components/collections/View.vue';
import CollectionBlueprintListing from './components/collections/BlueprintListing.vue';
import SessionExpiry from './components/SessionExpiry.vue';
import NavigationListing from './components/navigation/Listing.vue';
import NavigationCreateForm from './components/navigation/CreateForm.vue';
import NavigationEditForm from './components/navigation/EditForm.vue';
import PreferencesEditForm from './components/preferences/EditForm.vue';
import NavigationView from './components/navigation/View.vue';
import TaxonomyCreateForm from './components/taxonomies/CreateForm.vue';
import TaxonomyEditForm from './components/taxonomies/EditForm.vue';
import TaxonomyBlueprintListing from './components/taxonomies/BlueprintListing.vue';
import AssetContainerCreateForm from './components/asset-containers/CreateForm.vue';
import AssetContainerEditForm from './components/asset-containers/EditForm.vue';
import NavBuilder from './components/nav/Builder.vue';
import Updater from './components/updater/Updater.vue';
import PortalTargets from './components/PortalTargets.vue';


Statamic.app({
 el: '#statamic',
Expand All@@ -108,51 +160,51 @@ Statamic.app({
 store: Statamic.$store,

 components: {
 GlobalSearch: require('./components/GlobalSearch.vue').default,
 GlobalSiteSelector: require('./components/GlobalSiteSelector.vue').default,
 Login: require('./components/login/login'),
 LoginModal: require('./components/login/LoginModal.vue').default,
 BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
 BaseTermCreateForm: require('./components/terms/BaseCreateForm.vue').default,
 CreateTermButton: require('./components/terms/CreateTermButton.vue').default,
 Importer: require('./components/importer/importer'),
 FieldsetListing: require('./components/fieldsets/Listing.vue').default,
 FieldsetCreateForm: require('./components/fieldsets/CreateForm.vue').default,
 FieldsetEditForm: require('./components/fieldsets/EditForm.vue').default,
 BlueprintListing: require('./components/blueprints/Listing.vue').default,
 BlueprintBuilder: require('./components/blueprints/Builder.vue').default,
 FormCreateForm: require('./components/forms/CreateForm.vue').default,
 FormListing: require('./components/forms/Listing.vue').default,
 FormSubmissionListing: require('./components/forms/SubmissionListing.vue').default,
 GlobalListing: require('./components/globals/Listing.vue').default,
 GlobalEditForm: require('./components/globals/EditForm.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,
 CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
 CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
 CollectionEditForm: require('./components/collections/EditForm.vue').default,
 CollectionView: require('./components/collections/View.vue').default,
 CollectionBlueprintListing: require('./components/collections/BlueprintListing.vue').default,
 SessionExpiry: require('./components/SessionExpiry.vue').default,
 NavigationListing: require('./components/navigation/Listing.vue').default,
 NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
 NavigationEditForm: require('./components/navigation/EditForm.vue').default,
 PreferencesEditForm: require('./components/preferences/EditForm.vue').default,
 NavigationView: require('./components/navigation/View.vue').default,
 TaxonomyCreateForm: require('./components/taxonomies/CreateForm.vue').default,
 TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
 TaxonomyBlueprintListing: require('./components/taxonomies/BlueprintListing.vue').default,
 AssetContainerCreateForm: require('./components/asset-containers/CreateForm.vue').default,
 AssetContainerEditForm: require('./components/asset-containers/EditForm.vue').default,
 NavBuilder: require('./components/nav/Builder.vue').default,
 Updater: require('./components/updater/Updater.vue').default,
 PortalTargets: require('./components/PortalTargets.vue').default,
 GlobalSearch,
 GlobalSiteSelector,
 Login,
 LoginModal,
 BaseEntryCreateForm,
 BaseTermCreateForm,
 CreateTermButton,
 Importer,
 FieldsetListing,
 FieldsetCreateForm,
 FieldsetEditForm,
 BlueprintListing,
 BlueprintBuilder,
 FormCreateForm,
 FormListing,
 FormSubmissionListing,
 GlobalListing,
 GlobalEditForm,
 GlobalPublishForm,
 GlobalCreateForm,
 UserListing,
 UserWizard,
 RoleListing,
 RolePublishForm,
 UserGroupListing,
 UserGroupPublishForm,
 CollectionCreateForm,
 CollectionScaffolder,
 CollectionEditForm,
 CollectionView,
 CollectionBlueprintListing,
 SessionExpiry,
 NavigationListing,
 NavigationCreateForm,
 NavigationEditForm,
 PreferencesEditForm,
 NavigationView,
 TaxonomyCreateForm,
 TaxonomyEditForm,
 TaxonomyBlueprintListing,
 AssetContainerCreateForm,
 AssetContainerEditForm,
 NavBuilder,
 Updater,
 PortalTargets,
 },

 data: {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[4.x] Migrate to Vite#7485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 13 commits into

from

Feb 7, 2023
 Merged


[4.x] Migrate to Vite
#7485
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
96b8cc4

wip


jasonvarga Feb 6, 2023
6370531

read valet tls from env file


jasonvarga Feb 7, 2023
9eb891b

require @babel/preset-env for jest. it worked previously because lara…


jasonvarga Feb 7, 2023
f608be5

Put config in a regular script rather than base64 encoding the whole …


jasonvarga Feb 7, 2023
7219b82

Don't use vite in tests


jasonvarga Feb 7, 2023
567fbe4

Remove jquery ui


jasonvarga Feb 7, 2023
27a8255

remove now unnecessary file


jasonvarga Feb 7, 2023
8fede77

Merge branch 'master' into vite


jasonvarga Feb 7, 2023
e959235

Require version of laravel that supports vite


jasonvarga Feb 7, 2023
2726a20

there was a vite bug. but instead of bumping just to the fix, bump al…


jasonvarga Feb 7, 2023
0e30582

apply to frontend.


jasonvarga Feb 7, 2023
2a5f116

Use the updated npm commands


jasonvarga Feb 7, 2023
25840e9

defer so things like Statamic and Fieldtype are available to scripts


jasonvarga Feb 7, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
.github/workflows/release.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,10 +19,10 @@ jobs:
 run: npm ci

 - name: Compile assets
 run: npm run production
 run: npm run build

 - name: Compile frontend assets
 run: npm run frontend-prod
 run: npm run frontend-build

 - name: Create dist zip
 run: cd resources && tar -czvf dist.tar.gz dist
Expand Down

1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,4 @@ tests/Fakes/Composer/Package/test-package/composer.json
resources/dist
resources/dist-frontend
composer.lock
.env

2 changes: 1 addition & 1 deletion
composer.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@
 "facade/ignition-contracts": "^1.0",
 "guzzlehttp/guzzle": "^6.3 || ^7.0",
 "james-heinrich/getid3": "^1.9.21",
 "laravel/framework": "^9.0",
 "laravel/framework": "^9.49.0",
 "laravel/helpers": "^1.1",
 "league/commonmark": "^1.5 || ^2.2",
 "league/csv": "^9.0",
Expand Down

30,953 changes: 9,676 additions & 21,277 deletions
package-lock.json

View file


Open in desktop


Large diffs are not rendered by default.


28 changes: 11 additions & 17 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,19 +2,13 @@
 "name": "statamic",
 "private": true,
 "scripts": {
 "dev": "npm run development",
 "development": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "watch-poll": "npm run watch -- --watch-poll",
 "hot": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
 "prod": "npm run production",
 "production": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
 "dev": "vite",
 "build": "vite build",
 "svgo": "svgo -f ./resources/svg/ -r",
 "test": "cross-env NODE_ENV=test jest --silent",
 "test-watch": "npm run test -- --watch --notify",
 "frontend-dev": "npm run development -- --env.mixfile=frontend.mix",
 "frontend-prod": "npm run production -- --env.mixfile=frontend.mix",
 "frontend-watch": "npm run watch -- --env.mixfile=frontend.mix"
 "frontend-dev": "vite -c vite-frontend.config.js",
 "frontend-build": "vite build -c vite-frontend.config.js"
 },
 "dependencies": {
 "@popperjs/core": "^2.5.3",
Expand DownExpand Up@@ -56,14 +50,13 @@
 "body-scroll-lock": "^2.6.4",
 "codemirror": "^5.58.2",
 "cookies-js": "^1.2.2",
 "dmuploader": "file:resources/js/vendor/dmuploader",
 "dm-file-uploader": "^1.0.2",
 "dropzone": "^4.0.1",
 "element-resize-detector": "^1.2.1",
 "fuse.js": "^3.4.6",
 "generate-password": "^1.5.1",
 "highlight.js": "^9.18.1",
 "jquery": "^3.5.0",
 "jquery-ui": "file:resources/js/vendor/jquery-ui",
 "laravel-echo": "^1.6.1",
 "lowlight": "^2.6.1",
 "luminous-lightbox": "^0.2.0",
Expand All@@ -90,7 +83,7 @@
 "v-calendar": "^2.3.0",
 "v-tooltip": "^2.0.3",
 "validator": "^13.7.0",
 "vue": "^2.6.11",
 "vue": "^2.7.14",
 "vue-clickaway": "~2.2.2",
 "vue-countable": "^1.0.9",
 "vue-draggable-nested-tree": "^2.2.20",
Expand All@@ -102,15 +95,16 @@
 "vuex": "^3.1.2"
 },
 "devDependencies": {
 "@babel/preset-env": "^7.20.2",
 "@rollup/plugin-inject": "^5.0.3",
 "@vitejs/plugin-vue2": "^2.2.0",
 "babel-jest": "^24.9.0",
 "cross-env": "^5.2.1",
 "jest": "^24.9.0",
 "kind-of": ">=6.0.3",
 "laravel-mix": "^5.0.9",
 "sass": "^1.26.2",
 "sass-loader": "^8.0.2",
 "laravel-vite-plugin": "^0.7.2",
 "tailwindcss": "^1.9.0",
 "vue-template-compiler": "^2.6.11"
 "vite": "^4.0.0"
 },
 "jest": {
 "roots": [
Expand Down

6 changes: 6 additions & 0 deletions
postcss.config.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
module.exports = {
 plugins: [
 require('tailwindcss'),
 require('autoprefixer'),
 ],
};

190 changes: 121 additions & 69 deletions
resources/js/app.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,31 +4,34 @@ import Statamic from './components/Statamic.js';
import Alpine from 'alpinejs'
import * as Globals from './bootstrap/globals'
import { default as underscore } from 'underscore'
import Cookies from 'cookies-js';
import jQuery from 'jquery';
import rangy from 'rangy';

let global_functions = Object.keys(Globals)
global_functions.forEach(fnName => { global[fnName] = Globals[fnName] })
global.Cookies = require('cookies-js');
global_functions.forEach(fnName => { window[fnName] = Globals[fnName] })

Vue.config.silent = false;
Vue.config.devtools = true;
Vue.config.productionTip = false

window.Cookies = Cookies;
window.Alpine = Alpine
window.Vue = Vue;
window.Statamic = Statamic;
window._ = underscore;
window.$ = window.jQuery = require('jquery');
window.rangy = require('rangy');

require('./bootstrap/polyfills');
require('./bootstrap/underscore-mixins');
require('./bootstrap/jquery-plugins');
require('./bootstrap/plugins');
require('./bootstrap/filters');
require('./bootstrap/mixins');
require('./bootstrap/components');
require('./bootstrap/fieldtypes');
require('./bootstrap/directives');
window.$ = window.jQuery = jQuery;
window.rangy = rangy;

import './bootstrap/polyfills';
import './bootstrap/underscore-mixins';
import './bootstrap/jquery-plugins';
import './bootstrap/plugins';
import './bootstrap/filters';
import './bootstrap/mixins';
import './bootstrap/components';
import './bootstrap/fieldtypes';
import './bootstrap/directives';

import axios from 'axios';
import PortalVue from "portal-vue";
Expand DownExpand Up@@ -69,7 +72,8 @@ Vue.prototype.$echo = Statamic.$echo;
Vue.prototype.$bard = Statamic.$bard;
Vue.prototype.$keys = Statamic.$keys;

window.moment = Vue.moment = Vue.prototype.$moment = require('moment');
import Moment from 'moment';
window.moment = Vue.moment = Vue.prototype.$moment = Moment;

Vue.use(Popover, { tooltip: true })
Vue.use(PortalVue)
Expand All@@ -90,15 +94,63 @@ Statamic.$store = new Vuex.Store({
 }
});

require('./components/ToastBus');
require('./components/ModalBus');
require('./components/stacks/Stacks');
require('./components/panes/Panes');
require('./components/ProgressBar');
require('./components/DirtyState');
require('./components/Config');
require('./components/Preference');
require('./components/Permission');
import './components/ToastBus';
import './components/ModalBus';
import './components/stacks/Stacks';
import './components/panes/Panes';
import './components/ProgressBar';
import './components/DirtyState';
import './components/Config';
import './components/Preference';
import './components/Permission';


import GlobalSearch from './components/GlobalSearch.vue';
import GlobalSiteSelector from './components/GlobalSiteSelector.vue';
import Login from './components/login/login';
import LoginModal from './components/login/LoginModal.vue';
import BaseEntryCreateForm from './components/entries/BaseCreateForm.vue';
import BaseTermCreateForm from './components/terms/BaseCreateForm.vue';
import CreateTermButton from './components/terms/CreateTermButton.vue';
import Importer from './components/importer/importer';
import FieldsetListing from './components/fieldsets/Listing.vue';
import FieldsetCreateForm from './components/fieldsets/CreateForm.vue';
import FieldsetEditForm from './components/fieldsets/EditForm.vue';
import BlueprintListing from './components/blueprints/Listing.vue';
import BlueprintBuilder from './components/blueprints/Builder.vue';
import FormCreateForm from './components/forms/CreateForm.vue';
import FormListing from './components/forms/Listing.vue';
import FormSubmissionListing from './components/forms/SubmissionListing.vue';
import GlobalListing from './components/globals/Listing.vue';
import GlobalEditForm from './components/globals/EditForm.vue';
import GlobalPublishForm from './components/globals/PublishForm.vue';
import GlobalCreateForm from './components/globals/Create.vue';
import UserListing from './components/users/Listing.vue';
import UserWizard from './components/users/Wizard.vue';
import RoleListing from './components/roles/Listing.vue';
import RolePublishForm from './components/roles/PublishForm.vue';
import UserGroupListing from './components/user-groups/Listing.vue';
import UserGroupPublishForm from './components/user-groups/PublishForm.vue';
import CollectionCreateForm from './components/collections/CreateForm.vue';
import CollectionScaffolder from './components/collections/Scaffolder.vue';
import CollectionEditForm from './components/collections/EditForm.vue';
import CollectionView from './components/collections/View.vue';
import CollectionBlueprintListing from './components/collections/BlueprintListing.vue';
import SessionExpiry from './components/SessionExpiry.vue';
import NavigationListing from './components/navigation/Listing.vue';
import NavigationCreateForm from './components/navigation/CreateForm.vue';
import NavigationEditForm from './components/navigation/EditForm.vue';
import PreferencesEditForm from './components/preferences/EditForm.vue';
import NavigationView from './components/navigation/View.vue';
import TaxonomyCreateForm from './components/taxonomies/CreateForm.vue';
import TaxonomyEditForm from './components/taxonomies/EditForm.vue';
import TaxonomyBlueprintListing from './components/taxonomies/BlueprintListing.vue';
import AssetContainerCreateForm from './components/asset-containers/CreateForm.vue';
import AssetContainerEditForm from './components/asset-containers/EditForm.vue';
import NavBuilder from './components/nav/Builder.vue';
import Updater from './components/updater/Updater.vue';
import PortalTargets from './components/PortalTargets.vue';


Statamic.app({
 el: '#statamic',
Expand All@@ -108,51 +160,51 @@ Statamic.app({
 store: Statamic.$store,

 components: {
 GlobalSearch: require('./components/GlobalSearch.vue').default,
 GlobalSiteSelector: require('./components/GlobalSiteSelector.vue').default,
 Login: require('./components/login/login'),
 LoginModal: require('./components/login/LoginModal.vue').default,
 BaseEntryCreateForm: require('./components/entries/BaseCreateForm.vue').default,
 BaseTermCreateForm: require('./components/terms/BaseCreateForm.vue').default,
 CreateTermButton: require('./components/terms/CreateTermButton.vue').default,
 Importer: require('./components/importer/importer'),
 FieldsetListing: require('./components/fieldsets/Listing.vue').default,
 FieldsetCreateForm: require('./components/fieldsets/CreateForm.vue').default,
 FieldsetEditForm: require('./components/fieldsets/EditForm.vue').default,
 BlueprintListing: require('./components/blueprints/Listing.vue').default,
 BlueprintBuilder: require('./components/blueprints/Builder.vue').default,
 FormCreateForm: require('./components/forms/CreateForm.vue').default,
 FormListing: require('./components/forms/Listing.vue').default,
 FormSubmissionListing: require('./components/forms/SubmissionListing.vue').default,
 GlobalListing: require('./components/globals/Listing.vue').default,
 GlobalEditForm: require('./components/globals/EditForm.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,
 CollectionCreateForm: require('./components/collections/CreateForm.vue').default,
 CollectionScaffolder: require('./components/collections/Scaffolder.vue').default,
 CollectionEditForm: require('./components/collections/EditForm.vue').default,
 CollectionView: require('./components/collections/View.vue').default,
 CollectionBlueprintListing: require('./components/collections/BlueprintListing.vue').default,
 SessionExpiry: require('./components/SessionExpiry.vue').default,
 NavigationListing: require('./components/navigation/Listing.vue').default,
 NavigationCreateForm: require('./components/navigation/CreateForm.vue').default,
 NavigationEditForm: require('./components/navigation/EditForm.vue').default,
 PreferencesEditForm: require('./components/preferences/EditForm.vue').default,
 NavigationView: require('./components/navigation/View.vue').default,
 TaxonomyCreateForm: require('./components/taxonomies/CreateForm.vue').default,
 TaxonomyEditForm: require('./components/taxonomies/EditForm.vue').default,
 TaxonomyBlueprintListing: require('./components/taxonomies/BlueprintListing.vue').default,
 AssetContainerCreateForm: require('./components/asset-containers/CreateForm.vue').default,
 AssetContainerEditForm: require('./components/asset-containers/EditForm.vue').default,
 NavBuilder: require('./components/nav/Builder.vue').default,
 Updater: require('./components/updater/Updater.vue').default,
 PortalTargets: require('./components/PortalTargets.vue').default,
 GlobalSearch,
 GlobalSiteSelector,
 Login,
 LoginModal,
 BaseEntryCreateForm,
 BaseTermCreateForm,
 CreateTermButton,
 Importer,
 FieldsetListing,
 FieldsetCreateForm,
 FieldsetEditForm,
 BlueprintListing,
 BlueprintBuilder,
 FormCreateForm,
 FormListing,
 FormSubmissionListing,
 GlobalListing,
 GlobalEditForm,
 GlobalPublishForm,
 GlobalCreateForm,
 UserListing,
 UserWizard,
 RoleListing,
 RolePublishForm,
 UserGroupListing,
 UserGroupPublishForm,
 CollectionCreateForm,
 CollectionScaffolder,
 CollectionEditForm,
 CollectionView,
 CollectionBlueprintListing,
 SessionExpiry,
 NavigationListing,
 NavigationCreateForm,
 NavigationEditForm,
 PreferencesEditForm,
 NavigationView,
 TaxonomyCreateForm,
 TaxonomyEditForm,
 TaxonomyBlueprintListing,
 AssetContainerCreateForm,
 AssetContainerEditForm,
 NavBuilder,
 Updater,
 PortalTargets,
 },

 data: {
Expand Down
Loading