Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
Krinkle authored Mar 31, 2024
2 parents 8db1a7a + 274992d commit 605dd20
Show file tree
Hide file tree
Showing 1,295 changed files with 169,077 additions and 8,344 deletions.
8 changes: 7 additions & 1 deletion .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,11 @@

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
"disableAnalytics": false,

/**
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
}
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,7 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ module.exports = {
},
},
{
// Test files:
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
pull_request:

env:
NODE_VERSION: 14
NODE_OPTIONS: "--max_old_space_size=4096"
NODE_VERSION: 20
NODE_OPTIONS: '--max_old_space_size=4096'

jobs:
lint:
Expand All @@ -17,10 +17,10 @@ jobs:
timeout-minutes: 7
steps:
- name: Check out a copy of the repo
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
Expand All @@ -31,17 +31,16 @@ jobs:
- name: Lint
run: npm run lint


test-app:
name: Test app
runs-on: ubuntu-latest
timeout-minutes: 7
steps:
- name: Check out a copy of the repo
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
Expand All @@ -56,7 +55,6 @@ jobs:
env:
PERCY_TOKEN: 877df6aad8486060f69a34864b6cd33f870633743b23411343737c46a875a762


test-node:
name: Test node-tests
runs-on: ubuntu-latest
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,15 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock
/yarn.lock.ember-try

# Deployment credentials
config/credentials.json

/code
# broccoli-debug
/DEBUG/
102 changes: 62 additions & 40 deletions .local.dic
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
*google
*NPM
2FA
30KB
activations
acyclic
ActiveSupport
acyclic
Algolia
asynchronicity
Americentric
asynchronicity
asynchrony
autocomplete
autotrack
auto-rollup
autocomplete
autocompletion
autoruns
autotrack
autotracking
aXe
backticks
Expand All @@ -24,8 +27,8 @@ camelize
Chai
chainable
cheatsheet
Checkboxes
checkboxes
Checkboxes
coc-ember
CoffeeScript
ColorSafe
Expand All @@ -44,31 +47,37 @@ datepicker
de
debounce
declaratively
DefinitelyTyped
deps
draggable
dropdown
durations
dynamicness
EditorConfig
els-addon-docs
els-addon-typed-templates
enumerables
ember-a11y
ember-a11y-refocus
ember-a11y-testing
ember-cli-deprecation-workflow
ember-cli-cjs-transform
ember-cli-deprecation-workflow
ember-cli-document-title
ember-cli-head
ember-cli-htmlbars
ember-cli-netlify
ember-cli-mirage.
ember-cli-netlify
ember-cli-tutorial-style
ember-cli-typescript
ember-debug-handlers-polyfill
ember-fast-cli
ember-intl
EmberData
EmberObject
enumerables
erroring
Evented
facto
fallbacks
FastPass
favicon
Favicon
Expand All @@ -82,11 +91,10 @@ geocoding
getter
getters
Getters
GitLab
GIFs
globbing
GitLab
GlimmerX
*google
globbing
hackable
HammerJS
hardcode
Expand All @@ -95,25 +103,31 @@ Hm
Hoc
htmlbars
IE11
interop
interoperable
invocable
invoker
IndexedDB
Inflector
instantiation
Intellisense
IntelliSense
interop
integrations
interoperable
invokable
invokables
invoker
invoker
invokers
JetBrains
jquery-integration
JSDoc
keyCode
KVO
lang
linters
LSP
lookups
LSP
Mapbox
MDN
metaprogramming
misspelt
mixin
mixins
Expand All @@ -123,103 +137,111 @@ natively
nav
nav-bar
Neovim
*NPM
NVDA
nvim-treesitter
onboarding
Orca
page-crafter
parallelize
Param
param
params
Param
parameterizing
params
PascalCased
pipelining
PR
PRs
preload
prepend
prepended
pre-determined
pre-octane
pre-populating
pre-transition
pre-transition
preload
prepend
prepended
presentational
Presentational
pre-transition
pre-octane
PRs
readme
readonly
recognizers
recursing
Redux
relayout
renderer
repo
repos
rerender
rerenders
rerendering
rerenders
routable
RunDOC
Runnable
runnable
Runnable
runtime
sandboxed
scp
screencasting
selectable
self-referentiality
serverless
singularize
source-readibility
Splattributes
SSR
stateful
subclassed
subclasses
subclassing
subdomain
subexpression
substring
subfolders
suboptimal
subroutes
substate
substates
substring
SuperForm
superset
swappable
synergistically
syntaxes
swappable
tagless
TalkBack
teardown
template-lifecycle-dom-and-modifiers
templating
TextMate
todo
todos
treesitter
triple-backtick
tooltip
trackable
Trackable
Treeshaking
treesitter
triple-backtick
typeahead
typechecker
typings
UIs
URL-escaped
un-representable
unordered
unsilence
unstyled
untracked
untrusted
URL-escaped
usecase
v1
v2
viewport
vim-ember-hbs
vim-javascript
vim-js-pretty-template
VM
Voilà
voilà
VoiceOver
voilà
Voilà
vscode-glimmer-syntax
websocket
Websockets
ZEIT
yay
template-lifecycle-dom-and-modifiers
working-with-html-css-and-javascript
dropdown
yay
ZEIT
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20.11.0
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
/coverage/
!.*
.eslintcache
.lint-todo/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
7 changes: 5 additions & 2 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta property="og:image" content="https://blog.emberjs.com/images/logos/e-icon.png" />
<meta name="twitter:card" content="summary" />
Expand All @@ -13,7 +12,11 @@

<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/ember-guides.css">
<link rel="shortcut icon" href="/images/favicon.png" />

<link rel="apple-touch-icon" href="/favicons/apple-touch-icon.png">
<link rel="icon" href="/favicons/favicon.ico" sizes="any">
<link rel="icon" href="/favicons/icon.svg" type="image/svg+xml">
<link rel="manifest" href="/favicons/manifest.webmanifest">

{{content-for "head-footer"}}
</head>
Expand Down
Loading

0 comments on commit 605dd20

Please sign in to comment.