Skip to content

Commit e8c666e

Browse files
author
Nunzio Tocci
committed
Merge remote-tracking branch 'upstream/master'
2 parents 06a294f + d309daa commit e8c666e

File tree

406 files changed

+59264
-7316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

406 files changed

+59264
-7316
lines changed

.eslintignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ lib/ace/mode/xml/*
99
lib/ace/mode/xquery/*
1010
lib/ace/mode/xquery.js
1111
lib/ace/mode/yaml/*
12+
src/lib/default_english_messages.js
1213
**/test/asyncjs/*
1314
**/es5-shim.js
1415
**/vim*.js
@@ -20,4 +21,6 @@ demo/
2021
api/
2122
**/* *
2223
**/node_modules
23-
0*
24+
0*
25+
esm-resolver.js
26+
src/ext/diff/providers/*

.eslintrc

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"rules": {
3939
curly: 0,
4040
eqeqeq: 0,
41-
comma-dangle: 2,
41+
//comma-dangle: 2,
4242
no-dupe-args: 2,
4343
no-dupe-keys: 2,
4444
no-duplicate-case: 2,
@@ -56,7 +56,7 @@
5656
no-unexpected-multiline: 2,
5757
use-isnan: 2,
5858
valid-typeof: 2,
59-
59+
6060
accessor-pairs: 2,
6161
complexity: 0,
6262
dot-location: [2, "property"],
@@ -80,11 +80,11 @@
8080
no-sequences: 2,
8181
no-useless-call: 2,
8282
yoda: 2,
83-
83+
8484
no-undef: 2,
8585
no-redeclare: 0,
8686
no-unused-vars: [1, {"args": "none", "vars": "all"}],
87-
87+
8888
no-debugger: 2,
8989

9090
//////////////////////////////////////////////////////////////////
@@ -108,17 +108,17 @@
108108
// no-else-return: 2,
109109
// no-unused-expressions: 2,
110110
// no-use-before-define: [2, { "functions": false, "classes": false, "variables": false }],
111-
111+
112112
// array-bracket-spacing: 2, // enforce spacing inside array brackets (fixable)
113113
// block-spacing: 2, // disallow or enforce spaces inside of single line blocks (fixable)
114-
// brace-style: 2, // enforce one true brace style
114+
// brace-style: 2, // enforce one true brace style
115115
// camelcase: 2, // require camel case names
116116
// comma-spacing: 2, // enforce spacing before and after comma (fixable)
117117
// comma-style: 2, // enforce one true comma style
118118
computed-property-spacing: 2, // require or disallow padding inside computed properties (fixable)
119-
// consistent-this: 2, // enforce consistent naming when capturing the current execution context
119+
// consistent-this: 2, // enforce consistent naming when capturing the current execution context
120120
linebreak-style: 2, // disallow mixed 'LF' and 'CRLF' as linebreaks
121-
// indent: ["error", 4, { "outerIIFEBody": 0 }], // specify tab or space width for your code (fixable)
121+
// indent: ["error", 4, { "outerIIFEBody": 0 }], // specify tab or space width for your code (fixable)
122122
// key-spacing: 2, // enforce spacing between keys and values in object literal properties
123123
// new-cap: 2, // require a capital letter for constructors
124124
// new-parens: 2, // disallow the omission of parentheses when invoking a constructor with no arguments
@@ -151,6 +151,20 @@
151151
// space-infix-ops: 2, // require spaces around operators (fixable)
152152
// space-unary-ops: 2, // require or disallow spaces before/after unary operators (fixable)
153153
// spaced-comment: [2, "always", { markers: ["-", "*", "/", "{", "}", "#"], exceptions: ["}"] }]
154-
155-
}
154+
155+
},
156+
157+
// allow async/await in tests only
158+
overrides: [
159+
{
160+
files: ["**/*_test.js"],
161+
parserOptions: {
162+
ecmaVersion: 2022,
163+
},
164+
env: {
165+
},
166+
rules: {
167+
},
168+
}
169+
]
156170
}
Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
1-
---
2-
name: "🌐 Add a project to the list of project using Ace on its website."
3-
description: Add a project to the list of projects using Ace, displayed on the website.
4-
title: "Add project (project name) to the list of projects using Ace on its website"
5-
labels: [website, needs-triage]
6-
assignees: []
7-
body:
8-
- type: markdown
9-
attributes:
10-
value: |
11-
The fastest way to get your project to be displayed on the website is to create a PR.
12-
Examples: https://github.com/ajaxorg/ace/pull/5014, https://github.com/ajaxorg/ace/pull/5222.
13-
If for any reason creating a PR is not an option for you, please proceed with filling out this issue. Thanks!
14-
- type: input
15-
id: name
16-
attributes:
17-
label: Project name
18-
description: A name of the project to be used on Ace website.
19-
validations:
20-
required: true
21-
- type: input
22-
id: project-link
23-
attributes:
24-
label: Project link
25-
description: A link to the project's website.
26-
validations:
27-
required: true
28-
- type: input
29-
id: logo-link
30-
attributes:
31-
label: Logo link
32-
description: |
33-
A link to the logo image to be used on the website for the project. If not provided, only the name of the project will be displayed.
34-
35-
By submitting this link, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
36-
validations:
37-
required: false
38-
- type: textarea
39-
id: info
40-
attributes:
41-
label: Additional information
42-
description: Any additional information you would like to share.
43-
validations:
44-
required: false
45-
- type: checkboxes
46-
id: ack
47-
attributes:
48-
label: Acknowledgements
49-
options:
50-
- label: I may be able to implement this request.
51-
required: false
1+
---
2+
name: "🌐 Add a project to the list of project using Ace on its website."
3+
description: Add a project to the list of projects using Ace, displayed on the website.
4+
title: "Add project (project name) to the list of projects using Ace on its website"
5+
labels: [website, needs-triage]
6+
assignees: []
7+
body:
8+
- type: markdown
9+
attributes:
10+
value: |
11+
The fastest way to get your project to be displayed on the website is to create a PR.
12+
Examples: https://github.com/ajaxorg/ace/pull/5014, https://github.com/ajaxorg/ace/pull/5222.
13+
If for any reason creating a PR is not an option for you, please proceed with filling out this issue. Thanks!
14+
- type: input
15+
id: name
16+
attributes:
17+
label: Project name
18+
description: A name of the project to be used on Ace website.
19+
validations:
20+
required: true
21+
- type: input
22+
id: project-link
23+
attributes:
24+
label: Project link
25+
description: A link to the project's website.
26+
validations:
27+
required: true
28+
- type: input
29+
id: logo-link
30+
attributes:
31+
label: Logo link
32+
description: |
33+
A link to the logo image to be used on the website for the project. If not provided, only the name of the project will be displayed.
34+
35+
By submitting this link, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
36+
validations:
37+
required: false
38+
- type: textarea
39+
id: info
40+
attributes:
41+
label: Additional information
42+
description: Any additional information you would like to share.
43+
validations:
44+
required: false
45+
- type: checkboxes
46+
id: ack
47+
attributes:
48+
label: Acknowledgements
49+
options:
50+
- label: I may be able to implement this request.
51+
required: false

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,10 @@
44

