Skip to content

Commit

Permalink
Revert dependency upgrades
Browse files Browse the repository at this point in the history 
Vue apparently had a small breaking change included in the patch release.

Squashed commit of the following:

commit f1e2635c20d4acef1752b8c2a357bbcfbb30a097
Author: rijkvanzanten <rijkvanzanten@me.com>
Date:   Thu Jun 3 19:07:54 2021 -0400

    Revert dep upgrades
  • Loading branch information
@rijkvanzanten
rijkvanzanten committed Jun 3, 2021
1 parent e1926ba commit c000c8a
Show file tree
Hide file tree
Showing 14 changed files with 543 additions and 960 deletions.
44 changes: 22 additions & 22 deletions api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,57 +74,57 @@
"@directus/format-title": "9.0.0-rc.71",
"@directus/schema": "9.0.0-rc.71",
"@directus/specs": "9.0.0-rc.71",
"@godaddy/terminus": "^4.8.0",
"@godaddy/terminus": "^4.7.2",
"argon2": "^0.28.1",
"async": "^3.2.0",
"async-mutex": "^0.3.1",
"atob": "^2.1.2",
"axios": "^0.21.1",
"axios": "^0.21.0",
"busboy": "^0.3.1",
"camelcase": "^6.2.0",
"chalk": "^4.1.1",
"commander": "^7.2.0",
"cookie-parser": "^1.4.5",
"cors": "^2.8.5",
"csv-parser": "^3.0.0",
"date-fns": "^2.22.1",
"date-fns": "^2.21.1",
"deep-map": "^2.0.0",
"destroy": "^1.0.4",
"dotenv": "^10.0.0",
"eventemitter2": "^6.4.4",
"execa": "^5.1.0",
"dotenv": "^9.0.2",
"eventemitter2": "^6.4.3",
"execa": "^5.0.1",
"exif-reader": "^1.0.3",
"express": "^4.17.1",
"express-pino-logger": "^6.0.0",
"express-session": "^1.17.2",
"fs-extra": "^10.0.0",
"grant": "^5.4.14",
"graphql": "^15.5.0",
"graphql-compose": "^9.0.1",
"graphql-compose": "^8.1.0",
"icc": "^2.0.0",
"inquirer": "^8.1.0",
"joi": "^17.4.0",
"joi": "^17.3.0",
"js-yaml": "^4.1.0",
"js2xmlparser": "^4.0.1",
"json2csv": "^5.0.6",
"json2csv": "^5.0.3",
"jsonwebtoken": "^8.5.1",
"keyv": "^4.0.3",
"knex": "^0.95.6",
"knex-schema-inspector": "^1.5.6",
"liquidjs": "^9.25.0",
"lodash": "^4.17.21",
"macos-release": "^2.4.1",
"mime-types": "^2.1.31",
"mime-types": "^2.1.27",
"ms": "^2.1.3",
"nanoid": "^3.1.23",
"node-machine-id": "^1.1.12",
"nodemailer": "^6.6.1",
"openapi3-ts": "^2.0.1",
"openapi3-ts": "^2.0.0",
"ora": "^5.4.0",
"otplib": "^12.0.1",
"pino": "^6.11.3",
"pino-colada": "^2.1.0",
"qs": "^6.10.1",
"qs": "^6.9.4",
"rate-limiter-flexible": "^2.2.2",
"resolve-cwd": "^3.0.0",
"sharp": "^0.28.3",
Expand All @@ -135,17 +135,17 @@
"optionalDependencies": {
"@keyv/redis": "^2.1.2",
"connect-memcached": "^1.0.0",
"connect-redis": "^6.0.0",
"connect-redis": "^5.2.0",
"connect-session-knex": "^2.1.0",
"ioredis": "^4.27.3",
"ioredis": "^4.27.2",
"keyv-memcache": "^1.2.5",
"memcached": "^2.2.2",
"mysql": "^2.18.1",
"nodemailer-mailgun-transport": "^2.1.3",
"oracledb": "^5.1.0",
"oracledb": "^5.0.0",
"pg": "^8.6.0",
"sqlite3": "^5.0.2",
"tedious": "^11.0.9"
"tedious": "^11.0.8"
},
"gitHead": "24621f3934dc77eb23441331040ed13c676ceffd",
"devDependencies": {
Expand All @@ -168,16 +168,16 @@
"@types/lodash": "^4.14.170",
"@types/mime-types": "^2.1.0",
"@types/ms": "^0.7.31",
"@types/node": "^15.12.0",
"@types/nodemailer": "^6.4.2",
"@types/node": "^15.9.0",
"@types/nodemailer": "^6.4.1",
"@types/qs": "^6.9.6",
"@types/sharp": "^0.28.3",
"@types/sharp": "^0.28.1",
"@types/stream-json": "^1.7.0",
"@types/uuid": "^8.3.0",
"@types/uuid-validate": "^0.0.1",
"copyfiles": "^2.4.1",
"cross-env": "^7.0.3",
"ts-node-dev": "^1.1.6",
"copyfiles": "^2.4.0",
"cross-env": "^7.0.2",
"ts-node-dev": "^1.0.0",
"typescript": "^4.3.2"
}
}
22 changes: 11 additions & 11 deletions app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
"@fullcalendar/interaction": "^5.7.0",
"@fullcalendar/list": "^5.7.0",
"@fullcalendar/timegrid": "^5.7.0",
"@popperjs/core": "^2.9.2",
"@popperjs/core": "^2.9.1",
"@sindresorhus/slugify": "^2.1.0",
"@tinymce/tinymce-vue": "^3.2.8",
"@types/base-64": "^1.0.0",
"@types/bytes": "^3.1.0",
"@types/codemirror": "^5.60.0",
"@types/codemirror": "^0.0.109",
"@types/color": "^3.0.1",
"@types/diff": "^5.0.0",
"@types/dompurify": "^2.2.2",
Expand All @@ -51,9 +51,9 @@
"@types/qrcode": "^1.4.0",
"@types/tiny-async-pool": "^1.0.0",
"@vue/cli-plugin-babel": "^4.5.13",
"@vue/cli-plugin-router": "^4.5.13",
"@vue/cli-plugin-router": "^4.5.8",
"@vue/cli-plugin-typescript": "^4.5.13",
"@vue/cli-plugin-vuex": "^4.5.13",
"@vue/cli-plugin-vuex": "^4.5.8",
"@vue/cli-service": "^4.5.13",
"@vue/composition-api": "^0.6.7",
"@vue/test-utils": "^1.2.0",
Expand All @@ -62,7 +62,7 @@
"codemirror": "^5.61.1",
"copyfiles": "^2.4.1",
"cropperjs": "^1.5.11",
"date-fns": "^2.22.1",
"date-fns": "^2.21.1",
"dompurify": "^2.2.9",
"escape-string-regexp": "^5.0.0",
"front-matter": "^4.0.2",
Expand All @@ -82,18 +82,18 @@
"resize-observer": "^1.0.2",
"rimraf": "^3.0.2",
"sass": "^1.34.1",
"sass-loader": "^9.0.3",
"sass-loader": "^9.0.2",
"stylelint": "^13.13.1",
"tiny-async-pool": "^1.2.0",
"tinymce": "^5.8.1",
"vue": "^2.6.13",
"vue": "^2.6.12",
"vue-cli-plugin-yaml": "^1.0.2",
"vue-i18n": "^8.24.4",
"vue-loader": "^15.9.7",
"vue-router": "^3.5.1",
"vue-template-compiler": "^2.6.13",
"vue-loader": "^15.9.3",
"vue-router": "^3.4.8",
"vue-template-compiler": "^2.6.10",
"vuedraggable": "^2.24.3",
"vuepress": "^1.8.2",
"vuepress": "^1.5.2",
"webpack-assets-manifest": "^3.1.1"
}
}
6 changes: 3 additions & 3 deletions app/src/interfaces/input-code/input-code.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</template>

