From d1a6385fbf17adca2fa9272072d27b919ee5427a Mon Sep 17 00:00:00 2001 From: s60171909 <31-s60171909@biblio19.net> Date: Sun, 15 Oct 2023 15:02:26 +0900 Subject: [PATCH 1/3] yarn to npm --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 889c580..2226246 100644 --- a/README.md +++ b/README.md @@ -2,22 +2,22 @@ ## Project setup ``` -yarn install +npm install ``` ### Compiles and hot-reloads for development ``` -yarn serve +npm run serve ``` ### Compiles and minifies for production ``` -yarn build +npm run build ``` ### Lints and fixes files ``` -yarn lint +npm run lint ``` ### Customize configuration -- GitLab From 2cbbd2aef597f15aed41a60632eceeef97538935 Mon Sep 17 00:00:00 2001 From: s60171909 <31-s60171909@biblio19.net> Date: Tue, 17 Oct 2023 13:11:14 +0900 Subject: [PATCH 2/3] Fix gitlab pages --- .gitlab-ci.yml | 16 ++++++++-------- public/favicon.ico | Bin 4286 -> 0 bytes public/index.html | 17 ----------------- vue.config.js | 6 +++++- 4 files changed, 13 insertions(+), 26 deletions(-) delete mode 100644 public/favicon.ico delete mode 100644 public/index.html diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 671ce83..903a7c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: "node:lts-alpine" stages: - - build + - lint - deploy # global cache settings for all jobs @@ -18,27 +18,27 @@ cache: policy: pull # prevent subsequent jobs from modifying cache before_script: + # https://stackoverflow.com/a/75624610 + - cp ${PRODUCTION_ENV_FILE} .env.production # define cache dir & use it npm! - npm ci --cache node_modules/ --prefer-offline # # monorepo users: run secondary install actions # - npx lerna bootstrap -- --cache .npm/ --prefer-offline - - npm run build + -build: - stage: build +lint: + stage: lint # global cache settings are inherited to grab `node_modules` script: + - node --version - npm run lint - artifacts: - paths: - - dist/ # where ever your build results are stored pages: stage: deploy when: on_success # only if previous stages' jobs all succeeded # override inherited cache settings since node_modules is not needed script: - - mv dist public + - npm run build artifacts: paths: - public diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index df36fcfb72584e00488330b560ebcf34a41c64c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4286 zcmZQzU}RuqP*4ET3Jfa*7#PGD7#K7d7#I{77#JKFAmR)lAOIqU2X5Zs$bgLL=_@3A zjhlBkf-u-E^l}5#e(vTSjvJvE#HNe&P`g3?jcVTE_#KKtY>*hu-2k;;s(FXw$>tr7 z|DhPf28q$seyH6be^xc`aQp|g8{`HM8zcsjqlp`k?AB}E;dmd(Zjk*T3=#v$(Zmf< z`&pZJIL^XiH^_bv2FZccP&Evoc7y!o(Y(X)10MT9av(JzwN!Hh)P8~H9gaKj*bVYO z2!qss)KbNMsNEp{q&4qw{6&QQAT=PhAUzbj0cyWO^A5*L7iKh$o<<{gf0*zB%ZV*ek6akv4b2c(xQH$d$Mg`s)#4##Kc_BU;D{GXL$3C18c zx;#`5NH53?lHCBcpR;*~<1!4hcRKzrpKSX--p3S-L2Mjh0MZLGgCzT*c7xm<)V#y- z3yS?a9sf71bNHW@Xz@SJ!xW4`Y>*fhH-Pkl%mA51v>TxIi#G3YJcMF5D4p$e{9n{+ z^FPkh6a|CCu-Feuiy$*VW)WpS)NYV_3!8U1{z0*Sr{n+HW%mD*!_C3|hP%PT6f6dk z!{P>z86dMjW)gG*)P9ZT9geq9><0OLyW{`dGAmTOVd3Cm3YKf$4zCkIeurU@Ss*j< z+7Gpxxp{}*uwyWnns+ArO_!|@D?-JmqL!|{JXy){Z+gZlMPypL%f2*-Jv z{(*|Y)q(V2GYe`5$S$z`P`g3ysYPp3f$NrjCM-5(c2Q8ptk?oiME5yuZM-3=hU zAT!X-h1vzO6J$So^A5*3=xSPaIsUJhX8S+E&kP=>F!STRO_wBvm~$isnlXSdhz$~h z$-`)nUXU3ev(U|l+6l5d9HUJID&yBX{7+ATmhrH(1){x7pC(=HT=LB0y}A7)UP8)AS^=9*`Lzvp{CT%!kq-J3)5yHScf)ByT?WW^if zV!|8eX^Mgqe9c%vaSpN<8H2>Ya%k#7X5$(!Tt{e|LXt$|6>oq zKji=a2jLI=|NlQ=hu{Ou|Nnz<1LOby3=ClWkAa~cg#R!w*n{v71_t>L3=I4r{D6Uh a9fS`sFffB~17iat17ib}cK|F4vKj!X^7qaF diff --git a/public/index.html b/public/index.html deleted file mode 100644 index 3e5a139..0000000 --- a/public/index.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - <%= htmlWebpackPlugin.options.title %> - - - -
- - - diff --git a/vue.config.js b/vue.config.js index 910e297..5e68c14 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,4 +1,8 @@ const { defineConfig } = require('@vue/cli-service') module.exports = defineConfig({ - transpileDependencies: true + transpileDependencies: true, + outputDir: 'public', + publicPath: process.env.NODE_ENV === 'production' + ? VUE_APP_BASE_URL + : '/' }) -- GitLab From caa79a1e8c9bbf7d4b91588b70e4f31eca5516b7 Mon Sep 17 00:00:00 2001 From: s60171909 <31-s60171909@biblio19.net> Date: Tue, 17 Oct 2023 13:22:42 +0900 Subject: [PATCH 3/3] Typo --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index 5e68c14..2b4179f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,6 +3,6 @@ module.exports = defineConfig({ transpileDependencies: true, outputDir: 'public', publicPath: process.env.NODE_ENV === 'production' - ? VUE_APP_BASE_URL + ? process.env.VUE_APP_BASE_URL : '/' }) -- GitLab