Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Pretteir formatting
6d32f9dd6f9fed8df4fe9be688eecc60a4ecf5ca
18 changes: 5 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
name: CI

on:
workflow_dispatch:
pull_request: {}
push:
# Filtering branches here prevents duplicate builds from pull_request and push
branches:
- main
- master
- beta
- 'v*'
- /^greenkeeper.*$/

# Always run CI for tags
tags:
- '*'
pull_request: {}

# Early issue detection: run CI weekly on Sundays
schedule:
- cron: '0 6 * * 0'
concurrency:
group: ci-${{ github.head_ref || github.ref }}
cancel-in-progress: true

jobs:
lint-all-packages:
Expand Down
14 changes: 13 additions & 1 deletion packages/ember-cli-fastboot/.ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,17 @@
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
"isTypeScriptProject": false,

/**
Setting `componentAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
or GTS files for the component and the component rendering test. "strict" is the default.
*/
"componentAuthoringFormat": "strict",

/**
Setting `routeAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
or GTS templates for routes. "strict" is the default
*/
"routeAuthoringFormat": "strict"
}
14 changes: 0 additions & 14 deletions packages/ember-cli-fastboot/.eslintignore

This file was deleted.

57 changes: 0 additions & 57 deletions packages/ember-cli-fastboot/.eslintrc.js

This file was deleted.

7 changes: 0 additions & 7 deletions packages/ember-cli-fastboot/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,5 @@
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# broccoli-debug
/DEBUG/
11 changes: 1 addition & 10 deletions packages/ember-cli-fastboot/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
/.ember-cli
/.env*
/.eslintcache
/.eslintignore
/.eslintrc.js
/.git/
/.github/
/.gitignore
Expand All @@ -17,10 +15,10 @@
/.stylelintignore
/.stylelintrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/CONTRIBUTING.md
/ember-cli-build.js
/eslint.config.mjs
/testem.js
/test/
/tests/
Expand All @@ -29,10 +27,3 @@
/yarn-error.log
/yarn.lock
.gitkeep

# ember-try
/.node_modules.ember-try/
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
6 changes: 3 additions & 3 deletions packages/ember-cli-fastboot/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
/coverage/
!.*
.*/

# ember-try
/.node_modules.ember-try/
/pnpm-lock.yaml
ember-cli-update.json
*.html
4 changes: 3 additions & 1 deletion packages/ember-cli-fastboot/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
'use strict';

module.exports = {
plugins: ['prettier-plugin-ember-template-tag'],
overrides: [
{
files: '*.{js,ts}',
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
options: {
singleQuote: true,
templateSingleQuote: false,
},
},
],
Expand Down
3 changes: 0 additions & 3 deletions packages/ember-cli-fastboot/.stylelintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,3 @@

# compiled output
/dist/

# addons
/.node_modules.ember-try/
2 changes: 1 addition & 1 deletion packages/ember-cli-fastboot/.stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';

module.exports = {
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
extends: ['stylelint-config-standard'],
};
2 changes: 1 addition & 1 deletion packages/ember-cli-fastboot/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Ember Cli FastBoot

See the [main readme](../../README.md) or http://ember-fastboot.com/ for more information.
See the [main readme](../../README.md) or http://ember-fastboot.com/ for more information.
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable prettier/prettier */
// When using `ember serve` when fastboot addon is installed the application
// output will already be rendered to the DOM when the actual JavaScript
// loads. Ember does not automatically clear its `rootElement` so this
Expand All @@ -14,7 +13,7 @@ export function clearHtml() {
if (current && endMarker) {
let shoeboxNodes = document.querySelectorAll('[type="fastboot/shoebox"]');
let shoeboxNodesArray = []; // Note that IE11 doesn't support more concise options like Array.from, so we have to do something like this
for(let i=0; i < shoeboxNodes.length; i++){
for (let i = 0; i < shoeboxNodes.length; i++) {
shoeboxNodesArray.push(shoeboxNodes[i]);
}
let parent = current.parentElement;
Expand All @@ -23,21 +22,25 @@ export function clearHtml() {
nextNode = current.nextSibling;
parent.removeChild(current);
current = nextNode;
} while (nextNode && nextNode !== endMarker && shoeboxNodesArray.indexOf(nextNode) < 0);
} while (
nextNode &&
nextNode !== endMarker &&
shoeboxNodesArray.indexOf(nextNode) < 0
);
endMarker.parentElement.removeChild(endMarker);
}
}
export default {
name: "clear-double-boot",
name: 'clear-double-boot',

initialize(instance) {
if (typeof FastBoot === 'undefined') {
var originalDidCreateRootView = instance.didCreateRootView;

instance.didCreateRootView = function() {
instance.didCreateRootView = function () {
clearHtml();
originalDidCreateRootView.apply(instance, arguments);
};
}
}
}
},
};
12 changes: 7 additions & 5 deletions packages/ember-cli-fastboot/addon/locations/none.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* eslint-disable ember/no-classic-classes, ember/no-get, ember/require-computed-property-dependencies, prettier/prettier */
/* eslint-disable ember/no-classic-classes, ember/no-get, ember/require-computed-property-dependencies */
import { computed, get } from '@ember/object';
import { bool, readOnly } from '@ember/object/computed';
import { inject as service } from '@ember/service';
import { getOwner } from '@ember/application'
import NoneLocation from '@ember/routing/none-location'
import { getOwner } from '@ember/application';
import NoneLocation from '@ember/routing/none-location';

const TEMPORARY_REDIRECT_CODE = 307;

Expand All @@ -18,7 +18,9 @@ export default NoneLocation.extend({
_fastbootHeadersEnabled: bool('_config.fastboot.fastbootHeaders'),

_redirectCode: computed(function () {
return get(this, '_config.fastboot.redirectCode') || TEMPORARY_REDIRECT_CODE;
return (
get(this, '_config.fastboot.redirectCode') || TEMPORARY_REDIRECT_CODE
);
}),

_response: readOnly('fastboot.response'),
Expand Down Expand Up @@ -50,5 +52,5 @@ export default NoneLocation.extend({
}

this._super(...arguments);
}
},
});
Loading
Loading