Skip to content

Commit

Permalink
Merge e93dd2c into 38a1a20
Browse files Browse the repository at this point in the history
  • Loading branch information
simonprev committed Mar 10, 2019
2 parents 38a1a20 + e93dd2c commit 3e26cec
Show file tree
Hide file tree
Showing 286 changed files with 10,851 additions and 948 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Expand Up @@ -23,7 +23,11 @@ test.json
.env*

priv/static/webapp
priv/static/jipt
/webapp/node_modules
/webapp/tmp
/webapp/dist
/jipt/node_modules
/jipt/.cache
/jipt/dist
.elixir_ls
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -42,5 +42,5 @@ before_script:
- mix ecto.setup

script:
- ./priv/scripts/ci-check.sh
- make lint
- mix coveralls.travis
12 changes: 4 additions & 8 deletions Makefile
Expand Up @@ -57,7 +57,7 @@ build: ## Build the Docker image for the OTP release
# ----------

.PHONY: lint
lint: lint-compile lint-format lint-credo lint-eslint lint-stylelint lint-prettier ## Run lint tools on the code
lint: lint-compile lint-format lint-credo lint-eslint lint-prettier ## Run lint tools on the code

.PHONY: lint-compile
lint-compile:
Expand All @@ -73,15 +73,11 @@ lint-credo:

.PHONY: lint-eslint
lint-eslint:
./assets/node_modules/.bin/eslint --ignore-path webapp/.eslintignore --config webapp/.eslintrc webapp

.PHONY: lint-stylelint
lint-stylelint:
./assets/node_modules/.bin/stylelint --syntax scss --config webapp/.stylelintrc webapp/css
./webapp/node_modules/.bin/eslint --ignore-path webapp/.eslintignore webapp

.PHONY: lint-prettier
lint-prettier:
./assets/node_modules/.bin/prettier --single-quote --list-different --no-bracket-spacing --print-width 130 './webapp/app/**/*.{js,gql}'
./webapp/node_modules/.bin/prettier --single-quote --list-different --no-bracket-spacing --print-width 130 './webapp/app/**/*.{js,gql}'

.PHONY: test
test: ## Run the test suite
Expand All @@ -100,7 +96,7 @@ format-elixir:

.PHONY: format-prettier
format-prettier:
./assets/node_modules/.bin/prettier --single-quote --write --no-bracket-spacing --print-width 130 './webapp/app/**/*.{js,gql}'
./webapp/node_modules/.bin/prettier --single-quote --write --no-bracket-spacing --print-width 130 './webapp/app/**/*.{js,gql}'

# Development targets
# -------------------
Expand Down
5 changes: 2 additions & 3 deletions cli/tsconfig.json
Expand Up @@ -7,16 +7,15 @@
"forceConsistentCasingInFileNames": true,
"importHelpers": true,
"module": "commonjs",
"noUnusedLocals": true,
"noUnusedParameters": true,
"outDir": "./lib",
"pretty": true,
"noFallthroughCasesInSwitch": true,
"noEmit": true,
"noImplicitReturns": true,
"noUnusedLocals": true,
"rootDirs": [
"./src"
],
"skipLibCheck": true,
"strict": true,
"target": "es2017"
},
Expand Down
2 changes: 2 additions & 0 deletions jipt/.prettierignore
@@ -0,0 +1,2 @@
dist
.cache
5 changes: 5 additions & 0 deletions jipt/.prettierrc
@@ -0,0 +1,5 @@
{
"printWidth": 120,
"singleQuote": true,
"bracketSpacing": false
}
17 changes: 17 additions & 0 deletions jipt/index.html
@@ -0,0 +1,17 @@
<html>
<body>
<div id="sample">
<h1>{^demo-accent.foo@session}</h1>
</div>

<script>
window.accent =
window.accent ||
function() {
(accent.q = accent.q || []).push(arguments);
};
accent('init', {h: 'http://localhost:8001', i: '07f82329-a4c4-43d1-88f8-07a699bf3466'});
</script>
<script async src="./index.ts"></script>
</body>
</html>
3 changes: 3 additions & 0 deletions jipt/index.ts
@@ -0,0 +1,3 @@
import Accent from './src/accent';

window['accent'].q.forEach(([fun, args]) => Accent[fun](args));

0 comments on commit 3e26cec

Please sign in to comment.