Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nuxt.js, Electron, etc... のパッケージをアップデート🥳 #47

Merged
merged 2 commits into from Feb 21, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+3,755 −3,540
Diff settings

Always

Just for now

Copy path View file
@@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/node:8.11.4
- image: circleci/node:11.9.0
steps:
- restore_cache:
keys:
@@ -2,8 +2,8 @@
// https://fonts.google.com/specimen/Kosugi+Maru
@font-face
font-family: 'Kosugi Maru'
src: url("~/assets/fonts/KosugiMaru-Regular.ttf")
src: url("~assets/fonts/KosugiMaru-Regular.ttf")

@font-face
font-family: 'Fredoka One'
src: url("~/assets/fonts/FredokaOne-Regular.ttf")
src: url("~assets/fonts/FredokaOne-Regular.ttf")
@@ -4,7 +4,7 @@
margin-right: auto
width: 256px
height: 256px
background: url("~/assets/img/logo.png") center center / cover
background: url("~assets/img/logo.png") center center / cover
filter: drop-shadow(10px 10px 10px rgba(0,0,0,0.5))

.github-icon
@@ -13,4 +13,4 @@
height: 20px
vertical-align: middle
margin-bottom: 4px
background: url("~/assets/img/github.png") center center / cover
background: url("~assets/img/github.png") center center / cover
Copy path View file
@@ -0,0 +1,23 @@
#!/bin/bash

# SEE: https://github.com/sass/node-sass/issues/2054#issuecomment-326525115

set -e
ARCH="x64"
TARGET=$(node -e "console.log(require('./package.json').devDependencies.electron.match(/\d+\.\d+.\d+/)[0])")
PLATFORM=$(node -e "console.log(process.platform)")

cd node_modules/node-sass/

# Build for Electron for current version
node-gyp rebuild --target=$TARGET --arch=$ARCH --dist-url=https://atom.io/download/electron

# Create vendor directory
VENDOR="vendor/$PLATFORM-$ARCH-69"
mkdir -p $VENDOR
cp build/Release/binding.node $VENDOR

cd ../../

# Clean up
rm -rf build
Copy path View file
@@ -12,56 +12,59 @@ module.exports = { ...prodRouterBase,
{ charset: 'utf-8' }
]
}, // Headers of the page

// loading: false, // Disable default loading bar

loadingIndicator: {
name: 'folding-cube',
color: '#573216',
background: 'white'
},

generate: {
dir: 'dist/electron'
},

build: {
extend (config, { isDev, isClient }) {
if (isDev && isClient) {
// Run ESLint on save
config.module.rules.push({
enforce: 'pre',
test: /\.(js|vue)$/,
// loader: 'eslint-loader',
exclude: /(node_modules)/
})
}
transpile: [/^element-ui/],

extend(config, ctx) {
config.module.rules.push({
test: /\.coffee$/,
use: 'coffee-loader',
exclude: /(node_modules)/
})
// Extend only webpack config for client-bundle
if (isClient) { config.target = 'electron-renderer' }

config.target = 'electron-renderer'
},
vendor: ['element-ui']
},

plugins: [
'~plugins/element-ui.coffee',
'~plugins/datastore.coffee',
'~plugins/service.coffee',
],

dev: process.env.NODE_ENV === 'DEV',

css: [
'@/assets/sass/style.sass',
'element-ui/lib/theme-chalk/index.css',
'~assets/sass/style.sass',
'element-ui/lib/theme-chalk/index.css'
],

modules: [
[
'nuxt-sass-resources-loader',
[
'@/assets/sass/variables/_color.sass',
]
],
'@nuxtjs/style-resources',
'@nuxtjs/axios',
],

styleResources: {
sass: [
'./assets/sass/variables/_color.sass',
]
},

axios: {
},

rootDir: __dirname
}
Copy path View file
@@ -22,27 +22,27 @@
},
"dependencies": {
"@nuxtjs/axios": "^5.3.6",
"electron-debug": "^1.5.0",
"element-ui": "^2.4.8",
"@nuxtjs/style-resources": "^0.1.2",
"electron-debug": "^2.1.0",
"element-ui": "^2.5.4",
"nedb": "^1.8.0",
"nuxt": "^1.4.0"
"nuxt": "^2.4.3"
},
"devDependencies": {
"babel-eslint": "^8.2.1",
"babel-eslint": "^10.0.1",
"coffee-loader": "^0.9.0",
"coffeescript": "^2.3.1",
"cross-env": "^5.1.4",
"electron": "2.0.0-beta.7",
"electron-builder": "^20.8.1",
"electron-devtools-installer": "^2.2.3",
"eslint": "^4.15.0",
"eslint-friendly-formatter": "^3.0.0",
"eslint-loader": "^1.7.1",
"eslint-plugin-vue": "^4.0.0",
"node-sass": "^4.9.3",
"nuxt-sass-resources-loader": "^2.0.2",
"pug": "2.0.0-beta6",
"pug-loader": "^2.4.0",
"sass-loader": "^7.0.1"
"coffeescript": "^2.3.2",
"cross-env": "^5.2.0",
"electron": "4.0.5",
"electron-builder": "^20.38.5",
"electron-devtools-installer": "^2.2.4",
"eslint": "^5.14.0",
"eslint-friendly-formatter": "^4.0.1",
"eslint-loader": "^2.1.2",
"eslint-plugin-vue": "^5.2.1",
"node-sass": "^4.11.0",
"pug": "2.0.3",
"pug-plain-loader": "^1.0.0",
"sass-loader": "^7.1.0"
}
}
Oops, something went wrong.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.