Skip to content

chore: merge next branch #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 40 commits into from
Mar 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
0652be7
chore: updating metadata, ci, project structure
shellscape Nov 17, 2018
dd7d7a3
chore: starting fresh with a tokenizer
shellscape Nov 17, 2018
ae9d662
fix: fix token position for paren and comma splits
shellscape Nov 17, 2018
9600b59
feat: operator node
shellscape Nov 18, 2018
9915005
chore: license
shellscape Nov 18, 2018
821e7ad
chore: additional node support
shellscape Nov 19, 2018
4fbb972
test: get numeric tests working
shellscape Nov 19, 2018
cdb25b9
chore: fix linting
shellscape Nov 19, 2018
773aa74
test: fix local npm audit
shellscape Nov 19, 2018
955d0e4
test: punctuation tests
shellscape Nov 19, 2018
6a1e565
test: unicode range tests
shellscape Nov 19, 2018
c57391d
refactor: mature the codebase
shellscape Nov 20, 2018
9f73efd
fix: operator split regex, remove modulo
shellscape Nov 20, 2018
ffc0f7d
feat: function nodes
shellscape Nov 21, 2018
82b76b1
feat: interpolation and variable support
shellscape Nov 21, 2018
7046d44
chore: knocking down errors
shellscape Nov 21, 2018
11a0fc8
chore: ongoing
shellscape Dec 22, 2018
a15dd5b
test: add test to cover failed url from #62
shellscape Feb 2, 2019
8539b55
test: add operator tests
shellscape Feb 2, 2019
6dc9169
feat: implement type walkers
shellscape Feb 2, 2019
6dc6adf
fix: hex colors
shellscape Feb 2, 2019
5fee05e
fix: oddball word parsing
shellscape Feb 2, 2019
c8a59b9
test: update snapshots to v2, fix operator before word
shellscape Feb 2, 2019
f76228d
test: improve coverage, weed out dead code
shellscape Feb 2, 2019
d202dad
chore: update dependencies
shellscape Feb 2, 2019
2bb55f3
fix: numeric units, update snapshots
shellscape Feb 2, 2019
9af0055
fix: modulo operator
shellscape Feb 2, 2019
9432a03
chore: rename atrule, create AtWord
shellscape Feb 2, 2019
6c3507b
docs: rewrite docs wip
shellscape Feb 2, 2019
102ec6c
docs: wip
shellscape Feb 2, 2019
686ae5a
docs: finishing up docs for release
shellscape Feb 3, 2019
326151a
chore(release): beta2. publish only needed files
shellscape Feb 3, 2019
b6bcc5a
fix: remove global flag from shared regexps. fixes #63
shellscape Feb 6, 2019
7108d9a
feat: function.isColor, isColor for color names. fixes #64
shellscape Feb 6, 2019
4f706ac
chore(release): beta3
shellscape Feb 6, 2019
3bb648a
fix: protocol-relative urls. fixes #65. adds isUrl to Word
shellscape Feb 10, 2019
678149a
chore(release): 3.0.0-beta.4
shellscape Feb 10, 2019
2d5c42a
chore: add performance benchmark
shellscape Feb 10, 2019
66903b8
chore: Merge branch 'master' into next
shellscape Mar 3, 2019
2628979
chore: devDep update
shellscape Mar 3, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
version: 2
jobs:
dependency_cache:
docker:
- image: rollupcabal/circleci-node-base:latest
steps:
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "package-lock.json" }}
- run:
name: Install Dependencies
command: npm install
- save_cache:
key: dependency-cache-{{ checksum "package-lock.json" }}
paths:
- ./node_modules
node-v10-latest:
docker:
- image: rollupcabal/circleci-node-v10:latest
steps:
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "package-lock.json" }}
- run:
name: NPM Rebuild
command: npm install
- run:
name: Run unit tests.
command: npm run ci:coverage
- run:
name: Submit coverage data to codecov.
command: bash <(curl -s https://codecov.io/bash)
when: on_success
analysis:
docker:
- image: rollupcabal/circleci-node-base:latest
steps:
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "package-lock.json" }}
- run:
name: NPM Rebuild
command: npm install
- run:
name: Run linting.
command: npm run lint
- run:
name: Run NSP Security Check.
command: npm run security
- run:
name: Validate Commit Messages
command: npm run ci:lint:commits
workflows:
version: 2
validate:
jobs:
- dependency_cache
- analysis:
requires:
- dependency_cache
filters:
tags:
only: /.*/
- node-v10-latest:
requires:
- analysis
filters:
tags:
only: /.*/
12 changes: 9 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
charset = utf-8
trim_trailing_whitespace = true
indent_style = space
insert_final_newline = true

[*.{json,yml}]
indent_size = 2

[*.md]
trim_trailing_whitespace = false
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
old-test
old-lib
33 changes: 1 addition & 32 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,34 +1,3 @@
{
"env": {
"es6": true,
"mocha": true,
"node": true
},
"rules": {
"brace-style": ["error", "stroustrup", { "allowSingleLine": false }],
"consistent-return": ["off"],
"comma-spacing": ["error", { "before": false, "after": true }],
"complexity": ["off"],
"indent": ["error", 2, { "SwitchCase": 1, "VariableDeclarator": 1 }],
"keyword-spacing": ["error", { "after": true }],
"max-len": ["warn", 1000],
"no-bitwise": ["off"],
"no-console": ["off"],
"no-extra-parens": ["off"],
"one-var": ["error", {
"var": "always",
"let": "always",
"const": "never"
}],
"prefer-arrow-callback": ["error", { "allowNamedFunctions": true }],
"semi": ["error", "always"],
"space-before-function-paren": ["error", "always"],
"space-infix-ops": ["error", { "int32Hint": false }],
"space-in-parens": ["error", "never"],
"space-unary-ops": ["off"],
"strict": ["error", "safe"]
},
"parserOptions": {
"ecmaVersion": 8
}
"extends": "shellscape"
}
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package-lock.json -diff
* text=auto
bin/* eol=lf
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.DS_Store
.eslintcache
.nyc_output
*~

coverage.*
node_modules/
npm-debug.log

dist
old-lib
s.js
13 changes: 0 additions & 13 deletions .npmignore

This file was deleted.

5 changes: 0 additions & 5 deletions .travis.yml

This file was deleted.

29 changes: 29 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "attach",
"name": "Attach Debugger",
"port": 9229
},
{
"type": "node",
"request": "launch",
"name": "Jest Debug",
"program": "${workspaceRoot}/node_modules/jest/bin/jest.js",
"cwd": "${workspaceRoot}",
"args": [
"--runInBand"
],
"runtimeArgs": [
"--nolazy"
],
"env": {
"NODE_ENV": "development"
},
"sourceMaps": true,
"console": "integratedTerminal"
}
]
}
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"typescript.format.insertSpaceBeforeFunctionParenthesis": true,
"typescript.format.insertSpaceAfterConstructor": true,
"typescript.format.enable": true
}
Loading