Skip to content

Commit

Permalink
Update docs app from v4.4.0...v4.12.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jrjohnson committed Sep 21, 2023
1 parent 799b31e commit 346b6dc
Show file tree
Hide file tree
Showing 12 changed files with 19,796 additions and 13,125 deletions.
32,769 changes: 19,713 additions & 13,056 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/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
}
20 changes: 9 additions & 11 deletions packages/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,13 +45,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
rules: {
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off',
},
extends: ['plugin:n/recommended'],
},
{
// test files
Expand Down
9 changes: 8 additions & 1 deletion packages/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/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/
8 changes: 8 additions & 0 deletions packages/docs/.stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
'use strict';

module.exports = {
extends: [
'stylelint-config-recommended-scss',
'stylelint-prettier/recommended',
],
};
18 changes: 9 additions & 9 deletions packages/docs/app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

body {
background-color: #f2f5f6;
font-family: 'Roboto', sans-serif;
font-family: "Roboto", sans-serif;
margin: 0;
}

Expand Down Expand Up @@ -59,7 +59,7 @@ h1 {

.chart {
margin: 1em;

.example {
border: 1px solid black;
}
Expand All @@ -68,19 +68,19 @@ h1 {
height: 25px;
width: 25px;
}

.medium-example {
height: 250px;
width: 250px;
}

.large-example {
height: 500px;
width: 500px;

@media only screen and (max-width: 900px) {
height: 250px;
width: 250px;
height: 250px;
width: 250px;
}
}
}
Expand All @@ -91,11 +91,11 @@ h1 {
margin-bottom: 2rem;

button {
padding: .5rem .25rem;
padding: 0.5rem 0.25rem;

&:disabled {
background-color: grey;
color: white;
}
}
}
}
2 changes: 1 addition & 1 deletion packages/docs/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "4.4.0",
"version": "4.12.2",
"blueprints": [
{
"name": "app",
Expand Down
7 changes: 2 additions & 5 deletions packages/docs/config/environment.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
'use strict';

module.exports = function (environment) {
let ENV = {
const ENV = {
modulePrefix: 'docs',
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
17 changes: 2 additions & 15 deletions packages/docs/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,10 @@
const EmberApp = require('ember-cli/lib/broccoli/ember-app');

module.exports = function (defaults) {
let app = new EmberApp(defaults, {
const app = new EmberApp(defaults, {
// Add options here
});

// 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.

app.import('node_modules/highlight.js/styles/a11y-dark.css');

return app.toTree();
};
59 changes: 34 additions & 25 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,63 +12,72 @@
},
"scripts": {
"build": "ember build --environment=production",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.scss\"",
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"test": "npm-run-all lint test:*",
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
"test:ember": "ember test"
},
"devDependencies": {
"@babel/eslint-parser": "^7.21.3",
"@babel/plugin-proposal-decorators": "^7.21.0",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.7.0",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^2.9.3",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@percy/cli": "^1.4.0",
"@percy/ember": "^4.0.0",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.4.1",
"ember-cli": "~4.4.0",
"concurrently": "^8.0.1",
"ember-auto-import": "^2.6.3",
"ember-cli": "~4.12.2",
"ember-cli-app-version": "^6.0.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-htmlbars": "^6.2.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "^11.0.1",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^8.1.1",
"ember-fetch": "^8.1.2",
"ember-load-initializers": "^2.1.2",
"ember-modifier": "^4.1.0",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-qunit": "^6.2.0",
"ember-resolver": "^10.0.0",
"ember-simple-charts": "^10.0.0",
"ember-source": "~4.4.0",
"ember-template-lint": "^4.8.0",
"ember-source": "~4.12.0",
"ember-template-lint": "^5.7.2",
"ember-truth-helpers": "^3.0.0",
"ember-welcome-page": "^7.0.1",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^10.6.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.2.0",
"eslint": "^8.37.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-ember": "^11.5.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.4",
"highlight.js": "^11.5.1",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.6.2",
"qunit": "^2.19.1",
"prettier": "^2.8.7",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"sass": "^1.53.0",
"webpack": "^5.74.0"
"stylelint": "^15.4.0",
"stylelint-config-recommended-scss": "^13.0.0",
"stylelint-prettier": "^3.0.0",
"stylelint-scss": "^5.2.1",
"tracked-built-ins": "^3.1.1",
"webpack": "^5.78.0"
},
"engines": {
"node": "16.* || >= 18",
"node": "14.* || 16.* || >= 18",
"npm": ">= 8"
},
"ember": {
Expand Down
Empty file removed packages/docs/vendor/.gitkeep
Empty file.

0 comments on commit 346b6dc

Please sign in to comment.