From 317750a4f76a7a5852c0396627e6fd4ec3e41167 Mon Sep 17 00:00:00 2001 From: Tony Air Date: Mon, 12 Aug 2019 16:23:24 +0700 Subject: [PATCH] Packages update + Select2 dropdown --- package.json | 56 ++++++++++++++------------- src/js/_components/_ui.form.basics.js | 16 +++++--- 2 files changed, 40 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index 545112d..d5a3761 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "webpack-bootstrap-ui-kit", + "name": "ss-webpack-boilerplate", "version": "1.0.0", - "description": "This UI Kit allows you to build Bootstrap 4 webapp with some extra UI features.", + "description": "Lets you create SilverStripe faster", "author": "Tony Air ", "license": "MIT", "private": false, @@ -13,13 +13,14 @@ "yarn": ">= 1.0.0" }, "scripts": { + "start": "cross-env NODE_ENV=development webpack-dev-server --https -d --config webpack.config.dev.js", + "dash": "cross-env NODE_ENV=development webpack-dashboard -- webpack-dev-server --config webpack.config.dev.js", "prebuild": "rimraf build", - "start": "cross-env NODE_ENV=development webpack-dev-server --https -d --config webpack.config.js --mode development", - "build": "cross-env NODE_ENV=production webpack -p --config webpack.config.js --progress --mode production", - "lint:check": "eslint ./src --config .eslintrc && sass-lint ./src --config .sasslintrc -v -q", - "lint:fix": "eslint ./src --config .eslintrc --fix && sass-lint ./src --config .sasslintrc -v -q --fix", - "lint:js": "eslint ./src --config .eslintrc", - "lint:sass": "sass-lint ./src --config .sasslintrc -v -q" + "build": "cross-env NODE_ENV=production webpack -p --config webpack.config.prod.js --progress", + "lint:check": "eslint ./app/client/src --config .eslintrc && sass-lint ./app/client/src --config .sasslintrc -v -q", + "lint:fix": "eslint ./app/client/src --config .eslintrc --fix && sass-lint ./app/client/src --config .sasslintrc -v -q --fix", + "lint:js": "eslint ./app/client/src --config .eslintrc", + "lint:sass": "sass-lint ./app/client/src --config .sasslintrc -v -q" }, "dependencies": { "@google/markerclusterer": "^1.0.3", @@ -28,8 +29,7 @@ "bootstrap-confirmation2": "^4.1.0", "bootstrap-datepicker": "^1.9.0", "bootstrap-offcanvas": "^1.0.0", - "bootstrap-select": "github:snapappointments/bootstrap-select#v2.0.0-beta1", - "bootstrap-table": "^1.14.2", + "bootstrap-table": "^1.15.3", "bootstrap-timepicker": "^0.5.2", "core-util-is": "^1.0.2", "croppie": "^2.6.4", @@ -42,6 +42,7 @@ "jquery-zoom": "^1.7.21", "jquery.appear": "^1.0.1", "jquery.inputmask": "^3.3.4", + "mapbox-gl": "^1.2.1", "meta-lightbox": "^1.0.0", "offcanvas-bootstrap": "^2.5.2", "popper.js": "^1.15.0", @@ -49,12 +50,13 @@ "quill": "^1.3.6", "react-bootstrap4-form-validation": "^1.0.10", "routie": "0.0.1", + "select2": "^4.0.8", "smooth-scroll": "^14.2.1", - "webpack-cli": "^3.3.2", - "yarn": "^1.16.0" + "animate.css": "^3.7.0", + "yarn": "^1.17.3", + "laravel-mix": "^4.1.2" }, "devDependencies": { - "animate.css": "^3.7.0", "autoprefixer": "^7.2.5", "babel-core": "^6.26.3", "babel-eslint": "^8.2.6", @@ -68,24 +70,23 @@ "copy-webpack-plugin": "^4.6.0", "copyfiles": "^1.2.0", "cross-env": "^5.1.6", - "css-loader": "^0.28.9", + "css-loader": "^3.2.0", "eslint": "^4.18.1", - "eslint-plugin-import": "^2.17.2", - "eslint-plugin-jquery": "^1.5.0", - "eslint-plugin-react": "^7.13.0", + "eslint-plugin-import": "^2.18.2", + "eslint-plugin-jquery": "^1.5.1", + "eslint-plugin-react": "^7.14.3", "exports-loader": "^0.7.0", "extract-text-webpack-plugin": "^4.0.0-beta.0", "favicons-webpack-plugin": "0.0.9", "file-loader": "^1.1.5", - "html-webpack-plugin": "^4.0.0-beta.5", - "laravel-mix": "^2.1.14", + "html-webpack-plugin": "^4.0.0-beta.8", "lost": "^8.3.1", "node-sass": "^4.12.0", "object-assign": "^4.1.1", - "optimize-css-assets-webpack-plugin": "^4.0.1", + "optimize-css-assets-webpack-plugin": "^5.0.3", "postcss-loader": "^2.1.5", - "react": "^16.8.6", - "react-dom": "^16.8.6", + "react": "^16.9.0", + "react-dom": "^16.9.0", "react-hot-loader": "^3.1.3", "redux": "^3.7.2", "redux-devtools-extension": "^2.13.8", @@ -94,14 +95,15 @@ "sass-lint": "^1.13.1", "sass-lint-fix": "^1.12.1", "sass-loader": "^6.0.6", - "script-ext-html-webpack-plugin": "^2.1.3", + "script-ext-html-webpack-plugin": "^2.1.4", "style-loader": "^0.19.0", - "svg-url-loader": "^2.3.1", + "svg-url-loader": "^2.3.3", "uglify-js": "git://github.com/mishoo/UglifyJS2.git#harmony-v2.8.22", + "uglifyjs-webpack-plugin": "^2.2.0", "url-loader": "^0.6.2", - "webpack": "^4.32.2", - "webpack-cli": "^3.3.2", - "webpack-dev-server": "^3.4.1", + "webpack": "^4.39.1", + "webpack-cli": "^3.3.6", + "webpack-dev-server": "^3.8.0", "webpack-manifest-plugin": "^1.3.2", "webpack-merge": "^4.1.1" }, diff --git a/src/js/_components/_ui.form.basics.js b/src/js/_components/_ui.form.basics.js index 6e702de..dbab636 100755 --- a/src/js/_components/_ui.form.basics.js +++ b/src/js/_components/_ui.form.basics.js @@ -1,9 +1,10 @@ import $ from 'jquery'; -import 'bootstrap-select/dist/js/bootstrap-select'; -$.fn.selectpicker.Constructor.BootstrapVersion = '4'; +//import 'bootstrap-select/dist/js/bootstrap-select'; +//$.fn.selectpicker.Constructor.BootstrapVersion = '4'; +import 'select2/dist/js/select2.js'; -import 'jquery.inputmask/dist/jquery.inputmask.bundle'; +import select2 from 'jquery.inputmask/dist/jquery.inputmask.bundle'; import Events from "../_events"; import SpinnerUI from './_ui.spinner'; @@ -37,8 +38,13 @@ const FormBasics = (($) => { const $selectFields = $element.find('select:not([readonly])'); const $radioOptions = $element.find('input[type="radio"]'); - const separator = '::;::'; + $selectFields.each((i, el) => { + const $el = $(el); + $el.select2(); + }); + + /*const separator = '::;::'; $selectFields.each((i, el) => { const $el = $(el); const maxOptions = $el.data('max-options') || false; @@ -109,7 +115,7 @@ const FormBasics = (($) => { $('.dropdown-menu a').on('click', (e) => { $(e.currentTarget).parents('.dropdown-menu').removeClass('show'); - }); + });*/ // /FIX $fields.each((e, el) => {