Merge pull request #10 from obulat/update-deps

WordPress · Apr 12, 2021 · e427aea · e427aea
2 parents 5b325ea + fd27995
commit e427aea
Show file tree

Hide file tree

Showing 23 changed files with 6,821 additions and 3,506 deletions.
diff --git a/.husky/.gitignore b/.husky/.gitignore
@@ -0,0 +1 @@
+_
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run lint-staged
diff --git a/.husky/pre-push b/.husky/pre-push
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm test
diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json
@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}
diff --git a/nuxt.config.js b/nuxt.config.js
@@ -114,7 +114,15 @@ export default {
   srcDir: 'src/',
   modern: 'client',
   server: { port: process.env.PORT || 8443 },
-  components: true,
+  components: {
+    dirs: [
+      '~/components',
+      '~/components/ContentReport',
+      '~/components/Filters',
+      '~/components/ImageDetails',
+      '~/components/MetaSearch',
+    ],
+  },
   plugins: [
     '~/plugins/i18n.js',
     { src: '~/plugins/ab-test-init.js', mode: 'client' },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,22 +24,24 @@
     "lintfix": "eslint --fix --ext .js,.vue --ignore-path .gitignore .",
     "format": "prettier --write .",
     "format:test": "prettier --check .",
-    "postinstall": "patch-package"
+    "lint-staged": "npm run lintfix && npm run format",
+    "postinstall": "patch-package",
+    "prepare": "husky install"
   },
   "dependencies": {
     "@creativecommons/vocabulary": "^2020.9.2",
-    "@nuxt/components": "^1.1.0",
-    "@nuxtjs/sentry": "^4.3.5",
+    "@nuxt/components": "^2.1.6",
+    "@nuxtjs/sentry": "^5.0.3",
     "@nuxtjs/sitemap": "^2.4.0",
     "@nuxtjs/svg": "^0.1.12",
-    "axios": "^0.20.0",
+    "axios": "^0.21.1",
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.3.0",
-    "build-url": "^3.0.0",
-    "bulma": "^0.9.0",
+    "babel-jest": "^26.6.3",
+    "build-url": "^6.0.1",
+    "bulma": "^0.9.2",
     "case": "^1.6.3",
-    "clipboard": "^2.0.6",
+    "clipboard": "^2.0.8",
     "deepmerge": "^4.2.2",
     "focus-trap": "^5.1.0",
     "focus-trap-vue": "0.0.6",
@@ -48,34 +50,34 @@
     "lodash.findindex": "^4.6.0",
     "lodash.isempty": "^4.4.0",
     "lodash.sortby": "^4.7.0",
-    "node-sass": "^4.14.1",
-    "nuxt": "^2.14.7",
+    "node-sass": "^4.14.0",
+    "nuxt": "^2.15.4",
     "nuxt-ssr-cache": "^1.5.2",
-    "patch-package": "^6.2.2",
+    "patch-package": "^6.4.7",
     "sass-loader": "^10.0.1",
-    "uuid": "^8.3.1",
-    "vue-i18n": "^8.21.0"
+    "uuid": "^8.3.2",
+    "vue-i18n": "^8.24.2"
   },
   "devDependencies": {
-    "@nuxt/types": "^2.14.7",
-    "@nuxtjs/eslint-module": "^2.0.0",
-    "@types/jest": "^26.0.10",
-    "@vue/test-utils": "^1.0.4",
-    "cypress": "^5.0.0",
-    "eslint": "^7.7.0",
-    "eslint-config-prettier": "^6.11.0",
+    "@nuxt/types": "^2.15.4",
+    "@nuxtjs/eslint-module": "^3.0.2",
+    "@types/jest": "^26.0.22",
+    "@vue/test-utils": "^1.1.3",
+    "cypress": "^6.0.0",
+    "eslint": "^7.23.0",
+    "eslint-config-prettier": "^8.1.0",
     "eslint-loader": "^4.0.2",
-    "eslint-plugin-cypress": "^2.11.1",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-vue": "^6.2.2",
-    "eslint-plugin-vuejs-accessibility": "^0.5.1",
+    "eslint-plugin-cypress": "^2.11.2",
+    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-vue": "^7.8.0",
+    "eslint-plugin-vuejs-accessibility": "^0.6.1",
     "glob": "^7.1.6",
-    "husky": "^4.2.5",
-    "jest": "^26.4.2",
+    "husky": "^6.0.0",
+    "jest": "^26.6.3",
     "jest-transform-stub": "^2.0.0",
-    "lint-staged": "^10.2.13",
-    "prettier": "^2.1.1",
-    "vue-jest": "^3.0.6"
+    "lint-staged": "^10.5.4",
+    "prettier": "^2.2.1",
+    "vue-jest": "^3.0.7"
   },
   "engines": {
     "node": ">= 12.0.0",
@@ -86,15 +88,6 @@
     "last 2 versions",
     "not ie <= 8"
   ],
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.{js,vue}": "eslint --cache --fix",
-    "*.{js,vue,css,md}": "prettier --write"
-  },
   "volta": {
     "node": "12.19.0",
     "npm": "6.14.8"

diff --git a/src/components/ContentReport/DmcaNotice.vue b/src/components/ContentReport/DmcaNotice.vue
@@ -5,7 +5,7 @@
       tag="p"
       class="is-block padding-horizontal-big margin-top-large has-text-centered"
     >
-      <template v-slot:link>
+      <template #link>
         <a
           :aria-label="$t('photo-details.aria.dmca')"
           :href="dmcaFormUrl"
@@ -21,7 +21,7 @@
       tag="p"
       class="is-block padding-horizontal-big margin-top-normal has-text-centered"
     >
-      <template v-slot:link>
+      <template #link>
         <a
           :aria-label="provider + 'form'"
           :href="imageURL"

diff --git a/src/components/ContentReport/DoneMessage.vue b/src/components/ContentReport/DoneMessage.vue
@@ -8,7 +8,7 @@
       tag="span"
       class="is-block padding-horizontal-big margin-top-large has-text-centered"
     >
-      <template v-slot:link>
+      <template #link>
         <a
           :aria-label="providerName + 'form'"
           :href="imageURL"

diff --git a/src/components/Filters/FilterBlock.vue b/src/components/Filters/FilterBlock.vue
@@ -4,7 +4,7 @@
     class="filter-block button tiny tag margin-horizontal-smaller"
     :aria-label="label + 'filter'"
   >
-    <span>{{ this.$props.label }}</span>
+    <span>{{ $props.label }}</span>
     <span
       :aria-label="$t('browse-page.aria.remove-filter')"
       class="close margin-left-small"
@@ -19,7 +19,7 @@
     class="filter-block button tiny tag margin-horizontal-smaller margin-bottom-smaller"
     :aria-label="label + 'filter'"
   >
-    <span>{{ $t(this.$props.label) }}</span>
+    <span>{{ $t($props.label) }}</span>
     <span
       class="close margin-left-small padding-small"
       tabindex="0"

diff --git a/src/components/Filters/LicenseExplanationTooltip.vue b/src/components/Filters/LicenseExplanationTooltip.vue
@@ -14,7 +14,7 @@
       tag="p"
       class="caption is-pulled-right margin-small"
     >
-      <template v-slot:link>
+      <template #link>
         <a target="_blank" :href="`${getLicenseDeedLink(license)}`">{{
           $t('filters.license-explanation.link')
         }}</a>
@@ -26,7 +26,7 @@
       tag="p"
       class="caption is-pulled-right margin-small"
     >
-      <template v-slot:link>
+      <template #link>
         <a target="_blank" :href="`${getLicenseDeedLink(license)}`">{{
           $t('filters.license-explanation.link')
         }}</a>

diff --git a/src/components/FooterSection.vue b/src/components/FooterSection.vue
@@ -88,15 +88,15 @@
           </nav>
           <div class="attribution margin-top-bigger">
             <i18n path="footer.caption.label" tag="p" class="caption">
-              <template v-slot:noted>
+              <template #noted>
                 <a
                   href="https://creativecommons.org/policies#license"
                   target="_blank"
                   rel="noopener"
                   >{{ $t('footer.caption.noted') }}</a
                 >
               </template>
-              <template v-slot:attribution>
+              <template #attribution>
                 <a
                   href="https://creativecommons.org/licenses/by/4.0/"
                   target="_blank"
@@ -105,7 +105,7 @@
                   {{ $t('footer.caption.attribution') }}
                 </a>
               </template>
-              <template v-slot:icons>
+              <template #icons>
                 <a
                   href="https://fontawesome.com/"
                   target="_blank"

diff --git a/src/components/HeroSection.vue b/src/components/HeroSection.vue
@@ -63,7 +63,7 @@
         </div>
         <div class="caption has-text-centered margin-top-big">
           <i18n path="hero.caption.content" tag="p">
-            <template v-slot:link>
+            <template #link>
               <a
                 href="https://creativecommons.org/share-your-work/licensing-examples/"
                 target="_blank"

diff --git a/src/components/HomeLicenseFilter.vue b/src/components/HomeLicenseFilter.vue
@@ -13,7 +13,7 @@
           :checked="licenseType.checked"
           name="lt"
           :value="licenseType.code"
-          @input="onFilterChanged(licenseType.code)"
+          @change="onFilterChanged(licenseType.code)"
         />
         {{ $t(licenseType.name) }}
       </label>

diff --git a/src/components/ImageDetails/ImageAttribution.vue b/src/components/ImageDetails/ImageAttribution.vue
@@ -14,7 +14,7 @@
         tag="span"
         class="caption has-text-weight-semibold"
       >
-        <template v-slot:link>
+        <template #link>
           <a
             :aria-label="$t('photo-details.aria.attribution.tool')"
             :href="licenseURL"
@@ -36,7 +36,7 @@
         tag="span"
         class="photo_usage-attribution is-block"
       >
-        <template v-slot:link>
+        <template #link>
           <a
             class="photo_license"
             :href="licenseURL"
@@ -55,7 +55,7 @@
         tag="span"
         class="caption has-text-weight-semibold"
       >
-        <template v-slot:link>
+        <template #link>
           <a
             :aria-label="$t('photo-details.aria.attribution.license')"
             :href="licenseURL"

diff --git a/src/components/MetaSearch/MetaSearchForm.vue b/src/components/MetaSearch/MetaSearchForm.vue
@@ -6,18 +6,18 @@
         tag="h4"
         class="b-header margin-bottom-small"
       >
-        <template v-slot:type>
+        <template #type>
           {{ type }}
         </template>
       </i18n>
       <i18n path="meta-search.form.caption" tag="p">
-        <template v-slot:type>
+        <template #type>
           {{ type }}
         </template>
-        <template v-slot:break>
+        <template #break>
           <br />
         </template>
-        <template v-slot:filter>
+        <template #filter>
           {{ unsupportedByUsefilter }}
         </template>
       </i18n>

diff --git a/src/pages/about.vue b/src/pages/about.vue
@@ -7,7 +7,7 @@
         </h1>
         <div class="content">
           <i18n path="about.description.content" tag="p">
-            <template v-slot:link>
+            <template #link>
               <a
                 :aria-label="$t('about.aria.licenses')"
                 href="https://creativecommons.org/share-your-work/licensing-examples/"
@@ -16,56 +16,56 @@
             </template>
           </i18n>
           <i18n path="about.collection" tag="p">
-            <template v-slot:common-crawl>
+            <template #common-crawl>
               <a aria-label="common crawl" href="http://commoncrawl.org/"
                 >Common Crawl</a
               >
             </template>
           </i18n>
           <i18n path="about.planning.content" tag="p">
-            <template v-slot:vision>
+            <template #vision>
               <a
                 :aria-label="$t('about.aria.vision')"
                 href="https://creativecommons.org/2019/03/19/cc-search/"
                 >{{ $t('about.planning.vision') }}</a
               >
             </template>
-            <template v-slot:roadmap>
+            <template #roadmap>
               <a
                 :aria-label="$t('about.aria.roadmap')"
                 href="https://docs.google.com/document/d/19yH2V5K4nzWgEXaZhkzD1egzrRayyDdxlzxZOTCm_pc/edit#heading=h.jih78emira0r"
                 >{{ $t('about.planning.roadmap') }}</a
               >
             </template>
-            <template v-slot:working>
+            <template #working>
               <a
                 :aria-label="$t('about.aria.projects')"
                 href="https://github.com/orgs/creativecommons/projects/7"
                 >{{ $t('about.planning.working') }}</a
               >
             </template>
-            <template v-slot:search>
+            <template #search>
               <a
                 aria-label="cc search repository"
                 href="https://github.com/creativecommons/cccatalog-frontend/"
                 >{{ $t('about.planning.search') }}</a
               >
             </template>
-            <template v-slot:catalog-api>
+            <template #catalog-api>
               <a
                 aria-label="cc catalog-api repository"
                 href="https://github.com/creativecommons/cccatalog-api/"
                 >{{ $t('about.planning.catalog-api') }}</a
               >
             </template>
-            <template v-slot:catalog>
+            <template #catalog>
               <a
                 aria-label="cc catalog repository"
                 href="https://github.com/creativecommons/cccatalog/"
                 >{{ $t('about.planning.catalog') }}</a
               >
             </template>
-            <template v-slot:community>
+            <template #community>
               <a
                 :aria-label="$t('about.aria.contribution')"
                 href="https://creativecommons.github.io/contributing-code/"
@@ -74,7 +74,7 @@
             </template>
           </i18n>
           <i18n path="about.declaration.content" tag="p">
-            <template v-slot:terms>
+            <template #terms>
               <a
                 :aria-label="$t('about.aria.terms')"
                 href="https://creativecommons.org/terms/"

diff --git a/src/pages/feedback.vue b/src/pages/feedback.vue
@@ -6,14 +6,14 @@
           {{ $t('feedback.title') }}
         </h1>
         <i18n path="feedback.description" tag="p" class="margin-bottom-large">
-          <template v-slot:channel>
+          <template #channel>
             <a
               :aria-label="$t('feedback.aria.cc-usability')"
               href="https://creativecommons.slack.com/messages/CCS9CF2JE/details/"
               >#cc-usability</a
             >
           </template>
-          <template v-slot:slack>
+          <template #slack>
             <a
               aria-label="cc slack"
               href="https://wiki.creativecommons.org/wiki/Slack#How_to_join_Slack"