Skip to content

Commit

Permalink
refactor: merge next to develop (#144)
Browse files Browse the repository at this point in the history
  • Loading branch information
thetutlage authored Nov 7, 2023
1 parent 6d803f4 commit ec859c2
Show file tree
Hide file tree
Showing 538 changed files with 4,663 additions and 3,231 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ indent_style = space
[*.md]
trim_trailing_whitespace = false

[{fixtures,examples,newline-fixtures,async-fixtures}/**/*]
[{fixtures,examples,newline_fixtures,async_fixtures}/**/*]
insert_final_newline = ignore
indent_style = space
70 changes: 0 additions & 70 deletions .github/COMMIT_CONVENTION.md

This file was deleted.

38 changes: 0 additions & 38 deletions .github/CONTRIBUTING.md

This file was deleted.

23 changes: 0 additions & 23 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

28 changes: 0 additions & 28 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

14 changes: 14 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: checks
on:
- push
- pull_request

jobs:
test:
uses: edge-js/.github/.github/workflows/test.yml@main

lint:
uses: edge-js/.github/.github/workflows/lint.yml@main

typecheck:
uses: edge-js/.github/.github/workflows/typecheck.yml@main
39 changes: 0 additions & 39 deletions .github/workflows/test.yml

This file was deleted.

7 changes: 4 additions & 3 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
HUSKY_GIT_PARAMS=$1 node ./node_modules/@adonisjs/mrm-preset/validate-commit/conventional/validate.js
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no -- commitlint --edit
4 changes: 2 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ config.json
package.json
*.html
fixtures/*
async-fixtures/*
newline-fixtures/*
async_fixtures/*
newline_fixtures/*
*.txt
*.md
9 changes: 0 additions & 9 deletions async-fixtures/components-advanced-props/compiled.js

This file was deleted.

1 change: 0 additions & 1 deletion async-fixtures/components-falsy-args/index.edge

This file was deleted.

3 changes: 0 additions & 3 deletions async-fixtures/components-partials/index.edge

This file was deleted.

2 changes: 0 additions & 2 deletions async-fixtures/layout-allow-set-calls/index.edge

This file was deleted.

1 change: 0 additions & 1 deletion async-fixtures/layout-tag-sections/index.edge

This file was deleted.

1 change: 0 additions & 1 deletion async-fixtures/layout-tag/index.edge

This file was deleted.

13 changes: 13 additions & 0 deletions async_fixtures/components-advanced-props-compat/compiled.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
let out = "";
let $lineNumber = 1;
let $filename = "{{__dirname}}index.edge";
try {
out += await template.compileComponent("components-advanced-props-compat/button")(template, template.getComponentState({
class: 'mb-4 px-4',
id: 'foo-bar',
title: 'Click me'
}, { $context: Object.assign({}, $context), main: function () { return "" } }, { filename: $filename, line: $lineNumber, col: 0 }), $context);
} catch (error) {
template.reThrow(error, $filename, $lineNumber);
}
return out;
5 changes: 5 additions & 0 deletions async_fixtures/components-advanced-props-compat/index.edge
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@!component("components-advanced-props-compat/button", {
class: 'mb-4 px-4',
id: 'foo-bar',
title: 'Click me'
})
3 changes: 3 additions & 0 deletions async_fixtures/components-advanced-props/button.edge
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<button type="submit" {{ $props.except(['type', 'title']).toAttrs() }}>
{{ title }}
</button>
13 changes: 13 additions & 0 deletions async_fixtures/components-advanced-props/compiled.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
let out = "";
let $lineNumber = 1;
let $filename = "{{__dirname}}index.edge";
try {
out += await template.compileComponent("components-advanced-props/button")(template, template.getComponentState({
class: 'mb-4 px-4',
id: 'foo-bar',
title: 'Click me'
}, { $context: Object.assign({}, $context), main: function () { return "" } }, { filename: $filename, line: $lineNumber, col: 0 }), $context);
} catch (error) {
template.reThrow(error, $filename, $lineNumber);
}
return out;
File renamed without changes.
3 changes: 3 additions & 0 deletions async_fixtures/components-advanced-props/index.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<button type="submit" class="mb-4 px-4" id="foo-bar">
Click me
</button>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ let out = "";
let $lineNumber = 1;
let $filename = "{{__dirname}}index.edge";
try {
out += await template.compileComponent("components-falsy-args/alert")(template, template.getComponentState({ index: 0 }, { $context: Object.assign({}, $context), main: function () { return "" } }, { filename: $filename, line: $lineNumber, col: 0 }), $context);
out += await template.compileComponent("components-falsy-args/alert")(template, template.getComponentState({
index: 0
}, { $context: Object.assign({}, $context), main: function () { return "" } }, { filename: $filename, line: $lineNumber, col: 0 }), $context);
} catch (error) {
template.reThrow(error, $filename, $lineNumber);
}
Expand Down
1 change: 1 addition & 0 deletions async_fixtures/components-falsy-args/index.edge
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@!component("components-falsy-args/alert", { index: 0 })
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ let out = "";
let $lineNumber = 1;
let $filename = "{{__dirname}}index.edge";
try {
out += await template.compileComponent("components-partials/alert")(template, template.getComponentState({ username: "virk" }, { $context: Object.assign({}, $context), main: async function () { const $context = this.$context;
out += await template.compileComponent("components-partials/alert")(template, template.getComponentState({
username: 'virk'
}, { $context: Object.assign({}, $context), main: async function () { const $context = this.$context;
let slot_main = "";
try {
slot_main += " Hello ";
Expand Down
3 changes: 3 additions & 0 deletions async_fixtures/components-partials/index.edge
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@component("components-partials/alert", { username: 'virk' })
Hello {{ username || "Guest" }}
@endcomponent
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ let out = "";
let $lineNumber = 1;
let $filename = "{{__dirname}}index.edge";
try {
out += await template.compileComponent("components-props/alert")(template, template.getComponentState({ "title": "H1" }, { $context: Object.assign({}, $context), main: async function () { const $context = this.$context;
out += await template.compileComponent("components-props/alert")(template, template.getComponentState({
"title": "H1"
}, { $context: Object.assign({}, $context), main: async function () { const $context = this.$context;
let slot_main = "";
try {
slot_main += "Hello world";
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ let out = "";
let $lineNumber = 1;
let $filename = "{{__dirname}}index.edge";
try {
out += await template.compileComponent("components-spread-and-literal/alert")(template, template.getComponentState({ ...state.data, name: 'virk' }, { $context: Object.assign({}, $context), main: function () { return "" } }, { filename: $filename, line: $lineNumber, col: 0 }), $context);
out += await template.compileComponent("components-spread-and-literal/alert")(template, template.getComponentState({
...state.data,
name: 'virk'
}, { $context: Object.assign({}, $context), main: function () { return "" } }, { filename: $filename, line: $lineNumber, col: 0 }), $context);
} catch (error) {
template.reThrow(error, $filename, $lineNumber);
}
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ let out = "";
let $lineNumber = 1;
let $filename = "{{__dirname}}index.edge";
try {
out += await template.compileComponent("components-spread/alert")(template, template.getComponentState({ ...state.data }, { $context: Object.assign({}, $context), main: function () { return "" } }, { filename: $filename, line: $lineNumber, col: 0 }), $context);
out += await template.compileComponent("components-spread/alert")(template, template.getComponentState({
...state.data
}, { $context: Object.assign({}, $context), main: function () { return "" } }, { filename: $filename, line: $lineNumber, col: 0 }), $context);
} catch (error) {
template.reThrow(error, $filename, $lineNumber);
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 2 additions & 0 deletions async_fixtures/layout-allow-set-calls-compat/index.edge
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@layout("layout-allow-set-calls-compat/master")
@set("username", "virk")
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@layout("layout-nested/master")
@layout("layout-nested-compat/master")
@section("content")
@super
Appended by index
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@layout("layout-nested/super")
@layout("layout-nested-compat/super")
@section("header")
I will define the header myself
@endsection
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit ec859c2

Please sign in to comment.