@json-editor/json-editor 2.9.0 → 2.9.1

package/.github/workflows/build.yml

@@ -9,6 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
+      - name: Node version
+        run: node -v
       - name: Install
         run: npm install
       - name: Test

package/CHANGELOG.md

@@ -1,14 +1,18 @@
 ### Unreleased
 
+### 2.9.1
+
+- Fixed past merge
+
 ### 2.9.0
 
-Updated datetime example page
-Updated packages
-Fixed issue #1133: default values for each of the oneOf options
-Upgraded codeceptjs from 2 to 3
-Fixed npm audit issues
-Fixed unnecessary Null values included in enums
-Fixed radio editors not recognising numerical values
+- Updated datetime example page
+- Updated packages
+- Fixed issue #1133: default values for each of the oneOf options
+- Upgraded codeceptjs from 2 to 3
+- Fixed npm audit issues
+- Fixed unnecessary Null values included in enums
+- Fixed radio editors not recognising numerical values
 
 ### 2.9.0-beta.1
 

package/config/codeceptjs_helpers.js

@@ -69,32 +69,28 @@ class customHelpers extends Helper {
   // Evaluates true if xpath is checked
   async seeCheckedAttribute (xpath) {
     const helper = this.helpers['Puppeteer'] || this.helpers['WebDriver']
-    let res = await helper.grabAttributeFrom(xpath, 'checked')
-    return assert.ok(res !== null && typeof res !== 'undefined' && res.toString().toLowerCase() === 'true', "\x1b[31mexpected element '\x1b[91m" + xpath + "\x1b[31m' to be checked")
+    return await helper.waitForElement(xpath + ':checked')
   }
 
   // Custom dontSeeCheckedAttribute function.
   // Evaluates true if xpath is not checked
   async dontSeeCheckedAttribute (xpath) {
     const helper = this.helpers['Puppeteer'] || this.helpers['WebDriver']
-    let res = await helper.grabAttributeFrom(xpath, 'checked')
-    return assert.ok(!(res !== null && typeof res !== 'undefined' && res.toString().toLowerCase() === 'true'), "\x1b[31mexpected element '\x1b[91m" + xpath + "\x1b[31m' NOT to be checked")
+    return await helper.waitForInvisible(xpath + ':checked')
   }
 
   // Custom seeDisabledAttribute function.
   // Evaluates true if xpath is disabled
   async seeDisabledAttribute (xpath) {
     const helper = this.helpers['Puppeteer'] || this.helpers['WebDriver']
-    let res = await helper.grabAttributeFrom(xpath, 'disabled')
-    return assert.ok(res !== null && typeof res !== 'undefined' && res.toString().toLowerCase() === 'true', "\x1b[31mexpected element '\x1b[91m" + xpath + "\x1b[31m' to be disabled")
+    return await helper.waitForElement(xpath + ':disabled')
   }
 
   // Custom dontSeeDisabledAttributet function.
   // Evaluates true if xpath is not disabled
   async dontSeeDisabledAttribute (xpath) {
     const helper = this.helpers['Puppeteer'] || this.helpers['WebDriver']
-    let res = await helper.grabAttributeFrom(xpath, 'disabled')
-    return assert.ok(!(res !== null && typeof res !== 'undefined' && res.toString().toLowerCase() === 'true'), "\x1b[31mexpected element '\x1b[91m" + xpath + "\x1b[31m' NOT to be disabled")
+    return await helper.waitForInvisible(xpath + ':disabled')
   }
 
   // Custom seeReadOnlyAttribute function.

package/config/karma.conf.js

@@ -44,10 +44,6 @@ module.exports = function (config) {
       stats: 'errors-only'
     },
 
-    beforeMiddleware: [
-      'webpackBlocker'
-    ],
-
     // test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter

package/config/webpack.common.js

@@ -68,7 +68,7 @@ module.exports = {
     hints: false
   },
   devServer: {
-    contentBase: helpers.root('.'),
+    static: helpers.root('.'),
     historyApiFallback: true,
     port: 8080
   }

package/config/webpack.dev.js

@@ -5,7 +5,7 @@ const helpers = require('./helpers')
 
 module.exports = webpackMerge(commonConfig, {
   mode: 'development',
-  devtool: 'cheap-module-eval-source-map',
+  devtool: 'eval-cheap-module-source-map',
   output: {
     path: helpers.root('dist/dev'),
     publicPath: '/dist/',

package/config/webpack.nonmin.js

@@ -6,7 +6,7 @@ const helpers = require('./helpers')
 // See https://webpack.js.org/guides/development/
 module.exports = (env) => webpackMerge(commonConfig, {
   mode: 'development',
-  devtool: '@source-map',
+  devtool: 'source-map',
   output: {
     path: env && env.travis === true ? helpers.root('dist') : helpers.root('dist/nonmin'),
     publicPath: '/dist/',

package/config/webpack.prod.js

@@ -17,7 +17,6 @@ module.exports = () => {
       minimize: true
     },
     plugins: [
-      new RemoveStrictPlugin(), // I have put this in to avoid IE throwing error Assignment to read-only properties is not allowed in strict mode
       // This doesn't seem to actually be minimising the CSS!
       new webpack.NoEmitOnErrorsPlugin()
     ]