Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

run npx ember-cli-update --to=4.11.0 and drop support for Ember.js < 3.28 #2495

Merged
merged 11 commits into from
Sep 12, 2023
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: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/packages/ember-cli-mirage/"
directory: "/"
schedule:
interval: daily
8 changes: 3 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,13 @@ jobs:
fail-fast: false
matrix:
try-scenario:
- ember-lts-3.12
- ember-lts-3.16
- ember-lts-3.20
- ember-lts-3.24
- ember-lts-3.28
- ember-lts-4.4
- ember-lts-4.8
- ember-lts-4.12
- ember-release
- ember-beta
- ember-canary
- ember-classic
# - embroider-safe
# - embroider-optimized

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ If all tests pass, you should be all set. Checkout a new branch to start develop
* `ember serve`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
8 changes: 0 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,11 @@
},
"license": "MIT",
"author": "Sam Selikoff",
"workspaces": [
"packages/*",
"test-packages/*"
],
"scripts": {
"release": "release-it",
"test": "cd packages/ember-cli-mirage && pnpm run test:ember"
},
"overrides": {
"@embroider/core": "1.6.0",
"@embroider/macros": "1.6.0",
"@embroider/shared-internals": "1.6.0",
"@embroider/util": "1.6.0",
"ember-cli-babel": "7.26.11",
"colors": "1.4.0",
"favicons": "5.3.0"
Expand Down
8 changes: 7 additions & 1 deletion packages/ember-cli-mirage-docs/.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
}
15 changes: 9 additions & 6 deletions packages/ember-cli-mirage-docs/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

module.exports = {
root: true,
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 2018,
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
requireConfigFile: false,
babelOptions: {
plugins: [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
],
},
},
plugins: ['ember'],
Expand All @@ -26,6 +29,7 @@ module.exports = {
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./testem.js',
Expand All @@ -41,8 +45,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
extends: ['plugin:n/recommended'],
},
{
// test files
Expand Down
3 changes: 3 additions & 0 deletions packages/ember-cli-mirage-docs/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# broccoli-debug
/DEBUG/
9 changes: 8 additions & 1 deletion packages/ember-cli-mirage-docs/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
'use strict';

module.exports = {
singleQuote: true,
overrides: [
{
files: '*.{js,ts}',
options: {
singleQuote: true,
},
},
],
};
8 changes: 8 additions & 0 deletions packages/ember-cli-mirage-docs/.stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# unconventional files
/blueprints/*/files/

# compiled output
/dist/

# addons
/.node_modules.ember-try/
5 changes: 5 additions & 0 deletions packages/ember-cli-mirage-docs/.stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
};
6 changes: 3 additions & 3 deletions packages/ember-cli-mirage-docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ You will need the following things properly installed on your computer.

* [Git](https://git-scm.com/)
* [Node.js](https://nodejs.org/)
* [Yarn](https://yarnpkg.com/)
* [Ember CLI](https://ember-cli.com/)
* [pnpm](https://pnpm.io/)
* [Ember CLI](https://cli.emberjs.com/release/)
* [Google Chrome](https://google.com/chrome/)

## Installation
Expand Down Expand Up @@ -51,7 +51,7 @@ Specify what it takes to deploy your app.
## Further Reading / Useful Links

* [ember.js](https://emberjs.com/)
* [ember-cli](https://ember-cli.com/)
* [ember-cli](https://cli.emberjs.com/release/)
* Development Browser Extensions
* [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
1 change: 0 additions & 1 deletion packages/ember-cli-mirage-docs/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">
<title>Ember CLI Mirage</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
Expand Down
48 changes: 35 additions & 13 deletions packages/ember-cli-mirage-docs/app/styles/app.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable selector-class-pattern */
:root {
--brand-primary: #0e97ad;
}
Expand All @@ -8,17 +9,21 @@
max-width: 600px;
margin: 4rem auto;
}

.home__section {
margin-bottom: 2.5rem;
}

.home__lead {
margin-top: 0.5rem;
font-size: 18px;
line-height: 1.5;
}

.home__cta {
padding: 3rem 0;
}

