Skip to content

Commit

Permalink
Merge branch 'main' into isolated-exec-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
JLHwung committed Aug 10, 2020
2 parents 7590def + 008fe25 commit 57602a2
Show file tree
Hide file tree
Showing 2,032 changed files with 35,452 additions and 7,713 deletions.
41 changes: 25 additions & 16 deletions .circleci/config.yml
Expand Up @@ -4,10 +4,12 @@ aliases:
- &restore-node-modules-cache
keys:
- v1-yarn-deps-{{ checksum "yarn.lock" }}
- v1-yarn-deps-

- &restore-yarn-cache
keys:
- v1-yarn-cache
- v1-1-yarn-cache-{{ checksum "yarn.lock" }}
- v1-1-yarn-cache-

- &save-node-modules-cache
paths:
Expand All @@ -16,8 +18,8 @@ aliases:

- &save-yarn-cache
paths:
- ~/.yarn-cache
key: v1-yarn-cache
- ~/.cache/yarn
key: v1-1-yarn-cache-{{ checksum "yarn.lock" }}

- &artifact_babel
path: ~/babel/packages/babel-standalone/babel.js
Expand Down Expand Up @@ -71,7 +73,7 @@ jobs:
steps:
- checkout
- run:
name: Sync with latest master branch (only on PRs)
name: Sync with latest main branch (only on PRs)
command: |
if [ -n "$CIRCLE_PULL_REQUEST" ]
then
Expand All @@ -86,14 +88,14 @@ jobs:
- run:
name: Setup Test Runner
command: |
git clone --recurse-submodules https://github.com/babel/babel-test262-runner
git clone --depth=1 --recurse-submodules https://github.com/babel/babel-test262-runner
cd babel-test262-runner
npm ci
npm i tap-mocha-reporter --save-dev
node lib/download-node
- run:
name: Download master branch Test262 artifact
command: node lib/download-master-artifact ~/master.tap
name: Download main branch Test262 artifact
command: node lib/download-main-artifact ~/test262-main.tap
<<: *test262_workdir
- run:
name: Run Test262
Expand All @@ -106,26 +108,26 @@ jobs:
cat ~/test262.tap | $(npm bin)/tap-mocha-reporter spec || true
<<: *test262_workdir
- run:
name: Compare previous master branch & current job results
name: Compare previous main branch & current job results
command: |
mkdir -p ~/test-results/test262
node lib/compare-results ~/master.tap ~/test262.tap | tee ~/diff.tap
node lib/compare-results ~/test262-main.tap ~/test262.tap | tee ~/diff.tap
<<: *test262_workdir
- store_artifacts: *artifact_test262_diff_tap
- run:
name: Output comparision results and report to CircleCI
name: Output comparison results and report to CircleCI
command: |
mkdir -p ~/test-results/test262
cat ~/diff.tap | $(npm bin)/tap-merge | $(npm bin)/tap-mocha-reporter xunit | tee ~/test-results/test262/results.xml
<<: *test262_workdir
- store_test_results: *artifact_test262_xunit
- save_cache: *save-node-modules-cache
- save_cache: *save-yarn-cache

publish-verdaccio:
executor: node-executor
steps:
- checkout
- restore_cache: *restore-yarn-cache
- restore_cache: *restore-node-modules-cache
- run: yarn install
- run: ./scripts/integration-tests/publish-local.sh
- persist_to_workspace:
Expand Down Expand Up @@ -171,28 +173,36 @@ workflows:
build-standalone:
jobs:
- build-standalone
test262-master:
test262:
jobs:
- test262:
filters:
branches:
only:
- master
test262:
- main
- next-8-dev
- next-8-rebased
test262-pr:
jobs:
- approve-test262-run:
type: approval
filters:
branches:
ignore:
- main
- master
- next-8-dev
- next-8-rebased
- test262:
requires:
- approve-test262-run
filters:
branches:
ignore:
- main
- master
- next-8-dev
- next-8-rebased
e2e:
jobs:
- publish-verdaccio
Expand All @@ -208,4 +218,3 @@ workflows:
- e2e-vue-cli:
requires:
- publish-verdaccio

33 changes: 26 additions & 7 deletions .eslintrc.js
@@ -1,14 +1,19 @@
"use strict";

const path = require("path");

