Merge branch 'develop' into 'migrate/ruffle'
# Conflicts: # package.json
This commit is contained in:
		
						commit
						10403f79dd
					
				
					 4 changed files with 1288 additions and 1055 deletions
				
			
		| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
# This file is a template, and might need editing before it works on your project.
 | 
			
		||||
# Official framework image. Look for the different tagged releases at:
 | 
			
		||||
# https://hub.docker.com/r/library/node/tags/
 | 
			
		||||
image: node:12
 | 
			
		||||
image: node:16
 | 
			
		||||
 | 
			
		||||
stages:
 | 
			
		||||
  - lint
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										27
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										27
									
								
								package.json
									
									
									
									
									
								
							| 
						 | 
				
			
			@ -16,7 +16,7 @@
 | 
			
		|||
    "lint-fix": "eslint --fix --ext .js,.vue src test/unit/specs test/e2e/specs"
 | 
			
		||||
  },
 | 
			
		||||
  "dependencies": {
 | 
			
		||||
    "@babel/runtime": "7.17.8",
 | 
			
		||||
    "@babel/runtime": "7.18.6",
 | 
			
		||||
    "@chenfengyuan/vue-qrcode": "2.0.0",
 | 
			
		||||
    "@fortawesome/fontawesome-svg-core": "1.3.0",
 | 
			
		||||
    "@fortawesome/free-regular-svg-icons": "5.15.4",
 | 
			
		||||
| 
						 | 
				
			
			@ -25,7 +25,7 @@
 | 
			
		|||
    "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
 | 
			
		||||
    "@ruffle-rs/ruffle": "^0.1.0-nightly.2022.7.12",
 | 
			
		||||
    "@vuelidate/core": "2.0.0-alpha.42",
 | 
			
		||||
    "@vuelidate/validators": "2.0.0-alpha.27",
 | 
			
		||||
    "@vuelidate/validators": "2.0.0-alpha.30",
 | 
			
		||||
    "body-scroll-lock": "2.7.1",
 | 
			
		||||
    "chromatism": "3.0.0",
 | 
			
		||||
    "click-outside-vue3": "4.0.1",
 | 
			
		||||
| 
						 | 
				
			
			@ -38,6 +38,7 @@
 | 
			
		|||
    "phoenix": "1.6.2",
 | 
			
		||||
    "punycode.js": "2.1.0",
 | 
			
		||||
    "qrcode": "1",
 | 
			
		||||
    "utf8": "^3.0.0",
 | 
			
		||||
    "vue": "^3.2.31",
 | 
			
		||||
    "vue-i18n": "^9.2.0-beta.34",
 | 
			
		||||
    "vue-router": "4.0.14",
 | 
			
		||||
| 
						 | 
				
			
			@ -45,10 +46,10 @@
 | 
			
		|||
    "vuex": "4.0.2"
 | 
			
		||||
  },
 | 
			
		||||
  "devDependencies": {
 | 
			
		||||
    "@babel/core": "7.17.8",
 | 
			
		||||
    "@babel/plugin-transform-runtime": "7.17.0",
 | 
			
		||||
    "@babel/preset-env": "7.16.11",
 | 
			
		||||
    "@babel/register": "7.17.7",
 | 
			
		||||
    "@babel/core": "7.18.6",
 | 
			
		||||
    "@babel/plugin-transform-runtime": "7.18.6",
 | 
			
		||||
    "@babel/preset-env": "7.18.6",
 | 
			
		||||
    "@babel/register": "7.18.6",
 | 
			
		||||
    "@intlify/vue-i18n-loader": "^5.0.0",
 | 
			
		||||
    "@ungap/event-target": "0.2.3",
 | 
			
		||||
    "@vue/babel-helper-vue-jsx-merge-props": "1.2.1",
 | 
			
		||||
| 
						 | 
				
			
			@ -57,7 +58,7 @@
 | 
			
		|||
    "@vue/test-utils": "2.0.0-rc.17",
 | 
			
		||||
    "autoprefixer": "6.7.7",
 | 
			
		||||
    "babel-eslint": "7.2.3",
 | 
			
		||||
    "babel-loader": "8.2.4",
 | 
			
		||||
    "babel-loader": "8.2.5",
 | 
			
		||||
    "babel-plugin-lodash": "3.3.4",
 | 
			
		||||
    "chai": "3.5.0",
 | 
			
		||||
    "chalk": "1.1.3",
 | 
			
		||||
| 
						 | 
				
			
			@ -71,13 +72,13 @@
 | 
			
		|||
    "eslint-config-standard": "12.0.0",
 | 
			
		||||
    "eslint-friendly-formatter": "2.0.7",
 | 
			
		||||
    "eslint-loader": "2.2.1",
 | 
			
		||||
    "eslint-plugin-import": "2.25.4",
 | 
			
		||||
    "eslint-plugin-import": "2.26.0",
 | 
			
		||||
    "eslint-plugin-node": "7.0.1",
 | 
			
		||||
    "eslint-plugin-promise": "4.3.1",
 | 
			
		||||
    "eslint-plugin-standard": "4.1.0",
 | 
			
		||||
    "eslint-plugin-vue": "5.2.3",
 | 
			
		||||
    "eventsource-polyfill": "0.9.6",
 | 
			
		||||
    "express": "4.17.3",
 | 
			
		||||
    "express": "4.18.1",
 | 
			
		||||
    "file-loader": "3.0.1",
 | 
			
		||||
    "function-bind": "1.1.1",
 | 
			
		||||
    "html-webpack-plugin": "3.2.0",
 | 
			
		||||
| 
						 | 
				
			
			@ -86,14 +87,14 @@
 | 
			
		|||
    "iso-639-1": "2.1.15",
 | 
			
		||||
    "isparta-loader": "2.0.0",
 | 
			
		||||
    "json-loader": "0.5.7",
 | 
			
		||||
    "karma": "6.3.17",
 | 
			
		||||
    "karma": "6.4.0",
 | 
			
		||||
    "karma-coverage": "1.1.2",
 | 
			
		||||
    "karma-firefox-launcher": "1.3.0",
 | 
			
		||||
    "karma-mocha": "2.0.1",
 | 
			
		||||
    "karma-mocha-reporter": "2.2.5",
 | 
			
		||||
    "karma-sinon-chai": "2.0.2",
 | 
			
		||||
    "karma-sourcemap-loader": "0.3.8",
 | 
			
		||||
    "karma-spec-reporter": "0.0.33",
 | 
			
		||||
    "karma-spec-reporter": "0.0.34",
 | 
			
		||||
    "karma-webpack": "4.0.2",
 | 
			
		||||
    "lodash": "4.17.21",
 | 
			
		||||
    "lolex": "1.6.0",
 | 
			
		||||
| 
						 | 
				
			
			@ -112,7 +113,7 @@
 | 
			
		|||
    "shelljs": "0.8.5",
 | 
			
		||||
    "sinon": "2.4.1",
 | 
			
		||||
    "sinon-chai": "2.14.0",
 | 
			
		||||
    "stylelint": "13.6.1",
 | 
			
		||||
    "stylelint": "13.13.1",
 | 
			
		||||
    "stylelint-config-standard": "20.0.0",
 | 
			
		||||
    "stylelint-rscss": "0.4.0",
 | 
			
		||||
    "url-loader": "1.1.2",
 | 
			
		||||
| 
						 | 
				
			
			@ -120,7 +121,7 @@
 | 
			
		|||
    "vue-style-loader": "4.1.2",
 | 
			
		||||
    "webpack": "4.46.0",
 | 
			
		||||
    "webpack-dev-middleware": "3.7.3",
 | 
			
		||||
    "webpack-hot-middleware": "2.24.3",
 | 
			
		||||
    "webpack-hot-middleware": "2.25.1",
 | 
			
		||||
    "webpack-merge": "0.20.0"
 | 
			
		||||
  },
 | 
			
		||||
  "engines": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,9 +1,11 @@
 | 
			
		|||
import utf8 from 'utf8'
 | 
			
		||||
 | 
			
		||||
export const newExporter = ({
 | 
			
		||||
  filename = 'data',
 | 
			
		||||
  getExportedObject
 | 
			
		||||
}) => ({
 | 
			
		||||
  exportData () {
 | 
			
		||||
    const stringified = JSON.stringify(getExportedObject(), null, 2) // Pretty-print and indent with 2 spaces
 | 
			
		||||
    const stringified = utf8.encode(JSON.stringify(getExportedObject(), null, 2)) // Pretty-print and indent with 2 spaces
 | 
			
		||||
 | 
			
		||||
    // Create an invisible link with a data url and simulate a click
 | 
			
		||||
    const e = document.createElement('a')
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue