Skip to content

Commit 0d09e2a

Browse files
committed
feat: パッケージのアップデート・デザイン崩れへの対応
1 parent afc2282 commit 0d09e2a

File tree

6 files changed

+4570
-5033
lines changed

6 files changed

+4570
-5033
lines changed

nuxt.config.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import Sass from 'sass'
2+
import Fiber from 'fibers'
13
import i18nConfig from './nuxt-i18n.config.js'
24
const environment = process.env.NODE_ENV || 'development'
35

@@ -152,6 +154,14 @@ export default {
152154
*/
153155
build: {
154156
publicPath: '/assets/',
157+
loaders: {
158+
scss: {
159+
implementation: Sass,
160+
sassOptions: {
161+
fiber: Fiber,
162+
},
163+
},
164+
},
155165
babel: {
156166
presets({ isServer }) {
157167
return [

package.json

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"author": "Nekoya3",
66
"private": true,
77
"scripts": {
8-
"dev": "cross-env NODE_ENV=development nuxt-ts",
9-
"build": "nuxt-ts build",
8+
"dev": "cross-env NODE_ENV=development nuxt",
9+
"build": "nuxt build",
1010
"test:unit": "jest --config jest.config.js",
11-
"start": "nuxt-ts start",
12-
"generate": "nuxt-ts generate",
11+
"start": "nuxt start",
12+
"generate": "nuxt generate",
1313
"lint": "eslint --ext .js,.vue,.ts --ignore-path .eslintignore ."
1414
},
1515
"lint-staged": {
@@ -24,65 +24,66 @@
2424
}
2525
},
2626
"dependencies": {
27-
"@aws-amplify/api": "^3.2.7",
28-
"@babel/core": "^7.12.1",
29-
"@babel/runtime-corejs3": "^7.12.1",
30-
"@nuxt/typescript-runtime": "^2.0.0",
31-
"@nuxtjs/axios": "^5.12.2",
27+
"@aws-amplify/api": "^3.3.3",
28+
"@babel/core": "^7.14.3",
29+
"@babel/runtime-corejs3": "^7.14.0",
30+
"@nuxtjs/axios": "^5.13.4",
3231
"@nuxtjs/dotenv": "^1.4.1",
3332
"@nuxtjs/google-analytics": "^2.4.0",
34-
"@nuxtjs/pwa": "^3.2.2",
33+
"@nuxtjs/pwa": "^3.3.5",
3534
"@nuxtjs/style-resources": "^1.0.0",
36-
"@types/node": "^14.11.8",
37-
"aws-amplify": "^3.3.4",
38-
"core-js": "^3.6.5",
39-
"cross-env": "^7.0.2",
40-
"date-fns": "^2.16.1",
41-
"dayjs": "^1.9.3",
35+
"@types/node": "^14.14.45",
36+
"aws-amplify": "^3.4.3",
37+
"core-js": "^3.12.1",
38+
"cross-env": "^7.0.3",
39+
"date-fns": "^2.21.3",
40+
"dayjs": "^1.10.4",
4241
"express": "^4.17.1",
43-
"nuxt": "^2.14.7",
44-
"nuxt-i18n": "^6.15.3",
45-
"nuxt-property-decorator": "^2.8.8",
42+
"nuxt": "^2.15.6",
43+
"nuxt-i18n": "^6.27.0",
44+
"nuxt-property-decorator": "^2.9.1",
4645
"nuxt-svg-loader": "^1.2.0",
4746
"nuxt-webfontloader": "^1.1.0",
48-
"uuid": "^8.3.1",
49-
"vue-property-decorator": "^9.0.2",
50-
"vuetify": "^2.3.14",
51-
"vuex": "^3.5.1",
47+
"uuid": "^8.3.2",
48+
"vue-property-decorator": "^9.1.2",
49+
"vuetify": "^2.5.0",
50+
"vuex": "^3.6.2",
5251
"vuex-class-component": "^2.3.5"
5352
},
5453
"devDependencies": {
55-
"@mdi/font": "^5.7.55",
56-
"@nuxt/types": "^2.14.7",
57-
"@nuxt/typescript-build": "^2.0.3",
54+
"@mdi/font": "^5.9.55",
55+
"@nuxt/types": "^2.15.6",
56+
"@nuxt/typescript-build": "^2.1.0",
5857
"@nuxtjs/eslint-config-typescript": "^3.0.0",
5958
"@nuxtjs/stylelint-module": "^4.0.0",
60-
"@types/jest": "^26.0.14",
61-
"@vue/test-utils": "^1.1.0",
59+
"@types/jest": "^26.0.23",
60+
"@vue/test-utils": "^1.2.0",
6261
"babel-core": "^6.26.3",
6362
"babel-eslint": "^10.1.0",
64-
"babel-jest": "^26.5.2",
63+
"babel-jest": "^26.6.3",
6564
"cpx": "^1.5.0",
66-
"eslint": "^7.11.0",
67-
"eslint-config-prettier": "^6.12.0",
65+
"eslint": "^7.26.0",
66+
"eslint-config-prettier": "^6.15.0",
6867
"eslint-loader": "^4.0.2",
6968
"eslint-plugin-nuxt": "^1.0.0",
70-
"eslint-plugin-prettier": "^3.1.4",
71-
"eslint-plugin-tsdoc": "^0.2.7",
72-
"husky": "^4.3.0",
73-
"jest": "^26.5.3",
74-
"lint-staged": "^10.4.0",
75-
"node-sass": "^4.14.1",
76-
"nodemon": "^2.0.5",
77-
"prettier": "^2.1.2",
69+
"eslint-plugin-prettier": "^3.4.0",
70+
"eslint-plugin-tsdoc": "^0.2.14",
71+
"fibers": "^5.0.0",
72+
"husky": "^4.3.8",
73+
"jest": "^26.6.3",
74+
"lint-staged": "^10.5.4",
75+
"nodemon": "^2.0.7",
76+
"prettier": "^2.3.0",
7877
"rimraf": "^3.0.2",
79-
"sass-loader": "^10.0.3",
80-
"stylelint": "^13.7.2",
78+
"sass": "^1.32.13",
79+
"sass-loader": "10.1.1",
80+
"stylelint": "^13.13.1",
8181
"stylelint-config-prettier": "^8.0.2",
8282
"stylelint-config-standard": "^20.0.0",
83-
"stylelint-scss": "^3.18.0",
84-
"ts-jest": "^26.4.1",
85-
"ts-loader": "^8.0.5",
83+
"stylelint-scss": "^3.19.0",
84+
"ts-jest": "^26.5.6",
85+
"ts-loader": "^8.2.0",
86+
"typescript": "4.0.5",
8687
"vue": "^2.6.12",
8788
"vue-jest": "^3.0.7",
8889
"vue-server-renderer": "^2.6.12",

src/components/AppLanguageSelector.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export default Vue.extend({
2626
return { locales: [{ text: 'N/A', value: '' }] }
2727
2828
return {
29+
// @ts-ignore
2930
locales: this.$root.$i18n.locales.map((l) => {
3031
if (typeof l === 'string') return { text: l, value: l }
3132
else return { text: l.displayName, value: l.code }

src/components/LessonSummaryCard.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,7 @@ export default Vue.extend({
9595
flex-direction: column;
9696
flex: 0 1 auto;
9797
margin-left: 12px;
98-
99-
.ContentCard-Button {
100-
margin-bottom: 12px;
101-
}
98+
justify-content: space-around;
10299
}
103100
104101
.ContentCard {

src/components/PeriodSection.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export default Vue.extend({
5555
computed: {
5656
maxEndTime() {
5757
const endTimeArray = this.classData.map((value) => dayjs(value.endTime))
58-
return dayjs.max(...endTimeArray)
58+
return dayjs.max(endTimeArray)
5959
},
6060
},
6161
methods: {
@@ -72,6 +72,7 @@ export default Vue.extend({
7272
border-bottom: 1px solid $color-base-color-02;
7373
padding-bottom: 12px;
7474
margin-bottom: 12px;
75+
align-items: center;
7576
7677
&:last-child {
7778
border: none;

0 commit comments

Comments
 (0)