55

66
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
7+
8+
Pull Request Checklist:
9+
* [ ] No backwards incompatible changes were made to Ace's public interface which is defined through the main typings file (`ace.d.ts`) and its references:
10+
* https://github.com/ajaxorg/ace/blob/master/ace.d.ts
11+
* https://github.com/ajaxorg/ace/blob/master/ace-modes.d.ts
12+
* https://github.com/ajaxorg/ace/blob/master/ace-extensions.d.ts
13+
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Comments for ensuring backward compatibility
2+
3+
on:
4+
pull_request_target:
5+
paths:
6+
- 'ace.d.ts'
7+
- 'ace-modes.d.ts'
8+
- 'ace-extensions.d.ts'
9+
10+
jobs:
11+
comment:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Comment on PR
15+
uses: peter-evans/create-or-update-comment@v1
16+
with:
17+
issue-number: ${{ github.event.pull_request.number }}
18+
body: |
19+
One of the public type files has been updated, plase make sure there are no backwards incompatible changes done in the PR.
20+
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/close-stale-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
# These labels are required
2727
stale-issue-label: closing-soon
28-
exempt-issue-labels: no-autoclose
28+
exempt-issue-labels: no-autoclose, p1
2929
response-requested-label: response-requested
3030

3131
# Don't set closed-for-staleness label to skip closing very old issues

.github/workflows/nodejs.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
node-version: ${{ matrix.node-version }}
3434
- run: npm i
3535
- run: npm run cover
36+
# run linter
3637
- run: |
3738
set -x;
3839
git status;
@@ -50,8 +51,18 @@ jobs:
5051
node node_modules/eslint/bin/eslint $jsChanges;
5152
fi
5253
fi
53-
# - run: npm run lint
54-
- run: node_modules/.bin/tsc --noImplicitAny --strict --noUnusedLocals --noImplicitReturns --noUnusedParameters --noImplicitThis ace.d.ts
54+
# check types
55+
- run: |
56+
set -x;
57+
npx tsc -v;
58+
npm run update-types;
59+
git diff --color --exit-code ./ace*d.ts;
60+
npm run typecheck;
61+
node_modules/.bin/tsc --noImplicitAny --strict --noUnusedLocals --noImplicitReturns --noUnusedParameters --noImplicitThis ace.d.ts;
62+
- run: |
63+
set -x;
64+
./tool/test-npm-package.sh
65+
# upload to codecov
5566
- uses: codecov/codecov-action@v3
5667
with:
5768
token: d8edca4b-8e97-41e5-b54e-34c7cf3b2d47

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# Setup .npmrc file to publish to npm
1818
- uses: actions/setup-node@v1
1919
with:
20-
node-version: '12.x'
20+
node-version: '16.x'
2121
registry-url: 'https://registry.npmjs.org'
2222
- run: npm install
2323
- run: npm run test

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ npm-debug.log
2525
deps/
2626
dist
2727

28-
lib/ace
28+
lib/ace
29+
styles

.nojekyll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
disable jekyll on gh-pages

0 commit comments

Comments
 (0)