Skip to content
Permalink
Browse files

Closes #149 - fixes typescript excludes & siteUrl injection

  • Loading branch information...
codewithkyle committed May 12, 2019
1 parent 73f75b3 commit c0290e29e8d949de14e7bcd7cb55c45055e23c42
Showing with 28 additions and 25 deletions.
  1. +4 −2 CHANGELOG.md
  2. +18 −18 templates/_layouts/base.twig
  3. +6 −5 tsconfig.json
@@ -8,8 +8,10 @@
- Fixes: moves gutter and container unit configs into `settings/_units.scss`
- Fixes: normalizes all elements to use `position: relative;`
- Fixes: switches base sans-serif font to Roboto and serif font to Roboto Slab, moves Circular to the fallback font
- Fixes: moves containers, grids, and wrapper to the `/globals` directory
- Fixes: uses regex to replace spaces to `-` when generating files
- Fixes: moves containers, grids, and wrapper to the `/globals` directory [#150](https://github.com/Pageworks/papertrain/issues/150)
- Fixes: uses regex to replace spaces to `-` when generating files [#143](https://github.com/Pageworks/papertrain/issues/143)
- Fixes: switches `siteUrl` to `alias('@rootUrl')`
- Fixes: TypeScript compiling excludes [#149](https://github.com/Pageworks/papertrain/issues/149)

### Removed

@@ -34,23 +34,23 @@
{% endblock %}

{# Icons #}
<link rel="icon" sizes="192x192" href="{{ siteUrl|trim('/') }}/assets/images/icon-192.png">
<link rel="apple-touch-icon" href="{{ siteUrl|trim('/') }}/assets/images/ios-icon.png">
<meta name="msapplication-square310x310logo" content="{{ siteUrl|trim('/') }}/assets/images/icon-310.png">
<link rel="icon" sizes="192x192" href="{{ alias('@rootUrl')|trim('/') }}/assets/images/icon-192.png">
<link rel="apple-touch-icon" href="{{ alias('@rootUrl')|trim('/') }}/assets/images/ios-icon.png">
<meta name="msapplication-square310x310logo" content="{{ alias('@rootUrl')|trim('/') }}/assets/images/icon-310.png">

{# PWA Manifest #}
{# <link rel="manifest" href="{{ siteUrl|trim('/') }}/manifest.json"> #}
{# <link rel="manifest" href="{{ alias('@rootUrl')|trim('/') }}/manifest.json"> #}

{# Stylesheets #}
<link rel="stylesheet" href="{{ siteUrl|trim('/') }}/assets/styles/main.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ siteUrl|trim('/') }}/assets/styles/fonts.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ siteUrl|trim('/') }}/assets/styles/utility.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ siteUrl|trim('/') }}/assets/styles/spacing.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ siteUrl|trim('/') }}/assets/styles/ratio.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ siteUrl|trim('/') }}/assets/styles/widths.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ siteUrl|trim('/') }}/assets/styles/container.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ siteUrl|trim('/') }}/assets/styles/wrapper.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ siteUrl|trim('/') }}/assets/styles/grid.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ alias('@rootUrl')|trim('/') }}/assets/styles/main.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ alias('@rootUrl')|trim('/') }}/assets/styles/fonts.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ alias('@rootUrl')|trim('/') }}/assets/styles/utility.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ alias('@rootUrl')|trim('/') }}/assets/styles/spacing.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ alias('@rootUrl')|trim('/') }}/assets/styles/ratio.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ alias('@rootUrl')|trim('/') }}/assets/styles/widths.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ alias('@rootUrl')|trim('/') }}/assets/styles/container.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ alias('@rootUrl')|trim('/') }}/assets/styles/wrapper.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">
<link rel="stylesheet" href="{{ alias('@rootUrl')|trim('/') }}/assets/styles/grid.{{ craft.app.config.general.cssCacheBustTimestamp }}.css">

{# Loading animation CSS #}
<style>
@@ -207,10 +207,10 @@
</script>
</head>
<body>
{% do view.registerJsFile( siteUrl|trim('/') ~ '/assets/scripts/runtime.' ~ craft.app.config.general.jsCacheBustTimestamp ~ '.js', {"async":"async"}) %}
{% do view.registerJsFile( siteUrl|trim('/') ~ '/assets/scripts/globals.' ~ craft.app.config.general.jsCacheBustTimestamp ~ '.js', {"async":"async"}) %}
{% do view.registerJsFile( siteUrl|trim('/') ~ '/assets/scripts/npm.uuid.' ~ craft.app.config.general.jsCacheBustTimestamp ~ '.js', {"async":"async"}) %}
{% do view.registerJsFile( siteUrl|trim('/') ~ '/assets/scripts/npm.pageworks.' ~ craft.app.config.general.jsCacheBustTimestamp ~ '.js', {"async":"async"}) %}
{% do view.registerJsFile( alias('@rootUrl')|trim('/') ~ '/assets/scripts/runtime.' ~ craft.app.config.general.jsCacheBustTimestamp ~ '.js', {"async":"async"}) %}
{% do view.registerJsFile( alias('@rootUrl')|trim('/') ~ '/assets/scripts/globals.' ~ craft.app.config.general.jsCacheBustTimestamp ~ '.js', {"async":"async"}) %}
{% do view.registerJsFile( alias('@rootUrl')|trim('/') ~ '/assets/scripts/npm.uuid.' ~ craft.app.config.general.jsCacheBustTimestamp ~ '.js', {"async":"async"}) %}
{% do view.registerJsFile( alias('@rootUrl')|trim('/') ~ '/assets/scripts/npm.pageworks.' ~ craft.app.config.general.jsCacheBustTimestamp ~ '.js', {"async":"async"}) %}
{% spaceless %}
{# Page Transition Animation #}
<div class="c-transition">
@@ -220,7 +220,7 @@
<main role="main" class="js-pjax">
{% block content %}{% endblock %}
</main>
{% do view.registerJsFile( siteUrl|trim('/') ~ '/assets/scripts/application.' ~ craft.app.config.general.jsCacheBustTimestamp ~ '.js', {"async":"async"}) %}
{% do view.registerJsFile( alias('@rootUrl')|trim('/') ~ '/assets/scripts/application.' ~ craft.app.config.general.jsCacheBustTimestamp ~ '.js', {"async":"async"}) %}
{% endspaceless %}
</body>
</html>
@@ -27,11 +27,12 @@
]
},
"exclude": [
"vendor",
"node_modules",
"_compiled",
"build-tools",
"./vendor",
"./node_modules",
"./_compiled",
"./build-tools",
"webpack.config.js",
"public"
"./public",
"./modules"
]
}

0 comments on commit c0290e2

Please sign in to comment.
You can’t perform that action at this time.