tonyair/silverstripe-webpack
1
1
Fork 0
mirror of https://github.com/a2nt/silverstripe-webpack.git synced 2024-10-22 17:05:31 +02:00
Code Issues Projects Releases Wiki Activity

IMPR: Minor updates

Browse Source
This commit is contained in:
Tony Air 2021-04-09 14:14:23 +07:00
parent f56ff9069e
commit ca025220a7
6 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/client/src/scss/app.scss
View File

@ -1,6 +1,7 @@
// Your custom variables // Your custom variables
@import '_variables'; @import '_variables';
@import '~@a2nt/meta-lightbox-react/src/scss/app';
@import '~@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/scss/_components/_ui.bootstrap'; @import '~@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/scss/_components/_ui.bootstrap';
@import '~@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/scss/_components/_ui.main'; @import '~@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/scss/_components/_ui.main';
@import '~@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/scss/_components/_ui.main.ss'; @import '~@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/scss/_components/_ui.main.ss';

4
app/templates/Includes/NavItem.ss
View File

@ -1,5 +1,5 @@
<% if $Children %> <% if $Children %>
<div class="nav-item dropdown dropdown-hover<% if $isCurrent || $isSection %> active <% end_if %><% if $isSection %> section<% end_if %><% if $SubmenuColumns %> submenu-cols-dropdown<% end_if %> {$CSSClass} {$ExtraClass}"> <div class="nav-item dropdown dropdown-hover<% if $SubmenuColumns %> submenu-cols-dropdown<% end_if %> {$CSSClass} {$ExtraClass}">
<% include NavItem_link ExtraClass="dropdown-toggle-fl dropdown-toggle-notouch" %> <% include NavItem_link ExtraClass="dropdown-toggle-fl dropdown-toggle-notouch" %>
<button <button
@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<% else %> <% else %>
<div class="nav-item {$CSSClass} $ExtraClass <% if $isCurrent || $isSection %> active<% end_if %>"> <div class="nav-item {$CSSClass} $ExtraClass">
<% include NavItem_link ExtraClass='' %> <% include NavItem_link ExtraClass='' %>
</div> </div>
<% end_if %> <% end_if %>

2
app/templates/Includes/NavItem_link.ss
View File

@ -1,5 +1,5 @@
<a <a
class="nav-link graphql-page $ExtraClass <% if $LinkClass %>{$LinkClass}<% else %>nav-link<% end_if %><% if $RedirectionType = 'External' || $ExternalURL || $OpenInNewWindow %> external<% end_if %>" class="nav-link graphql-page $ExtraClass <% if $LinkClass %>{$LinkClass}<% else %>nav-link<% end_if %><% if $RedirectionType = 'External' || $ExternalURL || $OpenInNewWindow %> external<% end_if %><% if $isCurrent || $isSection %> active <% end_if %><% if $isSection %> section<% end_if %>"
href="{$Link}" href="{$Link}"
<% if $RedirectionType = 'External' || $OpenInNewWindow %> target="_blank"<% end_if %> <% if $RedirectionType = 'External' || $OpenInNewWindow %> target="_blank"<% end_if %>
data-text="{$MenuTitle.XML}" data-text="{$MenuTitle.XML}"

4
app/templates/Includes/Navigation.ss
View File

@ -12,10 +12,10 @@
</button> </button>
<div id="{$NavID}Content" class="collapse navbar-collapse"> <div id="{$NavID}Content" class="collapse navbar-collapse">
<ul class="navbar-nav"> <div class="navbar-nav">
<% loop $Navigation %> <% loop $Navigation %>
<% include NavItem %> <% include NavItem %>
<% end_loop %> <% end_loop %>
</ul> </div>
</div> </div>
</nav> </nav>

8
app/templates/SilverStripe/Forms/OptionsetField.ss Normal file
View File

@ -0,0 +1,8 @@
<ul $AttributesHTML>
<% loop $Options %>
<li class="$Class">
<input id="$ID" class="radio" name="$Name" type="radio" value="$Value"<% if $isChecked %> checked<% end_if %><% if $isDisabled %> disabled<% end_if %> />
<label for="$ID">$Title.RAW</label>
</li>
<% end_loop %>
</ul>

