Skip to content

Commit

Permalink
一旦コミット
Browse files Browse the repository at this point in the history
  • Loading branch information
uucyan committed Feb 18, 2019
1 parent b6d9450 commit 5fb490b
Show file tree
Hide file tree
Showing 4 changed files with 3,720 additions and 3,515 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/node:8.11.4
- image: circleci/node:11.10.0
steps:
- restore_cache:
keys:
Expand Down
36 changes: 26 additions & 10 deletions nuxt.config.js
Expand Up @@ -22,8 +22,10 @@ module.exports = { ...prodRouterBase,
dir: 'dist/electron'
},
build: {
extend (config, { isDev, isClient }) {
if (isDev && isClient) {
// extend (config, { isDev, isClient }) {
// if (isDev && isClient) {
extend(config) {
if (process.server && process.browser) {
// Run ESLint on save
config.module.rules.push({
enforce: 'pre',
Expand All @@ -32,13 +34,18 @@ module.exports = { ...prodRouterBase,
exclude: /(node_modules)/
})
}
config.node = {
fs: "empty"
}
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' }
if (process.server) {
config.target = 'electron-renderer'
}
},
vendor: ['element-ui']
},
Expand All @@ -49,18 +56,27 @@ module.exports = { ...prodRouterBase,
],
dev: process.env.NODE_ENV === 'DEV',
css: [
'@/assets/sass/style.sass',
'~assets/sass/style.sass',
'element-ui/lib/theme-chalk/index.css',
],
// modules: [
// [
// 'nuxt-sass-resources-loader',
// [
// '@/assets/sass/variables/_color.sass',
// ]
// ],
// '@nuxtjs/axios',
// ],
modules: [
[
'nuxt-sass-resources-loader',
[
'@/assets/sass/variables/_color.sass',
]
],
'@nuxtjs/style-resources',
'@nuxtjs/axios',
],
styleResources: {
ssss: [
'./assets/sass/variables/_color.sass',
]
},
axios: {
},
rootDir: __dirname
Expand Down
36 changes: 18 additions & 18 deletions package.json
Expand Up @@ -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"
}
}

0 comments on commit 5fb490b

Please sign in to comment.