From 078c1d27ac96a4f490aef5717266f8f8860d4949 Mon Sep 17 00:00:00 2001 From: Tony Air Date: Sat, 24 Mar 2018 17:45:31 +0700 Subject: [PATCH] SS4.1 support --- .env.dist | 9 + .eslintignore | 2 +- .gitignore | 17 +- .idea/deployment.xml | 4 + .idea/inspectionProfiles/Project_Default.xml | 7 + .idea/misc.xml | 6 + .idea/modules.xml | 8 + .idea/php.xml | 90 + .idea/ss-webpack-boiler-plate.iml | 86 + .idea/vcs.xml | 6 + .idea/workspace.xml | 603 + README.md | 6 +- browserconfig.xml | 10 +- cache.appcache | 12 +- composer.json | 63 +- manifest.json | 18 +- package-lock.json | 10785 ++++++++++------ package.json | 8 +- phpcs.xml.dist | 25 - public/.htaccess | 54 + public/index.php | 27 + public/web.config | 19 + site/.htaccess | 3 + site/_config.php | 1 + site/_config/config.yml | 2 + site/_config/debugbar.yml | 7 - site/_config/elements.yml | 3 + site/_config/extensions.yml | 3 + site/_config/webpack.yml | 2 +- site/code/extensions/SiteConfigExtension.php | 40 + site/code/pages/HomePage.php | 5 + site/code/pages/HomePageController.php | 5 + site/code/pages/Page.php | 7 + site/code/pages/PageController.php | 7 + .../{ => templates}/DeferedRequirements.php | 23 +- .../WebpackTemplateProvider.php | 23 +- site/src/scss/_layout.scss | 6 +- site/templates/Includes/Content.ss | 14 + site/templates/Includes/Head.ss | 39 + site/templates/Layout/HomePage.ss | 1 + site/templates/Layout/Page.ss | 3 + site/templates/Page.ss | 44 +- webpack.config.dev.js | 2 +- webpack.config.prod.js | 4 +- 44 files changed, 8126 insertions(+), 3983 deletions(-) create mode 100755 .env.dist create mode 100644 .idea/deployment.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/php.xml create mode 100644 .idea/ss-webpack-boiler-plate.iml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml delete mode 100755 phpcs.xml.dist create mode 100755 public/.htaccess create mode 100755 public/index.php create mode 100755 public/web.config create mode 100755 site/.htaccess create mode 100755 site/_config.php create mode 100755 site/_config/config.yml delete mode 100644 site/_config/debugbar.yml create mode 100755 site/_config/elements.yml create mode 100755 site/_config/extensions.yml create mode 100755 site/code/extensions/SiteConfigExtension.php create mode 100755 site/code/pages/HomePage.php create mode 100755 site/code/pages/HomePageController.php create mode 100755 site/code/pages/Page.php create mode 100755 site/code/pages/PageController.php rename site/code/{ => templates}/DeferedRequirements.php (83%) rename site/code/{ => templates}/WebpackTemplateProvider.php (74%) create mode 100755 site/templates/Includes/Content.ss create mode 100755 site/templates/Includes/Head.ss create mode 100755 site/templates/Layout/HomePage.ss create mode 100755 site/templates/Layout/Page.ss diff --git a/.env.dist b/.env.dist new file mode 100755 index 0000000..ba3f115 --- /dev/null +++ b/.env.dist @@ -0,0 +1,9 @@ +SS_DATABASE_SERVER='localhost' +SS_DATABASE_USERNAME='' +SS_DATABASE_PASSWORD='' +SS_DATABASE_NAME='' + +SS_DEFAULT_ADMIN_USERNAME='' +SS_DEFAULT_ADMIN_PASSWORD='' + +SS_ENVIRONMENT_TYPE='dev' \ No newline at end of file diff --git a/.eslintignore b/.eslintignore index 0665a7a..2606ccd 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1 +1 @@ -/site/dist \ No newline at end of file +/site/client \ No newline at end of file diff --git a/.gitignore b/.gitignore index 4a4b0b1..161591f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,11 @@ -# START Do not modify the lines between here and #END, they will be regenerated by GitIgnoreEditor /betternavigator -/cms -/debugbar -/framework -/ideannotator -/redirectedurls -/reports -/silverstripe-scaled-uploads -/silverstripe-version-truncator -/siteconfig -# END of GitIgnoreEditor +/.env /node_modules /composer.lock /yarn.lock /vendor -/site/dist \ No newline at end of file +/public/assets +/public/resources +/site/client +/silverstripe-cache \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml new file mode 100644 index 0000000..a97e0fa --- /dev/null +++ b/.idea/deployment.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..db8c7d5 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..24eb271 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..b83525f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000..e563dad --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/ss-webpack-boiler-plate.iml b/.idea/ss-webpack-boiler-plate.iml new file mode 100644 index 0000000..fe10807 --- /dev/null +++ b/.idea/ss-webpack-boiler-plate.iml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..d71c1c7 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,603 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + $PROJECT_DIR$/composer.json + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SimpleResourceURLGenerato + config + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +