Skip to content
This repository has been archived by the owner on Feb 21, 2023. It is now read-only.

Commit

Permalink
Merge pull request #20 from deliciousbrains/upgrade-and-fix
Browse files Browse the repository at this point in the history
Upgrade and fix
  • Loading branch information
ptasker authored Oct 19, 2020
2 parents ea2621a + b048cb1 commit e0ad007
Show file tree
Hide file tree
Showing 6 changed files with 4,405 additions and 2,568 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": ["es2015"]
"presets": ["env"]
}
2 changes: 1 addition & 1 deletion app/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
return {
input: '',
output: '',
sampleData: 'a:8:{s:4:"null";N;s:3:"int";i:123;s:6:"string";s:3:"foo";s:4:"bool";b:1;s:5:"array";a:1:{s:3:"foo";s:3:"bar";}s:6:"object";O:8:"stdClass":1:{s:3:"foo";s:3:"bar";}s:6:"class1";O:13:"ExampleClass1":3:{s:25:"ExampleClass1privateVar";s:16:"private variable";s:15:"*protectedVar";s:18:"protected variable";s:9:"publicVar";s:15:"public variable";}s:6:"class2";O:13:"ExampleClass2":3:{s:25:"ExampleClass2privateVar";s:16:"private variable";s:15:"*protectedVar";s:18:"protected variable";s:9:"publicVar";s:15:"public variable";}}',
sampleData: 'a:8:{s:4:"null";N:null;s:3:"int";i:123;s:6:"string";s:3:"foo";s:4:"bool";b:1;s:5:"array";a:1:{s:3:"foo";s:3:"bar";}s:6:"object";O:8:"stdClass":1:{s:3:"foo";s:3:"bar";}s:6:"class1";O:13:"ExampleClass1":3:{s:23:"ExampleClass1privateVar";s:16:"private variable";s:13:"*protectedVar";s:18:"protected variable";s:9:"publicVar";s:15:"public variable";}s:6:"class2";O:13:"ExampleClass2":3:{s:23:"ExampleClass2privateVar";s:16:"private variable";s:13:"*protectedVar";s:18:"protected variable";s:9:"publicVar";s:15:"public variable";}}',
error: false,
}
},
Expand Down
2 changes: 1 addition & 1 deletion dist/serialized-editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/serialized-editor.js.map

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@
"devDependencies": {
"babel-core": "^6.0.0",
"babel-loader": "^6.0.0",
"babel-plugin-istanbul": "^4.1.4",
"babel-preset-env": "^1.5.1",
"babel-plugin-istanbul": "^6.0.0",
"babel-preset-env": "^1.7.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-latest": "^6.0.0",
"chai": "^4.0.2",
"chromedriver": "^2.30.1",
"cross-env": "^3.0.0",
"cross-spawn": "^5.1.0",
"css-loader": "^0.25.0",
"css-loader": "^1.0.1",
"file-loader": "^0.9.0",
"inject-loader": "^3.0.0",
"karma": "^1.7.0",
"karma": "^5.2.3",
"karma-coverage": "^1.1.1",
"karma-mocha": "^1.3.0",
"karma-phantomjs-launcher": "^1.0.4",
Expand All @@ -56,13 +56,13 @@
"karma-spec-reporter": "^0.0.31",
"karma-webpack": "^2.0.3",
"lolex": "^1.6.0",
"mocha": "^3.4.2",
"nightwatch": "^0.9.16",
"mocha": "^8.1.3",
"nightwatch": "^1.4.3",
"phantomjs-prebuilt": "^2.1.14",
"selenium-server": "^3.4.0",
"style-loader": "^0.17.0",
"sinon": "^2.3.5",
"sinon-chai": "^2.11.0",
"style-loader": "^0.17.0",
"vue-loader": "^12.1.0",
"vue-template-compiler": "^2.3.3",
"webpack": "^2.6.1",
Expand Down
Loading

0 comments on commit e0ad007

Please sign in to comment.