module.exports = {
root: true,
plugins: ["prettier", "@babel/development", "import", "jest"],
// replace it by `@babel/internal` when `@babel/eslint-config-internal` is published
extends: path.resolve(__dirname, "eslint/babel-eslint-config-internal"),
plugins: [
"import",
"jest",
"prettier",
"@babel/development",
"@babel/development-internal",
],
extends: "@babel/internal",
rules: {
"prettier/prettier": "error",
// TODO: remove after babel-eslint-config-internal is fully integrated into this repository.
"max-len": "off",
},
env: {
node: true,
Expand Down Expand Up @@ -44,8 +49,8 @@ module.exports = {
"jest/no-identical-title": "off",
"jest/no-standalone-expect": "off",
"jest/no-test-callback": "off",
"jest/valid-describe": "off"
}
"jest/valid-describe": "off",
},
},
{
files: ["packages/babel-plugin-*/src/index.js"],
Expand All @@ -55,5 +60,19 @@ module.exports = {
eqeqeq: ["error", "always", { null: "ignore" }],
},
},
{
files: ["packages/babel-parser/src/**/*.js"],
rules: {
"@babel/development-internal/dry-error-messages": [
"error",
{
errorModule: path.resolve(
__dirname,
"packages/babel-parser/src/parser/error.js"
),
},
],
},
},
],
};
1 change: 1 addition & 0 deletions .flowconfig
Expand Up @@ -28,3 +28,4 @@ esproposal.export_star_as=enable
esproposal.optional_chaining=enable
esproposal.nullish_coalescing=enable
module.name_mapper='^@babel\/\([a-zA-Z0-9_\-]+\)$' -> '<PROJECT_ROOT>/packages/babel-\1/src/index'
module.ignore_non_literal_requires=true
6 changes: 0 additions & 6 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE/Bug_report.md
Expand Up @@ -9,26 +9,26 @@ assignees: ''

## Bug Report

<!-- Check this if you would like to implement a PR, we are more than happy to help you go through the process !-->
<!-- If you would like to implement a PR, we are more than happy to help you go through the process!-->
- [ ] I would like to work on a fix!

<!--
@babel/eslint-parser:
If you are having issues with JSX you might want to check out eslint-plugin-react. If there's an issue with new experimental syntax you might need check if it's supported by @babel/eslint-plugin.
-->

**Current Behavior**
**Current behavior**
A clear and concise description of the behavior.

- [REPL](babeljs.io/repl), [Codesandbox](https://codesandbox.io/s/babel-repl-custom-plugin-7s08o?file=/src/index.js), or GitHub Repo link if applicable:
- [REPL](babeljs.io/repl), [Codesandbox](https://codesandbox.io/s/babel-repl-custom-plugin-7s08o?file=/src/index.js), or GitHub Repo helps!

**Input Code**

```js
var your => (code) => here;
```

**Expected behavior/code**
**Expected behavior**
A clear and concise description of what you expected to happen (or code).

**Babel Configuration (babel.config.js, .babelrc, package.json#babel, cli command, .eslintrc)**
Expand All @@ -54,5 +54,5 @@ A clear and concise description of what you expected to happen (or code).
**Possible Solution**
<!--- If you have suggestions on a fix for the bug -->

**Additional context/Screenshots**
Add any other context about the problem here. If applicable, add screenshots to help explain.
**Additional context**
Add any other context about the problem here. Or a screenshot if applicable
15 changes: 6 additions & 9 deletions .github/ISSUE_TEMPLATE/Feature_request.md
@@ -1,6 +1,6 @@
---
name: "\U0001F680 Feature Request"
about: "I have a suggestion (and may want to implement it \U0001F642)!"
about: "I have a specific suggestion for Babel!"
title: ''
labels: 'i: enhancement, i: needs triage'
assignees: ''
Expand All @@ -12,15 +12,12 @@ assignees: ''
<!-- Check this if you would like to implement a PR, we are more than happy to help you go through the process !-->
- [ ] I would like to work on this feature!

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I have an issue when [...]
**Is your feature request related to a problem?**
A concise description of what the problem is. Ex. I have an issue when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen. Add any considered drawbacks.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Describe alternatives you've considered**.

**Teachability, Documentation, Adoption, Migration Strategy**
If you can, explain how users will be able to use this and possibly write out a version the docs.
Maybe a screenshot or design?
**Documentation, Adoption, Migration Strategy**
If you can, explain how users will be able to use this and how it might be documented. Maybe a mock-up?
18 changes: 0 additions & 18 deletions .github/ISSUE_TEMPLATE/Npm_error.md

This file was deleted.

52 changes: 0 additions & 52 deletions .github/ISSUE_TEMPLATE/Regression-v7.md

This file was deleted.

19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/Support_question.md

This file was deleted.

28 changes: 0 additions & 28 deletions .github/ISSUE_TEMPLATE/Support_us.md

This file was deleted.

0 comments on commit 57602a2

Please sign in to comment.