Skip to content

Commit

Permalink
Merge branch 'master' into cn
Browse files Browse the repository at this point in the history
# Conflicts:
#	antwar.config.js
#	package.json
#	src/components/Footer/Footer.jsx
#	src/components/Page/Page.jsx
#	src/components/Sidebar/Sidebar.jsx
#	src/components/Splash/Splash.jsx
#	src/content/api/cli.md
#	src/content/api/hot-module-replacement.md
#	src/content/api/stats.md
#	src/content/concepts/index.md
#	src/content/configuration/index.md
#	src/content/configuration/resolve.md
#	src/content/guides/author-libraries.md
#	src/content/guides/migrating.md
#	src/content/guides/production.md
#	src/content/guides/typescript.md
#	src/content/index.md
#	src/styles/homepage.scss
#	template.ejs
  • Loading branch information
dear-lizhihua committed Sep 11, 2017
2 parents ce118f7 + 2893347 commit 042e0a5
Show file tree
Hide file tree
Showing 47 changed files with 3,343 additions and 2,565 deletions.
1 change: 1 addition & 0 deletions .alexignore
@@ -0,0 +1 @@
generated/plugins/npm-install-webpack-plugin.md
9 changes: 7 additions & 2 deletions .alexrc
@@ -1,20 +1,24 @@
{
"allow": [
"attacks",
"bigger",
"color",
"colors",
"crash",
"dead",
"dirty",
"disabled",
"dive",
"execute",
"executed",
"executes",
"execution",
"dirty",
"disabled",
"failed",
"failure",
"failures",
"fire",
"hook",
"hooks",
"host-hostess",
"hosts",
"jade",
Expand All @@ -23,6 +27,7 @@
"period",
"pros",
"reject",
"remain",
"remains",
"white"
]
Expand Down
14 changes: 6 additions & 8 deletions .editorconfig
@@ -1,20 +1,18 @@
# Top-most EditorConfig file
root = true

# Set default charset
[*.{js}]
charset = utf-8

# AutoFormat All Files
[*]
trim_trailing_whitespace = true
insert_final_newline = true

# 4 space indentation
[*.{md,js,jsx,scss,hbs}]
# Format All Source Files
[*.{md,js,jsx,json,scss,hbs,*rc}]
charset = utf-8
indent_style = space
indent_size = 2

# Format Config
[{package.json,.alexrc,babelrc,.eslintignore,.eslintrc,.markdownlint.json,.proselintrc}]
# Format Any Missing Config Files
[.eslintignore]
indent_style = space
indent_size = 2
5 changes: 5 additions & 0 deletions .postcssrc.js
@@ -0,0 +1,5 @@
module.exports = {
plugins: [
require('autoprefixer')
]
}
4 changes: 2 additions & 2 deletions bootstrap.js → antwar.bootstrap.js
@@ -1,6 +1,6 @@
const antwar = require('antwar');

const environment = process.env.npm_lifecycle_event || 'build';
const environment = process.argv[2];

// Patch Babel env to make HMR switch work
process.env.BABEL_ENV = environment;
Expand All @@ -9,7 +9,7 @@ antwar[environment]({
environment,
antwar: require('./antwar.config'),
webpack: require('./webpack.config')
}).catch(function (err) {
}).catch((err) => {
console.error(err);

process.exit(1);
Expand Down

0 comments on commit 042e0a5

Please sign in to comment.