fomantic-ui 2.9.0-beta.32 → 2.9.0-beta.320

package/examples/components/table.html

@@ -468,4 +468,4 @@
   </div>
 
 </body>
-</html>
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fomantic-ui",
-  "version": "2.9.0-beta.32",
+  "version": "2.9.0-beta.320+c4b3a74",
   "description": "Fomantic empowers designers and developers by creating a shared vocabulary for UI.",
   "keywords": [
     "fomantic-ui",
@@ -24,20 +24,15 @@
     "url": "https://github.com/fomantic/Fomantic-UI.git"
   },
   "scripts": {
-    "install": "gulp install",
     "build": "gulp build",
     "changelog": "auto-changelog -p"
   },
   "dependencies": {
-    "jquery": "^3.4.0",
+    "@actions/core": "^1.6.0",
+    "@octokit/core": ">=3",
     "@octokit/rest": "^16.16.0",
-    "gulp-concat-filenames": "^1.2.0",
-    "gulp-debug": "^4.0.0",
-    "gulp-git": "^2.9.0",
-    "gulp-tap": "^1.0.1",
-    "less": "^3.7.1 || ^4.0.0",
-    "merge-stream": "^2.0.0",
     "better-console": "1.0.1",
+    "browserslist": "^4.19.1",
     "del": "^3.0.0",
     "extend": "^3.0.2",
     "gulp": "^4.0.0",
@@ -47,9 +42,12 @@
     "gulp-clone": "^2.0.1",
     "gulp-concat": "^2.6.1",
     "gulp-concat-css": "^3.1.0",
+    "gulp-concat-filenames": "^1.2.0",
     "gulp-copy": "^4.0.0",
+    "gulp-debug": "^4.0.0",
     "gulp-dedupe": "0.0.2",
     "gulp-flatten": "^0.4.0",
+    "gulp-git": "^2.9.0",
     "gulp-header": "^2.0.5",
     "gulp-if": "^2.0.2",
     "gulp-json-editor": "^2.4.3",
@@ -59,11 +57,15 @@
     "gulp-print": "^5.0.0",
     "gulp-rename": "^1.4.0",
     "gulp-replace": "^1.0.0",
-    "gulp-rtlcss": "^1.3.0",
+    "gulp-rtlcss": "^2.0.0",
+    "gulp-tap": "^1.0.1",
     "gulp-uglify": "^3.0.1",
-    "inquirer": "^6.2.1",
+    "inquirer": "^8.2.0",
+    "jquery": "^3.4.0",
+    "less": "^3.7.1 || ^4.0.0",
     "map-stream": "^0.1.0",
-    "mkdirp": "^0.5.1",
+    "merge-stream": "^2.0.0",
+    "mkdirp": "^1.0.4",
     "normalize-path": "^3.0.0",
     "replace-ext": "^1.0.0",
     "require-dot-file": "^0.4.0",
@@ -72,13 +74,13 @@
   },
   "devDependencies": {
     "all-contributors-cli": "^6.7.0",
-    "auto-changelog": "^1.15.0",
+    "auto-changelog": "^2.4.0",
     "node-fetch": "^2.6.0",
-    "semver": "^6.3.0"
+    "semver": "^7.3.5"
   },
   "engines": {
-    "node": ">=10.15.3",
-    "npm": ">=6.4.1"
+    "node": ">=12",
+    "npm": ">=6.14.8"
   },
   "title": "Fomantic UI",
   "style": "dist/semantic.css"

package/scripts/nightly-version.js

@@ -1,72 +1,81 @@
 // node
 const fs = require('fs')
 const path = require('path')
+const childProcess = require('child_process')
 
 // npm
 const fetch = require('node-fetch')
 const semver = require('semver')
+const actions = require('@actions/core')
 
 // pkg
 const pkg = require('../package.json')
+const process = require('process')
 
 const ghBase = 'https://api.github.com'
 const repoUrlPath = 'fomantic/Fomantic-UI'
 const npmBase = 'https://registry.npmjs.org'
 const npmPackage = 'fomantic-ui'
+const currentRev = childProcess // get the current rev from the repo
+  .execSync('git rev-parse HEAD')
+  .toString()
+  .trim()
+  .slice(0, 7)
 