<script lang="ts">
import CodeMirror, { ModeSpec } from 'codemirror';
import CodeMirror from 'codemirror';
import { defineComponent, computed, ref, onMounted, onUnmounted, watch } from '@vue/composition-api';
Expand Down Expand Up @@ -133,7 +133,7 @@ export default defineComponent({
const jsonlint = (await import('jsonlint-mod')) as any;
codemirror.value.setOption('mode', { name: 'javascript', json: true } as ModeSpec<{ json: boolean }>);
codemirror.value.setOption('mode', { name: 'javascript', json: true });
CodeMirror.registerHelper('lint', 'json', (text: string) => {
const found: Record<string, any> = [];
Expand All @@ -157,7 +157,7 @@ export default defineComponent({
return found;
});
} else if (lang === 'plaintext') {
codemirror.value.setOption('mode', { name: 'text/plain' });
codemirror.value.setOption('mode', { name: null });
} else {
await import(`codemirror/mode/${lang}/${lang}.js`);
codemirror.value.setOption('mode', { name: lang });
Expand Down
6 changes: 3 additions & 3 deletions docs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
"directory-tree": "^2.2.9",
"fs-extra": "^10.0.0",
"lodash.get": "^4.4.2",
"micromark": "^2.11.4",
"micromark": "^2.10.1",
"npm-watch": "^0.9.0",
"slugify": "^1.5.3",
"vuepress": "^1.8.2",
"slugify": "^1.4.6",
"vuepress": "^1.7.1",
"vuepress-plugin-clean-urls": "^1.1.2"
}
}
Loading

0 comments on commit c000c8a

Please sign in to comment.