.home__cta-link {
color: #22292f;
}
Expand All @@ -28,7 +33,8 @@
margin-top: 3rem;
margin-bottom: 3rem;
}
@media (min-width: 768px) {

@media (width >= 768px) {
.blog {
display: flex;
}
Expand All @@ -38,18 +44,21 @@
width: calc(((100% - 1400px) / 2) + 288px);
padding-left: calc((100% - 1400px) / 2);
}

.blog__content {
max-width: 869px;
padding-left: 1rem;
padding-right: 1rem;
}
@media (min-width: 768px) {

@media (width >= 768px) {
.blog__content {
padding-left: 2rem;
padding-right: 2rem;
}
}
@media (min-width: 992px) {

@media (width >= 992px) {
.blog__content {
padding-left: 5rem;
padding-right: 5rem;
Expand All @@ -58,7 +67,7 @@

.blog-index h1 {
margin-bottom: 1.5rem;
color: rgb(61, 72, 82);
color: rgb(61 72 82);
font-size: 2.25rem;
font-weight: 800;
line-height: 1.25;
Expand All @@ -72,41 +81,47 @@
.blog-index h2 {
line-height: 1.25;
}

.blog-index h2 a {
color: rgb(61, 72, 82);
color: rgb(61 72 82);
text-decoration: none;

/* font-weight: 800;
font-size: 28px; */
}

.blog-index h2 a:hover {
text-decoration: underline;
}

.blog-index p {
color: #8795A1;
color: #8795a1;
}

.blog-detail time,
.blog-index time {
color: #8795A1;
color: #8795a1;
text-transform: uppercase;
font-size: 14px;
font-weight: 500;
}

.blog-detail__back-link {
text-decoration: none;
color: #8795A1;
color: #8795a1;
display: block;
margin-bottom: 30px;
}

.blog-detail__back-link:hover {
color: rgb(61, 72, 82);
color: rgb(61 72 82);
}

.blog-detail__hr {
border-width: 1px;
margin: 3rem 0;
}

.blog-detail__comments {
margin-bottom: 6rem;
}
Expand All @@ -119,6 +134,7 @@
.blog-detail__comment-profile-link {
flex-shrink: 0;
}

.blog-detail__comment-avatar {
border-radius: 4px;
width: 48px;
Expand All @@ -129,27 +145,33 @@
.blog-detail__comment-body {
/* padding-lef */
}

.blog-detail__comment-info {
color: #8795A1;
color: #8795a1;
font-size: 14px;
}

.blog-detail__comment-permalink {
color: #8795A1;
color: #8795a1;
text-decoration: none;
}

.blog-detail__comment-permalink:hover {
color: #3d4852;
}

.blog-detail__username-link {
color: #3d4852;
font-weight: 600;
text-decoration: none;
}

.blog-detail__comments-github-byline {
margin-top: 2rem;
font-style: italic;
color: #8795A1;
color: #8795a1;
}

.blog-detail__comments-github-link {
color: #8795A1;
color: #8795a1;
}
1 change: 0 additions & 1 deletion packages/ember-cli-mirage-docs/config/addon-docs.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use strict';

// eslint-disable-next-line node/no-unpublished-require
const AddonDocsConfig = require('ember-cli-addon-docs/lib/config');

module.exports = class extends AddonDocsConfig {
Expand Down
7 changes: 4 additions & 3 deletions packages/ember-cli-mirage-docs/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
"packages": [
{
"name": "ember-cli",
"version": "4.1.1",
"version": "4.12.0",
"blueprints": [
{
"name": "app",
"outputRepo": "https://github.com/ember-cli/ember-new-output",
"codemodsSource": "ember-app-codemods-manifest@1",
"isBaseBlueprint": true,
"options": [
"--pnpm",
"--no-welcome"
"--ci-provider=github",
"--no-welcome",
"--pnpm"
]
}
]
Expand Down
7 changes: 2 additions & 5 deletions packages/ember-cli-mirage-docs/config/environment.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
'use strict';

module.exports = function (environment) {
let ENV = {
const ENV = {
modulePrefix: 'ember-cli-mirage-docs',
podModulePrefix: 'ember-cli-mirage-docs/pods',
environment,
rootURL: '/',
locationType: 'history',
EmberENV: {
EXTEND_PROTOTYPES: false,
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false,
},
},

APP: {
Expand Down
1 change: 0 additions & 1 deletion packages/ember-cli-mirage-docs/config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ const browsers = [

module.exports = {
browsers,
node: 'current',
};
Loading