diff --git a/addons/api/package.json b/addons/api/package.json index 49b9a6ac8..bccc733a6 100644 --- a/addons/api/package.json +++ b/addons/api/package.json @@ -14,7 +14,7 @@ "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"", "lint:js": "eslint .", "lint:js:fix": "eslint . --fix", - "format": "yarn run format:js", + "format": "concurrently \"npm:format:*\" --names \"format:\"", "format:js": "prettier --write '{addon,app,config,stories,tests,mirage}/**/*.js' *.js", "start": "ember serve", "test": "ember exam --test-port 0 --split=4 --parallel=1 --random", diff --git a/addons/core/package.json b/addons/core/package.json index 896ab53be..a2cbe5129 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -21,7 +21,7 @@ "lint:hbs:fix": "ember-template-lint . --fix", "lint:js": "eslint .", "lint:js:fix": "eslint . --fix", - "format": "npm-run-all format:*", + "format": "concurrently \"npm:format:*\" --names \"format:\"", "format:js": "prettier --write '{addon,app,config,stories,tests}/**/*.js' *.js", "format:hbs": "prettier --write '{addon,app,tests}/**/*.hbs'", "start": "ember serve", diff --git a/addons/rose/.ember-cli b/addons/rose/.ember-cli index 4ccb4bf43..8c1812cff 100644 --- a/addons/rose/.ember-cli +++ b/addons/rose/.ember-cli @@ -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 } diff --git a/addons/rose/.eslintrc.js b/addons/rose/.eslintrc.js index 476b8408b..fb36fa0b9 100644 --- a/addons/rose/.eslintrc.js +++ b/addons/rose/.eslintrc.js @@ -9,12 +9,14 @@ module.exports = { root: true, parser: '@babel/eslint-parser', parserOptions: { - ecmaVersion: 2018, + ecmaVersion: 'latest', sourceType: 'module', // This is specific babel-config. If grows consider creating a babel config file requireConfigFile: false, babelOptions: { - plugins: [['@babel/plugin-proposal-decorators', { legacy: true }]], + plugins: [ + ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }], + ], }, // end of babel-config }, @@ -60,8 +62,7 @@ module.exports = { browser: false, node: true, }, - plugins: ['node'], - extends: ['plugin:node/recommended'], + extends: ['plugin:n/recommended'], }, { // Test files: diff --git a/addons/rose/.npmignore b/addons/rose/.npmignore index 38a2b0863..27849b170 100644 --- a/addons/rose/.npmignore +++ b/addons/rose/.npmignore @@ -18,6 +18,8 @@ /.gitignore /.prettierignore /.prettierrc.js +/.stylelintignore +/.stylelintrc.js /.template-lintrc.js /.travis.yml /.watchmanconfig diff --git a/addons/rose/.stylelintignore b/addons/rose/.stylelintignore new file mode 100644 index 000000000..a0cf71cbd --- /dev/null +++ b/addons/rose/.stylelintignore @@ -0,0 +1,8 @@ +# unconventional files +/blueprints/*/files/ + +# compiled output +/dist/ + +# addons +/.node_modules.ember-try/ diff --git a/addons/rose/.template-lintrc.js b/addons/rose/.template-lintrc.js index 0dfeeb665..c40cbddbc 100644 --- a/addons/rose/.template-lintrc.js +++ b/addons/rose/.template-lintrc.js @@ -31,5 +31,11 @@ module.exports = { 'no-passed-in-event-handlers': false, }, }, + { + files: '**/tests/**/*.{js,gts,gjs}', + rules: { + prettier: false, + }, + }, ], }; diff --git a/addons/rose/addon/components/rose/button/index.hbs b/addons/rose/addon/components/rose/button/index.hbs index 9d2a9ff9a..4980d2994 100644 --- a/addons/rose/addon/components/rose/button/index.hbs +++ b/addons/rose/addon/components/rose/button/index.hbs @@ -5,7 +5,7 @@