Skip to content

Commit

Permalink
Merge pull request #3143 from webpack/next-update-june
Browse files Browse the repository at this point in the history
Next update june
  • Loading branch information
EugeneHlushko authored Jun 26, 2019
2 parents e9764a8 + a506976 commit 28c0855
Show file tree
Hide file tree
Showing 235 changed files with 13,459 additions and 5,982 deletions.
3 changes: 2 additions & 1 deletion .alexignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
generated/plugins/*
src/content/plugins/_*.md
src/content/loaders/_*.md
12 changes: 10 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
{
"presets": [
"env",
["env", { "modules": false }],
"react"
],
"plugins": [
"syntax-dynamic-import",
"transform-object-rest-spread",
"transform-class-properties"
]
],
"env": {
"development": {
"plugins": [
"react-hot-loader/babel"
]
}
}
}
9 changes: 5 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ root = true
trim_trailing_whitespace = true
insert_final_newline = true

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

# Format Any Missing Config Files
[.eslintignore]
# Format Configs
[.eslintignore,*rc]
indent_style = space
indent_size = 2
6 changes: 3 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
build/
generated/
antwar.config.js
dist/
src/content/loaders/_*.md
src/content/plugins/_*.md
10 changes: 2 additions & 8 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,32 +1,26 @@
{
"root": true,

"extends": "eslint:recommended",

"parser": "babel-eslint",

"env": {
"browser": true,
"es6": true,
"node": true
},

"plugins": [
"markdown"
],

"globals": {
"__DEV__": true
},

"rules": {
"no-undef": 2,
"no-unreachable": 2,
"no-unused-vars": 0,
"no-console": 0,
"semi": ["error", "always"]
"semi": ["error", "always"],
"quotes": ["error", "single"]
},

"overrides": [
{
"files": ["src/content/**/*.md"],
Expand Down
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
open_collective: webpack

8 changes: 5 additions & 3 deletions .github/ISSUE_TEMPLATE/Documentation_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ name: Documentation request
about: Create a documentation request for a new feature or functionality change.
---

**Feature to document**
__Feature to document__

<!-- Name of the feature(s) and a link to related pull request of the feature implementation. -->

**Author(s)**
__Author(s)__

<!-- Mention feature author(s) in order to know who is assignable for review outside of the documentation team. -->

**Additional information**
__Additional information__

<!-- Please provide any additional information that is required in order to document the feature in the best possible way or say N/A if linked PR has more than enough details. -->

[ ] I am willing to work on this issue and submit a pull request.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ _describe your changes..._


[1]: https://cla.js.foundation/webpack/webpack.js.org
[2]: https://webpack.js.org/writers-guide/
[2]: https://webpack.js.org/contribute/writers-guide/
14 changes: 8 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
node_modules
npm-debug.log
build
generated
support-*.json
starter-kits-data.json
.antwar
dist
src/**/_*.json
src/**/_*.md
.vscode
.idea
.DS_Store
npm-debug.log
yarn-error.log
package-lock.json
.cache
internal-links.tap
stats.json
printable.md
58 changes: 46 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,49 @@
branches:
only:
- master
- develop
sudo: false
language: node_js
node_js:
- "8"
sudo: required
install:
- yarn
- sudo pip install proselint
before_script:
- source ./src/scripts/env.sh
script:
- bash ./src/scripts/deploy.sh

matrix:
fast_finish: true

cache:
yarn: true
directories:
- node_modules
- dist
- .cache

stages:
- Build
- Post-build

jobs:
fast_finish: true

include:
- stage: Build
name: Lint and Build
before_install: npm install --global yarn
install: yarn
script:
- yarn lint:js || travis_terminate 1
- yarn lint:markdown || travis_terminate 1
- yarn lint:social || travis_terminate 1
- yarn build || travis_terminate 1
- yarn lint:links || travis_terminate 1

- stage: Build
name: Proselint
language: python
python: 3.6
cache:
pip: true
directories:
- $HOME/.cache
install: pip install -r requirements.txt
script: cp .proselintrc ~/ && proselint src/content

- stage: Post-build
name: Deploy
if: branch = master AND type = push
script: bash ./src/scripts/deploy.sh
59 changes: 29 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,61 +1,60 @@
# webpack.js.org