54
package.json
View File

@ -31,13 +31,13 @@
"ie>=11" "ie>=11"
], ],
"dependencies": { "dependencies": {
"@a2nt/meta-lightbox-react": "^3.1.0", "@a2nt/meta-lightbox-react": "^3.1.2",
"@a2nt/ss-bootstrap-ui-webpack-boilerplate-react": "^3.1.6", "@a2nt/ss-bootstrap-ui-webpack-boilerplate-react": "^3.1.8",
"@angular/common": "^11.2.6", "@angular/common": "^11.2.8",
"@angular/core": "^11.2.6", "@angular/core": "^11.2.8",
"@apollo/client": "^3.3.12", "@apollo/client": "^3.3.13",
"@jsanahuja/instagramfeed": "github:jsanahuja/instagramfeed", "@jsanahuja/instagramfeed": "github:jsanahuja/instagramfeed",
"@popperjs/core": "^2.9.1", "@popperjs/core": "^2.9.2",
"aos": "^2.3.4", "aos": "^2.3.4",
"apollo3-cache-persist": "^0.9.1", "apollo3-cache-persist": "^0.9.1",
"axios": "^0.21.1", "axios": "^0.21.1",
@ -49,33 +49,35 @@
"graphql": "^15.5.0", "graphql": "^15.5.0",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"inputmask": "^5.0.5", "inputmask": "^5.0.5",
"keyboardjs": "^2.6.4",
"localforage": "^1.9.0", "localforage": "^1.9.0",
"localforage-cordovasqlitedriver": "^1.8.0", "localforage-cordovasqlitedriver": "^1.8.0",
"lodash.debounce": "^4.0.8", "lodash.debounce": "^4.0.8",
"lodash.throttle": "^4.1.1", "lodash.throttle": "^4.1.1",
"mapbox-gl": "^2.1.1", "mapbox-gl": "^2.2.0",
"material-design-color": "^2.3.2", "material-design-color": "^2.3.2",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"moment": "^2.29.1", "moment": "^2.29.1",
"react": "^17.0.1", "react": "^17.0.2",
"react-dom": "^17.0.1", "react-dom": "^17.0.2",
"react-easy-swipe": "^0.0.21",
"react-tiny-oembed": "^1.0.1", "react-tiny-oembed": "^1.0.1",
"rxjs": "^6.6.6", "rxjs": "^6.6.7",
"select2": "^4.0.13", "select2": "^4.0.13",
"setimmediate": "^1.0.5" "setimmediate": "^1.0.5"
}, },
"devDependencies": { "devDependencies": {
"@a2nt/image-sprite-webpack-plugin": "^0.2.5", "@a2nt/image-sprite-webpack-plugin": "^0.2.5",
"@babel/core": "^7.13.10", "@babel/core": "^7.13.14",
"@babel/eslint-parser": "^7.13.10", "@babel/eslint-parser": "^7.13.14",
"@babel/plugin-proposal-class-properties": "^7.13.0", "@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-object-rest-spread": "^7.13.8", "@babel/plugin-proposal-object-rest-spread": "^7.13.8",
"@babel/plugin-syntax-jsx": "^7.12.13", "@babel/plugin-syntax-jsx": "^7.12.13",
"@babel/plugin-syntax-top-level-await": "^7.12.13", "@babel/plugin-syntax-top-level-await": "^7.12.13",
"@babel/plugin-transform-react-jsx": "^7.12.17", "@babel/plugin-transform-react-jsx": "^7.13.12",
"@babel/plugin-transform-runtime": "^7.13.10", "@babel/plugin-transform-runtime": "^7.13.10",
"@babel/preset-env": "^7.13.10", "@babel/preset-env": "^7.13.12",
"@babel/preset-react": "^7.12.13", "@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.13.10", "@babel/runtime": "^7.13.10",
"@googlemaps/markerclustererplus": "*", "@googlemaps/markerclustererplus": "*",
"@ungap/global-this": "^0.4.4", "@ungap/global-this": "^0.4.4",
@ -87,15 +89,15 @@
"ansi-regex": "^5.0.0", "ansi-regex": "^5.0.0",
"autoprefixer": "^10.2.5", "autoprefixer": "^10.2.5",
"babel-loader": "^8.2.2", "babel-loader": "^8.2.2",
"classnames": "^2.2.6", "classnames": "^2.3.0",
"copy-webpack-plugin": "^7.0.0", "copy-webpack-plugin": "^7.0.0",
"croppie": "^2.6.5", "croppie": "^2.6.5",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"css-loader": "^5.1.3", "css-loader": "^5.2.0",
"eslint": "^7.22.0", "eslint": "^7.23.0",
"eslint-plugin-import": "^2.22.1", "eslint-plugin-import": "^2.22.1",
"eslint-plugin-jquery": "^1.5.1", "eslint-plugin-jquery": "^1.5.1",
"eslint-plugin-react": "^7.22.0", "eslint-plugin-react": "^7.23.1",
"events": "^3.3.0", "events": "^3.3.0",
"exif-js": "^2.3.0", "exif-js": "^2.3.0",
"exports-loader": "^2.0.0", "exports-loader": "^2.0.0",
@ -114,7 +116,7 @@
"html-webpack-plugin": "^5.3.1", "html-webpack-plugin": "^5.3.1",
"img-optimize-loader": "^1.0.7", "img-optimize-loader": "^1.0.7",
"loglevel": "^1.7.1", "loglevel": "^1.7.1",
"mini-css-extract-plugin": "^1.3.9", "mini-css-extract-plugin": "^1.4.0",
"msw": "^0.26.2", "msw": "^0.26.2",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"node-sass": "^5.0.0", "node-sass": "^5.0.0",
@ -127,7 +129,7 @@
"querystring": "^0.2.1", "querystring": "^0.2.1",
"raw-loader": "^4.0.2", "raw-loader": "^4.0.2",
"react-hot-loader": "^4.13.0", "react-hot-loader": "^4.13.0",
"react-is": "^17.0.1", "react-is": "^17.0.2",
"react-lifecycles-compat": "^3.0.4", "react-lifecycles-compat": "^3.0.4",
"regenerator-runtime": "^0.13.7", "regenerator-runtime": "^0.13.7",
"resolve-url-loader": "^3.1.2", "resolve-url-loader": "^3.1.2",
@ -136,7 +138,7 @@
"sass-lint": "^1.13.1", "sass-lint": "^1.13.1",
"sass-lint-fix": "^1.12.1", "sass-lint-fix": "^1.12.1",
"sass-loader": "^11.0.1", "sass-loader": "^11.0.1",
"scheduler": "^0.20.1", "scheduler": "^0.20.2",
"shallowequal": "^1.1.0", "shallowequal": "^1.1.0",
"strip-ansi": "^6.0.0", "strip-ansi": "^6.0.0",
"style-loader": "^2.0.0", "style-loader": "^2.0.0",
@ -147,11 +149,11 @@
"tslib": "^2.1.0", "tslib": "^2.1.0",
"url": "^0.11.0", "url": "^0.11.0",
"url-loader": "^4.1.1", "url-loader": "^4.1.1",
"webpack": "^5.27.1", "webpack": "^5.30.0",
"webpack-bundle-analyzer": "^4.4.0", "webpack-bundle-analyzer": "^4.4.0",
"webpack-cli": "^4.5.0", "webpack-cli": "^4.6.0",
"webpack-dev-server": "^4.0.0-beta.0", "webpack-dev-server": "^4.0.0-beta.1",
"webpack-manifest-plugin": "^3.1.0", "webpack-manifest-plugin": "^3.1.1",
"webpack-merge": "^5.7.3", "webpack-merge": "^5.7.3",
"yarn": "^1.22.10", "yarn": "^1.22.10",
"zen-observable": "^0.8.15" "zen-observable": "^0.8.15"