Skip to content

Commit

Permalink
Merge pull request #133 from miguelcobain/sync-test-app-blueprint
Browse files Browse the repository at this point in the history
Sync test app blueprint
  • Loading branch information
SergeAstapov committed Aug 8, 2023
2 parents 8bcfb2f + 08187e9 commit be6aebe
Show file tree
Hide file tree
Showing 46 changed files with 3,745 additions and 1,996 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,11 @@ jobs:
- 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: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
auto-install-peers=false
dedupe-peer-dependents=false
resolve-peers-from-workspace-root=false
4 changes: 2 additions & 2 deletions docs/.ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"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.
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
}
12 changes: 0 additions & 12 deletions docs/.eslintignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.*/
.eslintcache

# 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
13 changes: 6 additions & 7 deletions docs/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ module.exports = {
root: true,
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 2018,
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
},
requireConfigFile: false,
babelOptions: {
plugins: [['@babel/plugin-proposal-decorators', { legacy: true }]],
plugins: [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
],
},
},
plugins: ['ember'],
Expand All @@ -30,6 +29,7 @@ module.exports = {
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./testem.js',
Expand All @@ -45,8 +45,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
extends: ['plugin:n/recommended'],
},
{
// test files
Expand Down
9 changes: 1 addition & 8 deletions docs/.gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/declarations/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
14 changes: 1 addition & 13 deletions docs/.prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/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
9 changes: 8 additions & 1 deletion 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 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 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'],
};
2 changes: 1 addition & 1 deletion docs/.watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
2 changes: 1 addition & 1 deletion docs/app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>Ember CSS Transitions</title>
<title>Ember Css Transitions Docs</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">

Expand Down
40 changes: 26 additions & 14 deletions docs/app/styles/app.css
Original file line number Diff line number Diff line change
@@ -1,25 +1,35 @@
/* BEGIN-SNIPPET intro-example.css */
.fade-enter-active, .fade-leave-active {
transition: opacity .5s;
.fade-enter-active,
.fade-leave-active {
transition: opacity 0.5s;
}
.fade-enter, .fade-leave-to {

.fade-enter,
.fade-leave-to {
opacity: 0;
}

/* END-SNIPPET */

/* BEGIN-SNIPPET slide-fade.css */

/* Enter and leave animations can use different */

/* durations and timing functions. */
.slide-fade-enter-active {
transition: all .3s ease;
transition: all 0.3s ease;
}

.slide-fade-leave-active {
transition: all .8s cubic-bezier(1.0, 0.5, 0.8, 1.0);
transition: all 0.8s cubic-bezier(1, 0.5, 0.8, 1);
}
.slide-fade-enter, .slide-fade-leave-to {

.slide-fade-enter,
.slide-fade-leave-to {
transform: translateX(10px);
opacity: 0;
}

/* END-SNIPPET */

/* BEGIN-SNIPPET insert-destroy-verbose.css */
Expand All @@ -43,30 +53,31 @@
opacity: 100;
}

.max-h-12 {
.max-h-12 {
max-height: 3rem;
}

.max-h-0 {
.max-h-0 {
max-height: 0;
}

/* END-SNIPPET */

/* BEGIN-SNIPPET class-add-removal-verbose.css*/
/* BEGIN-SNIPPET class-add-removal-verbose.css */
.duration-1000 {
transition-duration: 1000ms;
}

.duration-200 {
transition-duration: 200ms
.duration-200 {
transition-duration: 200ms;
}

.text-red-600 {
.text-red-600 {
color: #e53e3e;
}

.text-black {
color: #000000;
.text-black {
color: #000;
}

.text-base {
Expand All @@ -76,4 +87,5 @@
.text-2xl {
font-size: 1.5rem;
}

/* END-SNIPPET */
1 change: 0 additions & 1 deletion docs/config/addon-docs.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable node/no-unpublished-require */
'use strict';

const AddonDocsConfig = require('ember-cli-addon-docs/lib/config');
Expand Down
7 changes: 4 additions & 3 deletions 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.8.0",
"version": "5.2.0-beta.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
2 changes: 1 addition & 1 deletion docs/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ module.exports = function (environment) {
environment,
rootURL: '/',
locationType: 'history',
historySupportMiddleware: true,
EmberENV: {
EXTEND_PROTOTYPES: false,
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
Expand Down
13 changes: 0 additions & 13 deletions docs/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,5 @@ module.exports = function (defaults) {
},
});

// Use `app.import` to add additional libraries to the generated
// output files.
//
// If you need to use different assets in different
// environments, specify an object as the first parameter. That
// object's keys should be the environment name and the values
// should be the asset to use in that environment.
//
// If the library that you are including contains AMD or ES6
// modules that you would like to import into your application
// please specify an object with the list of modules as keys
// along with the exports of each module as its value.

return app.toTree();
};
Loading

0 comments on commit be6aebe

Please sign in to comment.