[![Build Status][13]][10]
[![Standard Version][12]][11]
[![Build Status][build-status]][build-status-url]
[![Standard Version][release]][release-url]
[![chat on gitter][chat]][chat-url]

Guides, documentation, and all things webpack.


## Content Progress

Now that we've covered much of the backlog of _missing documentation_, we are
starting to heavily review each section of the site's content to sort and
structure it appropriately. The following issues should provide a pretty good
idea of where things are, and where they are going:

- [Guides - Review and Simplify][1]
- [Concepts - Review and Organize][2]
- [API - v4 Rewrite][8]
- [Guides - Review and Simplify][guides-url]
- [Concepts - Review and Organize][concepts-url]

We haven't created issues for the other sections yet, but they will be coming
soon. For dev-related work please see [General - Updates & Fixes][3].
soon. For dev-related work please see [General - Updates & Fixes][general-url].

The alpha version of webpack 5 is out and we are lagging behind with documenting all of the related changes. See [this refined search][webpack5-milestone-url] for the list of relevant documentation requests.

## Translation

To help translate this documentation please jump to the [translate branch][4].

To help translate this documentation please jump to the [translation branch][translate-url].

## Contributing

Read through the [writer's guide][7] if you're interested in editing the
content on this site. See the [contributors page][5] to learn how to set up and
Read through the [writer's guide][writer-guide-url] if you're interested in editing the
content on this site. See the [contributors page][contributing-url] to learn how to set up and
start working on the site locally.


## License

The content is available under the [Creative Commons BY 4.0][6] license.

The content is available under the [Creative Commons BY 4.0][license-url] license.

## Special Thanks

_BrowserStack_ has graciously allowed us to do cross-browser and cross-os
testing of the site at no cost...

[![BrowserStackLogo](./browserstack-logo.png)][9]


[1]: https://github.com/webpack/webpack.js.org/issues/1258
[2]: https://github.com/webpack/webpack.js.org/issues/1386
[3]: https://github.com/webpack/webpack.js.org/issues/1525
[4]: https://github.com/webpack/webpack.js.org/tree/translation
[5]: https://github.com/webpack/webpack.js.org/blob/master/.github/CONTRIBUTING.md
[6]: https://creativecommons.org/licenses/by/4.0/
[7]: https://webpack.js.org/writers-guide
[8]: https://github.com/webpack/webpack.js.org/pull/1754
[9]: http://browserstack.com/
[10]: http://travis-ci.org/webpack/webpack.js.org
[11]: https://github.com/conventional-changelog/standard-version
[12]: https://img.shields.io/badge/release-standard%20version-brightgreen.svg
[13]: https://secure.travis-ci.org/webpack/webpack.js.org.svg
[![BrowserStackLogo][browserstack]][browserstack-url]

[webpack5-milestone-url]: https://github.com/webpack/webpack.js.org/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22webpack+5%22
[build-status]: https://secure.travis-ci.org/webpack/webpack.js.org.svg
[build-status-url]: http://travis-ci.org/webpack/webpack.js.org
[browserstack]: ./browserstack-logo.png
[browserstack-url]: http://browserstack.com/
[chat]: https://badges.gitter.im/webpack/webpack.svg
[chat-url]: https://gitter.im/webpack/webpack
[concepts-url]: https://github.com/webpack/webpack.js.org/issues/1386
[contributing-url]: https://github.com/webpack/webpack.js.org/blob/master/.github/CONTRIBUTING.md
[general-url]: https://github.com/webpack/webpack.js.org/issues/1525
[guides-url]: https://github.com/webpack/webpack.js.org/issues/1258
[license-url]: https://creativecommons.org/licenses/by/4.0/
[release]: https://img.shields.io/badge/release-standard%20version-brightgreen.svg
[release-url]: https://github.com/conventional-changelog/standard-version
[translate-url]: https://github.com/webpack/webpack.js.org/tree/translation
[writer-guide-url]: https://webpack.js.org/contribute/writers-guide
22 changes: 0 additions & 22 deletions antwar.bootstrap.js

This file was deleted.

82 changes: 0 additions & 82 deletions antwar.config.js

This file was deleted.

Loading

0 comments on commit 28c0855

Please sign in to comment.