-
-const getGitHubVersion = async function () {
-  return fetch(`${ghBase}/repos/${repoUrlPath}/milestones`)
+const getNextVersion = async function () {
+  const versions = await fetch(`${ghBase}/repos/${repoUrlPath}/milestones`)
     .then(r => r.json())
-    .then(milestones => milestones.filter(m => m.title.indexOf('x') === -1).map(m => m.title).sort()[0])
-}
-
-const getCurrentNpmVersion = async function () {
-  return fetch(`${npmBase}/${npmPackage}`)
-    .then(r => r.json())
-    .then(p => p['dist-tags'].nightly)
-}
+    .then(milestones => milestones.filter(m => m.title.indexOf('x') === -1)) // remove all versions with `x` in it
+    .then(versions => versions.map(m => m.title)) // create array of versions
+    .then(versions => semver.sort(versions))
 
-const getNpmPreRelease = async function () {
-  return fetch(`${npmBase}/${npmPackage}`)
-    .then(r => r.json())
-    .then(p => p['dist-tags'].nightly)
-    .then(v => semver.prerelease(v))
-    .then(pr => pr === null ? ['beta', 0] : pr)
+  // Return first entry aka the smallest version in milestones which would therefore
+  // be the next version
+  return semver.parse(versions[0])
 }
 
-const getAllNpmVersions = async function () {
-  // The versions property sometimes does not include versions which are in "time"!
-  // That's why "time" is used here
-  return fetch(`${npmBase}/${npmPackage}`)
+const getPublishedVersion = async function () {
+  // get the latest published nightly tagged version
+  return semver.parse(
+    await fetch(`${npmBase}/${npmPackage}`)
       .then(r => r.json())
-      .then(p => Object.keys(p['time']))
+      .then(p => {
+        let nightly = p['dist-tags'].nightly ?? '';
+        let versionInfo = p.versions[nightly] ?? {};
+        let buildCommit = nightly.indexOf('+')===-1 && versionInfo.gitHead ? '+'+(versionInfo.gitHead ?? '').slice(0,7) : '';
+        return nightly+buildCommit;
+      })
+  )
 }
 
 const getNightlyVersion = async function () {
-  const nextVersion = await getGitHubVersion()
-  const currentNightlyWithPre = semver.parse(await getCurrentNpmVersion())
-  const currentNightly = `${currentNightlyWithPre.major}.${currentNightlyWithPre.minor}.${currentNightlyWithPre.patch}`
-  const allNpmVersions = await getAllNpmVersions()
-  let nightlyVersion = `${nextVersion}-beta.0`
+  const next = semver.parse(await getNextVersion())
+  const current = semver.parse(await getPublishedVersion())
 
-  if (semver.eq(nextVersion, currentNightly)) {
-    const preRelease = await getNpmPreRelease()
+  if (current.build[0] === currentRev) {
+    actions.setOutput('shouldPublish', false)
 
-    nightlyVersion = semver.inc(
-      `${nextVersion}-${preRelease[0]}.${preRelease[1]}`,
-      'prerelease'
-    )
+    console.log('No new commits since last publish. Exiting.')
+    process.exit(0)
+    return
   }
-  //check if version was already uploaded to npm previously
-   while (allNpmVersions.indexOf(nightlyVersion) !== -1) {
+
+  let nightlyVersion = `${next.version}-beta.0`
+
+  // Check if published version is the same version as next version.
+  // Only check major, minor and patch as previously published nightly
+  // versions would include prerelease tag and build metadata
+  if (semver.eq(`${next.major}.${next.minor}.${next.patch}`, `${current.major}.${current.minor}.${current.patch}`)) {
+    // If they match then a nightly version has already been published, so we need to increment
+    // the prerelease and add the new rev as build metadata
     nightlyVersion = semver.inc(
-        nightlyVersion,
-        'prerelease'
+    `${next.version}-beta.${current.prerelease[1]}`,
+    'prerelease'
     )
   }
 
-  return nightlyVersion
+  actions.setOutput('shouldPublish', 'yes')
+  return `${nightlyVersion}+${currentRev}`
 }
 
 getNightlyVersion()

package/src/definitions/behaviors/api.js

@@ -65,7 +65,7 @@ $.api = $.fn.api = function(parameters) {
 
         // context used for state
         $context        = (settings.stateContext)
-          ? $(settings.stateContext)
+          ? ([window,document].indexOf(settings.stateContext) < 0 ? $(document).find(settings.stateContext) : $(settings.stateContext))
           : $module,
 
         // request details
@@ -74,6 +74,7 @@ $.api = $.fn.api = function(parameters) {
         url,
         data,
         requestStartTime,
+        originalData,
 
         // standard module
         element         = this,
@@ -86,6 +87,7 @@ $.api = $.fn.api = function(parameters) {
 
         initialize: function() {
           if(!methodInvoked) {
+            originalData = settings.data;
             module.bind.events();
           }
           module.instantiate();
@@ -148,8 +150,8 @@ $.api = $.fn.api = function(parameters) {
               module.error(error.noStorage);
               return;
             }
-            response = sessionStorage.getItem(url);
-            module.debug('Using cached response', url, response);
+            response = sessionStorage.getItem(url + module.get.normalizedData());
+            module.debug('Using cached response', url, settings.data, response);
             response = module.decode.json(response);
             return response;
           }
@@ -167,8 +169,8 @@ $.api = $.fn.api = function(parameters) {
             if( $.isPlainObject(response) ) {
               response = JSON.stringify(response);
             }
-            sessionStorage.setItem(url, response);
-            module.verbose('Storing cached response for url', url, response);
+            sessionStorage.setItem(url + module.get.normalizedData(), response);
+            module.verbose('Storing cached response for url', url, settings.data, response);
           }
         },
 
@@ -197,7 +199,7 @@ $.api = $.fn.api = function(parameters) {
 
           // Add form content
           if(settings.serializeForm) {
-            settings.data = module.add.formData(settings.data);
+            settings.data = module.add.formData(originalData || settings.data);
           }
 
           // call beforesend and get any settings changes
@@ -334,10 +336,6 @@ $.api = $.fn.api = function(parameters) {
           cancelled: function() {
             return (module.cancelled || false);
           },
-          succesful: function() {
-            module.verbose('This behavior will be deleted due to typo. Use "was successful" instead.');
-            return module.was.successful();
-          },
           successful: function() {
             return (module.request && module.request.state() == 'resolved');
           },
@@ -365,8 +363,8 @@ $.api = $.fn.api = function(parameters) {
                   var
                     // allow legacy {$var} style
                     variable = (templatedString.indexOf('$') !== -1)
-                      ? templatedString.substr(2, templatedString.length - 3)
-                      : templatedString.substr(1, templatedString.length - 2),
+                      ? templatedString.slice(2, -1)
+                      : templatedString.slice(1, -1),
                     value   = ($.isPlainObject(urlData) && urlData[variable] !== undefined)
                       ? urlData[variable]
                       : ($module.data(variable) !== undefined)
@@ -397,8 +395,8 @@ $.api = $.fn.api = function(parameters) {
                   var
                     // allow legacy {/$var} style
                     variable = (templatedString.indexOf('$') !== -1)
-                      ? templatedString.substr(3, templatedString.length - 4)
-                      : templatedString.substr(2, templatedString.length - 3),
+                      ? templatedString.slice(3, -1)
+                      : templatedString.slice(2, -1),
                     value   = ($.isPlainObject(urlData) && urlData[variable] !== undefined)
                       ? urlData[variable]
                       : ($module.data(variable) !== undefined)
@@ -429,24 +427,76 @@ $.api = $.fn.api = function(parameters) {
           },
           formData: function(data) {
             var
-              canSerialize = ($.fn.serializeObject !== undefined),
-              formData     = (canSerialize)
-                ? $form.serializeObject()
-                : $form.serialize(),
-              hasOtherData
+              formData = {},
+              hasOtherData,
+              useFormDataApi = settings.serializeForm === 'formdata'
             ;
-            data         = data || settings.data;
+            data         = data || originalData || settings.data;
             hasOtherData = $.isPlainObject(data);
 
+            if (useFormDataApi) {
+              formData = new FormData($form[0]);
+              settings.processData = typeof settings.processData !== 'undefined' ? settings.processData : false;
+              settings.contentType = typeof settings.contentType !== 'undefined' ? settings.contentType : false;
+            } else {
+              var formArray = $form.serializeArray(),
+                  pushes = {},
+                  pushValues= {},
+                  build = function(base, key, value) {
+                    base[key] = value;
+                    return base;
+                  }
+              ;
+              // add files
+              $.each($('input[type="file"]',$form), function(i, tag) {
+                $.each($(tag)[0].files, function(j, file) {
+                  formArray.push({name:tag.name, value: file});
+                });
+              });
+              $.each(formArray, function(i, el) {
+                if (!settings.regExp.validate.test(el.name)) return;
+                var isCheckbox = $('[name="' + el.name + '"]', $form).attr('type') === 'checkbox',
+                    floatValue = parseFloat(el.value),
+                    value = (isCheckbox && el.value === 'on') || el.value === 'true' || (String(floatValue) === el.value ? floatValue : (el.value === 'false' ? false : el.value)),
+                    nameKeys = el.name.match(settings.regExp.key) || [], k, pushKey= el.name.replace(/\[\]$/,'')
+                ;
+                if(!(pushKey in pushes)) {
+                  pushes[pushKey] = 0;
+                  pushValues[pushKey] = value;
+                } else if (Array.isArray(pushValues[pushKey])) {
+                  pushValues[pushKey].push(value);
+                } else {
+                  pushValues[pushKey] = [pushValues[pushKey] , value];
+                }
+                value = pushValues[pushKey];
+
+                while ((k = nameKeys.pop()) !== undefined) {
+                  // foo[]
+                  if (k == '' && !Array.isArray(value)){
+                    value = build([], pushes[pushKey]++, value);
+                  }
+                  // foo[n]
+                  else if (settings.regExp.fixed.test(k)) {
+                    value = build([], k, value);
+                  }
+                  // foo; foo[bar]
+                  else if (settings.regExp.named.test(k)) {
+                    value = build({}, k, value);
+                  }
+                }
+                formData = $.extend(true, formData, value);
+              });
+            }
+
             if(hasOtherData) {
-              if(canSerialize) {
-                module.debug('Extending existing data with form data', data, formData);
-                data = $.extend(true, {}, data, formData);
-              }
-              else {
-                module.error(error.missingSerialize);
-                module.debug('Cant extend data. Replacing data with form data', data, formData);
+              module.debug('Extending existing data with form data', data, formData);
+              if(useFormDataApi) {
+                $.each(Object.keys(data),function(i, el){
+                  formData.append(el, data[el]);
+                });
                 data = formData;
+              } else {
+                data = $.extend(true, {}, data, formData);
               }
             }
             else {
@@ -698,6 +748,9 @@ $.api = $.fn.api = function(parameters) {
         },
 
         get: {
+          normalizedData: function(){
+            return typeof settings.data === "string" ? settings.data : JSON.stringify(settings.data, Object.keys(settings.data).sort());
+          },
           responseFromXHR: function(xhr) {
             return $.isPlainObject(xhr)
               ? (module.is.expectingJSON())
@@ -962,7 +1015,7 @@ $.api = $.fn.api = function(parameters) {
             response
           ;
           passedArguments = passedArguments || queryArguments;
-          context         = element         || context;
+          context         = context         || element;
           if(typeof query == 'string' && object !== undefined) {
             query    = query.split(/[\. ]/);
             maxDepth = query.length - 1;
@@ -1083,6 +1136,8 @@ $.api.settings = {
   defaultData          : true,
 
   // whether to serialize closest form
+  // use true to convert complex named keys like a[b][1][c][] into a nested object
+  // use 'formdata' for formdata web api
   serializeForm        : false,
 
   // how long to wait before request should occur
@@ -1105,7 +1160,7 @@ $.api.settings = {
   responseAsync     : false,
 
 // whether onResponse should work with response value without force converting into an object
-  rawResponse       : false,
+  rawResponse       : true,
 
   // callbacks before request
   beforeSend  : function(settings) { return settings; },
@@ -1141,7 +1196,6 @@ $.api.settings = {
     legacyParameters  : 'You are using legacy API success callback names',
     method            : 'The method you called is not defined',
     missingAction     : 'API action used but no url was defined',
-    missingSerialize  : 'jquery-serialize-object is required to add form data to an existing data object',
     missingURL        : 'No URL specified for api event',
     noReturnedValue   : 'The beforeSend callback must return a settings object, beforeSend ignored.',
     noStorage         : 'Caching responses locally requires session storage',
@@ -1152,8 +1206,13 @@ $.api.settings = {
   },
 
   regExp  : {
-    required : /\{\$*[A-z0-9]+\}/g,
-    optional : /\{\/\$*[A-z0-9]+\}/g,
+    required : /\{\$*[a-z0-9]+\}/gi,
+    optional : /\{\/\$*[a-z0-9]+\}/gi,
+    validate: /^[a-z_][a-z0-9_-]*(?:\[[a-z0-9_-]*\])*$/i,
+    key:      /[a-z0-9_-]+|(?=\[\])/gi,
+    push:     /^$/,
+    fixed:    /^\d+$/,
+    named:    /^[a-z0-9_-]+$/i
   },
 
   className: {