Skip to content

Commit 9e5ae26

Browse files
committed
Merge branch 'vlascik-update-ember-to-4.9.3'
2 parents 87578aa + f02b984 commit 9e5ae26

File tree

15 files changed

+5153
-10404
lines changed

15 files changed

+5153
-10404
lines changed

frameworks/keyed/ember/.ember-cli

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
10+
/**
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13+
*/
14+
"isTypeScriptProject": false
915
}
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
pull_request: {}
9+
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
lint:
16+
name: "Lint"
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 10
19+
20+
steps:
21+
- uses: actions/checkout@v3
22+
- name: Install Node
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: 14.x
26+
cache: npm
27+
- name: Install Dependencies
28+
run: npm ci
29+
- name: Lint
30+
run: npm run lint
31+
32+
test:
33+
name: "Test"
34+
runs-on: ubuntu-latest
35+
timeout-minutes: 10
36+
37+
steps:
38+
- uses: actions/checkout@v3
39+
- name: Install Node
40+
uses: actions/setup-node@v3
41+
with:
42+
node-version: 14.x
43+
cache: npm
44+
- name: Install Dependencies
45+
run: npm ci
46+
- name: Run Tests
47+
run: npm test

frameworks/keyed/ember/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@
2727
/package.json.ember-try
2828
/package-lock.json.ember-try
2929
/yarn.lock.ember-try
30+
31+
# broccoli-debug
32+
/DEBUG/

frameworks/keyed/ember/README.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,51 @@ A short introduction of this app could easily go here.
77

88
You will need the following things properly installed on your computer.
99

10-
* [Git](https://git-scm.com/)
11-
* [Node.js](https://nodejs.org/)
12-
* [Yarn](https://yarnpkg.com/)
13-
* [Ember CLI](https://ember-cli.com/)
14-
* [Google Chrome](https://google.com/chrome/)
10+
- [Git](https://git-scm.com/)
11+
- [Node.js](https://nodejs.org/)
12+
- [Yarn](https://yarnpkg.com/)
13+
- [Ember CLI](https://ember-cli.com/)
14+
- [Google Chrome](https://google.com/chrome/)
1515

1616
## Installation
1717

18-
* `git clone <repository-url>` this repository
19-
* `cd ember-temp`
20-
* `yarn install`
18+
- `git clone <repository-url>` this repository
19+
- `cd ember-temp`
20+
- `yarn install`
2121

2222
## Running / Development
2323

24-
* `ember serve`
25-
* Visit your app at [http://localhost:4200](http://localhost:4200).
26-
* Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
24+
- `ember serve`
25+
- Visit your app at [http://localhost:4200](http://localhost:4200).
26+
- Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
2727

2828
### Code Generators
2929

3030
Make use of the many generators for code, try `ember help generate` for more details
3131

3232
### Running Tests
3333

34-
* `ember test`
35-
* `ember test --server`
34+
- `ember test`
35+
- `ember test --server`
3636

3737
### Linting
3838

39-
* `npm run lint`
40-
* `npm run lint:fix`
39+
- `npm run lint`
40+
- `npm run lint:fix`
4141

4242
### Building
4343

44-
* `ember build` (development)
45-
* `ember build --environment production` (production)
44+
- `ember build` (development)
45+
- `ember build --environment production` (production)
4646

4747
### Deploying
4848

4949
Specify what it takes to deploy your app.
5050

5151
## Further Reading / Useful Links
5252

53-
* [ember.js](https://emberjs.com/)
54-
* [ember-cli](https://ember-cli.com/)
55-
* Development Browser Extensions
56-
* [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
57-
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
53+
- [ember.js](https://emberjs.com/)
54+
- [ember-cli](https://cli.emberjs.com/release/)
55+
- Development Browser Extensions
56+
- [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
57+
- [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

frameworks/keyed/ember/app/components/my-table.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="jumbotron">
22
<div class="row">
33
<div class="col-md-6">
4-
<h1>Ember v3.27.3</h1>
4+
<h1>Ember v4.9.3</h1>
55
</div>
66
<div class="col-md-6">
77
<div class="row">

frameworks/keyed/ember/app/index.html

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html>
22
<html>
33
<head>
44
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<title>Ember v3.27.3</title>
5+
<title>Ember v4.9.3</title>
76
<meta name="description" content="">
87

98
{{content-for "head"}}
109

11-
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
12-
<link rel="stylesheet" href="{{rootURL}}assets/ember-temp.css">
10+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
11+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/ember-temp.css">
1312
<link rel="stylesheet" data-embroider-ignore href="/css/currentStyle.css">
1413

1514
{{content-for "head-footer"}}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import Resolver from 'ember-resolver';
2+
3+
export default Resolver;

frameworks/keyed/ember/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "4.1.1",
6+
"version": "4.9.2",
77
"blueprints": [
88
{
99
"name": "app",

frameworks/keyed/ember/config/environment.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
'use strict';
22

33
module.exports = function (environment) {
4-
let ENV = {
4+
const ENV = {
55
modulePrefix: 'ember-temp',
66
environment,
77
rootURL: '/frameworks/keyed/ember/dist/',
88
locationType: 'history',
99
EmberENV: {
10+
EXTEND_PROTOTYPES: false,
1011
FEATURES: {
1112
// Here you can enable experimental features on an ember canary build
1213
// e.g. 'with-controller': true
1314
// 'ember-glimmer-angle-bracket-invocation': true,
1415
// EMBER_GLIMMER_ANGLE_BRACKET_INVOCATION: true,
1516
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
1617
},
17-
EXTEND_PROTOTYPES: {
18-
// Prevent Ember Data from overriding Date.parse.
19-
Date: false,
20-
},
2118
},
2219

2320
APP: {

frameworks/keyed/ember/ember-cli-build.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
'use strict';
1+
'use strict';
22

33
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
44
const {Webpack} = require('@embroider/webpack');
55

66
module.exports = function (defaults) {
7-
let app = new EmberApp(defaults, {
7+
const app = new EmberApp(defaults, {
88
hinting: false,
99
'ember-cli-terser': {
1010
terser: {

0 commit comments

Comments
 (0)