frontplate-cliを最新版にアップデート

sable-virt · Oct 6, 2016 · 708af33 · 708af33
1 parent 45da3ac
commit 708af33
Show file tree

Hide file tree

Showing 17 changed files with 96 additions and 66 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 1,5 @@
 {
  "presets": [
  ["es2015", { "modules": false }]
  ]
 }
diff --git a/config/copy.config.js b/config/copy.config.js
@@ -1,3 1,4 @@
 module.exports = {
- "src/lib/**/*": "public/assets/lib"
  // "path/from": "/path/to"
  "src/lib/**/*": "public/assets/lib"
 };
diff --git a/config/html.config.js b/config/html.config.js
@@ -1,11 1,10 @@
 module.exports = {
- src: 'src/view/**/*.ejs',
- dest: 'public',
- // ejs params
- params: {
  src: 'src/view/**/*.ejs', // 読み込むビューファイル
  dest: 'public', // 出力先
  params: { // ビューで使うグローバル変数
  title: 'title'
  },
- // htmlhint rules
  // htmlhintルール(https://github.com/yaniswang/HTMLHint/wiki/Rules)
  rules: {
  "tagname-lowercase": true,
  "attr-lowercase": true,

diff --git a/config/image.config.js b/config/image.config.js
@@ -1,4 1,4 @@
 module.exports = {
- src: 'src/images/*.{gif,jpg,png}',
- dest: 'public/assets/images'
  src: 'src/images/*.{gif,jpg,png}', // 読み込むイメージ
  dest: 'public/assets/images' // 出力先
 };
diff --git a/config/server.config.js b/config/server.config.js
@@ -1,7 1,7 @@
 'use strict';
 module.exports = {
- "server": 'public',
- "port": 3000,
  "server": 'public', // ドキュメントルート
  "port": 3000, // ポート
  "middleware": [
  ],
  "ghostMode": {

diff --git a/config/sprite.config.js b/config/sprite.config.js
@@ -1,10 1,10 @@
 'use strict';
 module.exports = [
  {
- src: 'src/sprites/icon/*.{png,gif,jpg}',
- destImage: 'src/images/icon.png',
- destCSS: 'src/sass/sprites/_icon.scss',
- imgPath: '../images/icon.png',
- padding: 2
  src: 'src/sprites/icon/*.{png,gif,jpg}', // 読み込む画像
  destImage: 'src/images/icon.png', // 画像出力先
  destCSS: 'src/sass/sprites/_icon.scss', // CSS出力先
  imgPath: '../images/icon.png', // CSS内での画像パス
  padding: 2 // 画像の間隔
  }
 ];
diff --git a/config/style.config.js b/config/style.config.js
@@ -5,10 5,10 @@ const SUPPORT_BROWSERS = [
  'Android >= 4.0'
 ];
 module.exports = {
- src: 'src/sass/**/*.scss',
- dest: 'public/assets/css',
- plugins: [
- require('autoprefixer')({
  src: 'src/sass/**/*.scss', // 読み込むscss
  dest: 'public/assets/css', // 出力先
  plugins: [ // postcssプラグイン
  require('autoprefixer')({ // autoprefixer(https://github.com/postcss/autoprefixer)
  browsers: SUPPORT_BROWSERS
  })
  ]

diff --git a/config/test.conf.js b/config/test.conf.js
@@ -1,25 1,30 @@
 'use strict';
 /**
  * karma conf
  * @param config
  * url: https://karma-runner.github.io/1.0/config/configuration-file.html
  */
 module.exports = function (config) {
  config.set({
  // base path that will be used to resolve all patterns (eg. files, exclude)
  basePath: '',
  // frameworks to use
  // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
- frameworks: ['mocha'],
  frameworks: ['jasmine'],
 
  // list of files / patterns to load in the browser
  files: [
- require.resolve('power-assert/build/power-assert'),
  'src/js/**/*-spec.js'
  ],
  preprocessors: {
- 'src/js/**/*-spec.js': ['babel']
  'src/js/**/*-spec.js': ['webpack','babel']
  },
- babelPreprocessor: {
- options: {
- presets: ['es2015'],
- sourceMap: 'inline'
- }
  webpack: {
  resolve: { modules: [ './src/js'] },
  },
  webpackMiddleware: {
  quiet: true,
  stats: 'errors-only'
  },
  exclude: [],
  // test results reporter to use

diff --git a/config/webpack.config.js b/config/webpack.config.js
@@ -2,29 2,29 @@
 const webpack = require("webpack");
 const merge = require("webpack-merge");
 const core = require("./webpack.core");
 /**
  * webpack config
  * url: https://webpack.github.io/docs/configuration.html
  */
 const webpackConfig = merge(core, {
- debug: true,
  devtool: '#source-map',
  module: {
  loaders: [
  {
  test: /\.jsx?$/,
  exclude: /node_modules/,
- loaders: [
- 'webpack-espower-loader',
- 'babel?presets[]=es2015'
- ]
  loader: 'babel?babelrc='   __dirname   '/../.babelrc'
  }
  ]
  },
  plugins: [
- new webpack.ProvidePlugin({
- assert: "power-assert",
- }),
  new webpack.DefinePlugin({
- 'NODE_ENV': 'development'
  'process.env': {
  'NODE_ENV': JSON.stringify('development')
  }
  }),
- new webpack.BannerPlugin('console.warn("This script is development version.");', {
  new webpack.BannerPlugin({
  banner: 'console.warn("This script is development version.");',
  raw: true
  })
  ]

diff --git a/config/webpack.config.production.js b/config/webpack.config.production.js
@@ -3,17 3,17 @@ const webpack = require("webpack");
 const merge = require("webpack-merge");
 const ClosureCompiler = require.main.require('google-closure-compiler-js').webpack;
 const core = require("./webpack.core");
 /**
  * webpack config for production
  * url: https://webpack.github.io/docs/configuration.html
  */
 const webpackConfig = merge(core,{
- devtool: '#source-map',
  module: {
  loaders: [
  {
  test: /\.jsx?$/,
  exclude: /node_modules/,
- loaders: [
- 'webpack-unassert',
- 'babel?presets[]=es2015'
- ]
  loader: 'babel?babelrc='   __dirname   '/../.babelrc'
  }
  ]
  },
@@ -26,12 26,14 @@ const webpackConfig = merge(core,{
  warningLevel: 'QUIET',
  },
  }),
- //new webpack.optimize.CommonsChunkPlugin('app','app.js'),
  // new webpack.optimize.CommonsChunkPlugin('app','app.js'),
  new webpack.optimize.AggressiveMergingPlugin(),
- new webpack.optimize.OccurenceOrderPlugin(),
  new webpack.optimize.OccurrenceOrderPlugin(),
  new webpack.optimize.DedupePlugin(),
  new webpack.DefinePlugin({
- 'NODE_ENV': 'production'
  'process.env': {
  'NODE_ENV': JSON.stringify('production')
  }
  })
  ],
 });

diff --git a/config/webpack.core.js b/config/webpack.core.js
@@ -1,5 1,9 @@
 'use strict';
 const webpack = require("webpack");
 /**
  * webpack config
  * url: https://webpack.github.io/docs/configuration.html
  */
 const webpackConfig = {
  entry: {
  app: './src/js/app.js'
@@ -11,20 15,24 @@ const webpackConfig = {
  sourceMapFilename: 'maps/[name].map',
  jsonpFunction: 'fr'
  },
- resolve: { root: [ './src/js'] },
  resolve: { modules: [ './src/js'] },
  module: {
- preLoaders: [
- {test: /\.js$/, exclude: /node_modules/, loader: 'eslint'}
- ],
  loaders: [
  {test: /\.js$/, exclude: /node_modules/, loader: 'eslint', enforce: 'pre'},
  {test: /\.html$/, loader: 'html'},
  {test: /\.json$/, loader: 'json'},
  ],
  exprContextCritical: false
  },
- eslint: {
- configFile: __dirname   '/../.eslintrc',
- failOnError: true
- }
  plugins: [
  new webpack.LoaderOptionsPlugin({
  options: {
  eslint: {
  configFile: __dirname   '/../.eslintrc',
  failOnError: true
  }
  }
  })
  ]
 };
 module.exports = webpackConfig;
diff --git a/package.json b/package.json
@@ -4,13 4,13 @@
  "description": "フロントエンド開発の効率をあげるフルスタックテンプレート",
  "dependencies": {},
  "devDependencies": {
- "frontplate-cli": "^0.1.7"
  "frontplate-cli": "^0.2.3"
  },
  "scripts": {
- "start": "frp build && frp serve",
  "start": "frp build && frp serve -t",
  "test": "frp build",
  "build": "frp build",
- "serve": "frp serve",
  "serve": "frp serve -t",
  "production": "frp build -p",
  "changelog": "conventional-changelog -p eslint -i CHANGELOG.md -w -s -r 0"
  },

diff --git a/src/js/app-spec.js b/src/js/app-spec.js
@@ -1,8 1,10 @@
 import {App} from './app';
 describe('app', () => {
  beforeEach(() => {
 
  });
  it('init', () => {
- assert('a' === 'a');
  let app = new App('myapp');
  expect(app.val).toBe('myapp');
  });
 });
diff --git a/src/js/app.js b/src/js/app.js
@@ -2,12 2,13 @@ import 'sub/sub';
 /**
  * @constructor
  */
-class Main {
 export class App {
  constructor(val) {
  this.val = val;
  }
 }
 
-let m = new Main('main');
-assert(m.val === 'main', `Init val match`);
-assert(m.val === 'sub', `Init val unmatch`);
 let m = new App('main');
 if (process.env.NODE_ENV === 'development') {
  console.debug('main value:', m.val);
 }
diff --git a/src/js/sub/sub-spec.js b/src/js/sub/sub-spec.js
@@ -0,0 1,10 @@
 import {Sub} from 'sub/sub';
 describe('app', () => {
  beforeEach(() => {
 
  });
  it('init', () => {
  let sub = new Sub('sub');
  expect(sub.val).toBe('sub');
  });
 });
diff --git a/src/js/sub/sub.js b/src/js/sub/sub.js
@@ -1,12 1,8 @@
 /**
  * @constructor
  */
-class Main {
 export class Sub {
  constructor(val) {
  this.val = val;
  }
 }
-
-let m = new Main('main');
-assert(m.val === 'main', `Init val match`);
-assert(m.val === 'sub', `Init val unmatch`);
diff --git a/src/sass/style.scss b/src/sass/style.scss
@@ -8,3 8,4 @@
 @import 'base/base';
 @import 'layout/layout';
 @import 'sprites/icon';