Skip to content

Commit 130087c

Browse files
shellscapeshellscape
authored
chore: merge next branch (shellscape#66)
* chore: updating metadata, ci, project structure * chore: starting fresh with a tokenizer * fix: fix token position for paren and comma splits * feat: operator node * chore: license * chore: additional node support * test: get numeric tests working * chore: fix linting * test: fix local npm audit * test: punctuation tests * test: unicode range tests * refactor: mature the codebase * fix: operator split regex, remove modulo * feat: function nodes * feat: interpolation and variable support * chore: knocking down errors * chore: ongoing * test: add test to cover failed url from shellscape#62 * test: add operator tests * feat: implement type walkers * fix: hex colors * fix: oddball word parsing * test: update snapshots to v2, fix operator before word * test: improve coverage, weed out dead code * chore: update dependencies * fix: numeric units, update snapshots * fix: modulo operator * chore: rename atrule, create AtWord * docs: rewrite docs wip * docs: wip * docs: finishing up docs for release * chore(release): beta2. publish only needed files * fix: remove global flag from shared regexps. fixes shellscape#63 * feat: function.isColor, isColor for color names. fixes shellscape#64 * chore(release): beta3 * fix: protocol-relative urls. fixes shellscape#65. adds isUrl to Word * chore(release): 3.0.0-beta.4 * chore: add performance benchmark * chore: devDep update
1 parent b211ef7 commit 130087c

File tree

126 files changed

+16599
-6122
lines changed

Some content is hidden

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

126 files changed

+16599
-6122
lines changed

‎.circleci/config.yml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
version: 2
2+
jobs:
3+
dependency_cache:
4+
docker:
5+
- image: rollupcabal/circleci-node-base:latest
6+
steps:
7+
- checkout
8+
- restore_cache:
9+
key: dependency-cache-{{ checksum "package-lock.json" }}
10+
- run:
11+
name: Install Dependencies
12+
command: npm install
13+
- save_cache:
14+
key: dependency-cache-{{ checksum "package-lock.json" }}
15+
paths:
16+
- ./node_modules
17+
node-v10-latest:
18+
docker:
19+
- image: rollupcabal/circleci-node-v10:latest
20+
steps:
21+
- checkout
22+
- restore_cache:
23+
key: dependency-cache-{{ checksum "package-lock.json" }}
24+
- run:
25+
name: NPM Rebuild
26+
command: npm install
27+
- run:
28+
name: Run unit tests.
29+
command: npm run ci:coverage
30+
- run:
31+
name: Submit coverage data to codecov.
32+
command: bash <(curl -s https://codecov.io/bash)
33+
when: on_success
34+
analysis:
35+
docker:
36+
- image: rollupcabal/circleci-node-base:latest
37+
steps:
38+
- checkout
39+
- restore_cache:
40+
key: dependency-cache-{{ checksum "package-lock.json" }}
41+
- run:
42+
name: NPM Rebuild
43+
command: npm install
44+
- run:
45+
name: Run linting.
46+
command: npm run lint
47+
- run:
48+
name: Run NSP Security Check.
49+
command: npm run security
50+
- run:
51+
name: Validate Commit Messages
52+
command: npm run ci:lint:commits
53+
workflows:
54+
version: 2
55+
validate:
56+
jobs:
57+
- dependency_cache
58+
- analysis:
59+
requires:
60+
- dependency_cache
61+
filters:
62+
tags:
63+
only: /.*/
64+
- node-v10-latest:
65+
requires:
66+
- analysis
67+
filters:
68+
tags:
69+
only: /.*/

‎.editorconfig

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
root = true
22

33
[*]
4-
charset = utf-8
4+
indent_style = space
5+
indent_size = 2
56
end_of_line = lf
6-
insert_final_newline = true
7+
charset = utf-8
78
trim_trailing_whitespace = true
8-
indent_style = space
9+
insert_final_newline = true
10+
11+
[*.{json,yml}]
912
indent_size = 2
13+
14+
[*.md]
15+
trim_trailing_whitespace = false

‎.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
old-test
2+
old-lib

‎.eslintrc

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,3 @@
11
{
2-
"env": {
3-
"es6": true,
4-
"mocha": true,
5-
"node": true
6-
},
7-
"rules": {
8-
"brace-style": ["error", "stroustrup", { "allowSingleLine": false }],
9-
"consistent-return": ["off"],
10-
"comma-spacing": ["error", { "before": false, "after": true }],
11-
"complexity": ["off"],
12-
"indent": ["error", 2, { "SwitchCase": 1, "VariableDeclarator": 1 }],
13-
"keyword-spacing": ["error", { "after": true }],
14-
"max-len": ["warn", 1000],
15-
"no-bitwise": ["off"],
16-
"no-console": ["off"],
17-
"no-extra-parens": ["off"],
18-
"one-var": ["error", {
19-
"var": "always",
20-
"let": "always",
21-
"const": "never"
22-
}],
23-
"prefer-arrow-callback": ["error", { "allowNamedFunctions": true }],
24-
"semi": ["error", "always"],
25-
"space-before-function-paren": ["error", "always"],
26-
"space-infix-ops": ["error", { "int32Hint": false }],
27-
"space-in-parens": ["error", "never"],
28-
"space-unary-ops": ["off"],
29-
"strict": ["error", "safe"]
30-
},
31-
"parserOptions": {
32-
"ecmaVersion": 8
33-
}
2+
"extends": "shellscape"
343
}

‎.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package-lock.json -diff
2+
* text=auto
3+
bin/* eol=lf

‎.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
.DS_Store
2+
.eslintcache
3+
.nyc_output
24
*~
35

6+
coverage.*
47
node_modules/
58
npm-debug.log
6-
7-
dist
8-
old-lib
9+
s.js

‎.npmignore

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎.travis.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.vscode/launch.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"type": "node",
6+
"request": "attach",
7+
"name": "Attach Debugger",
8+
"port": 9229
9+
},
10+
{
11+
"type": "node",
12+
"request": "launch",
13+
"name": "Jest Debug",
14+
"program": "${workspaceRoot}/node_modules/jest/bin/jest.js",
15+
"cwd": "${workspaceRoot}",
16+
"args": [
17+
"--runInBand"
18+
],
19+
"runtimeArgs": [
20+
"--nolazy"
21+
],
22+
"env": {
23+
"NODE_ENV": "development"
24+
},
25+
"sourceMaps": true,
26+
"console": "integratedTerminal"
27+
}
28+
]
29+
}

‎.vscode/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"typescript.format.insertSpaceBeforeFunctionParenthesis": true,
3+
"typescript.format.insertSpaceAfterConstructor": true,
4+
"typescript.format.enable": true
5+
}

0 commit comments

Comments
 (0)