Merge pull request #5395 from nanasess/improve/fileupload

[4.2] jQuery-File-Upload を filepond に変更する
EC-CUBE · Jun 29, 2022 · 900ef73 · 900ef73
2 parents fc99132 + 58739ba
commit 900ef73
Show file tree

Hide file tree

Showing 40 changed files with 32,228 additions and 21,418 deletions.
diff --git a/gulp/task/scss-min.js b/gulp/task/scss-min.js
@@ -18,7 +18,7 @@ module.exports = () => {
     .pipe(plumber({
       errorHandler: notify.onError('Error: <%= error.message %>')
     }))
-    .pipe(sass)
+    .pipe(sass())
     .pipe(postcss([
       autoprefixer(),
       cssmqpacker({

diff --git a/gulp/task/scss.js b/gulp/task/scss.js
@@ -19,7 +19,7 @@ module.exports = () => {
     .pipe(plumber({
       errorHandler: notify.onError('Error: <%= error.message %>')
     }))
-    .pipe(sass)
+    .pipe(sass())
     .pipe(postcss([
       atImport(),
       autoprefixer(),

diff --git a/html/bundle/admin.bundle.js b/html/bundle/admin.bundle.js
diff --git a/html/bundle/admin.bundle.js.LICENSE.txt b/html/bundle/admin.bundle.js.LICENSE.txt
@@ -18,6 +18,30 @@
  * Released under the MIT License
  */
 
+/*!
+ * FilePond 4.30.4
+ * Licensed under MIT, https://opensource.org/licenses/MIT/
+ * Please visit https://pqina.nl/filepond/ for details.
+ */
+
+/*!
+ * FilePondPluginFileValidateSize 2.2.7
+ * Licensed under MIT, https://opensource.org/licenses/MIT/
+ * Please visit https://pqina.nl/filepond/ for details.
+ */
+
+/*!
+ * FilePondPluginFileValidateType 1.2.8
+ * Licensed under MIT, https://opensource.org/licenses/MIT/
+ * Please visit https://pqina.nl/filepond/ for details.
+ */
+
+/*!
+ * FilePondPluginImagePreview 4.6.11
+ * Licensed under MIT, https://opensource.org/licenses/MIT/
+ * Please visit https://pqina.nl/filepond/ for details.
+ */
+
 /*!
  * Ladda
  * http://lab.hakim.se/ladda

diff --git a/html/bundle/admin.bundle.js.map b/html/bundle/admin.bundle.js.map