Move to ember-cli@4.12

onechiporenko · Apr 27, 2023 · f82755d · f82755d
1 parent 5fd4d46
commit f82755d
Show file tree

Hide file tree

Showing 12 changed files with 1,707 additions and 577 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,10 +4,13 @@ module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
   parserOptions: {
-    ecmaVersion: 2018,
+    ecmaVersion: 'latest',
     sourceType: 'module',
-    ecmaFeatures: {
-      legacyDecorators: true,
+    requireConfigFile: false,
+    babelOptions: {
+      plugins: [
+        ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
+      ],
     },
   },
   plugins: ['ember', '@typescript-eslint'],
@@ -66,6 +69,7 @@ module.exports = {
       files: [
         './.eslintrc.js',
         './.prettierrc.js',
+        './.stylelintrc.js',
         './.template-lintrc.js',
         './ember-cli-build.js',
         './index.js',

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -73,9 +73,9 @@ jobs:
       fail-fast: false
       matrix:
         try-scenario:
-          - ember-lts-3.24
           - ember-lts-3.28
           - ember-lts-4.4
+          - ember-lts-4.8
           - ember-release
           - ember-beta
           - ember-canary

diff --git a/.npmignore b/.npmignore
@@ -18,6 +18,8 @@
 /.gitignore
 /.prettierignore
 /.prettierrc.js
+/.stylelintignore
+/.stylelintrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig

diff --git a/.stylelintignore b/.stylelintignore
@@ -0,0 +1,8 @@
+# unconventional files
+/blueprints/*/files/
+
+# compiled output
+/dist/
+
+# addons
+/.node_modules.ember-try/
diff --git a/.stylelintrc.js b/.stylelintrc.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
+};
diff --git a/package.json b/package.json
@@ -15,6 +15,8 @@
   "scripts": {
     "build": "ember build --environment=production",
     "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
+    "lint:css": "stylelint \"**/*.css\"",
+    "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",
@@ -46,6 +48,8 @@
     "fs-extra": "^10.0.0"
   },
   "devDependencies": {
+    "@babel/eslint-parser": "^7.21.3",
+    "@babel/plugin-proposal-decorators": "^7.21.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.0.1",
     "@ember/test-helpers": "^2.9.3",
@@ -76,9 +80,9 @@
     "@typescript-eslint/parser": "^5.7.0",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^7.6.0",
-    "ember-auto-import": "^2.6.1",
-    "ember-cli": "~4.11.0",
+    "concurrently": "^8.0.1",
+    "ember-auto-import": "^2.6.3",
+    "ember-cli": "~4.12.1",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-code-coverage": "^1.0.3",
     "ember-cli-dependency-checker": "^3.3.1",
@@ -91,30 +95,34 @@
     "ember-load-initializers": "^2.1.2",
     "ember-models-table": "^4.4.0",
     "ember-page-title": "^7.0.0",
+    "ember-power-select": "^7.0.0",
     "ember-qunit": "^6.2.0",
     "ember-resolver": "^10.0.0",
-    "ember-source": "~4.11.0",
+    "ember-source": "~4.12.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.6.0",
+    "ember-template-lint": "^5.7.2",
     "ember-try": "^2.0.0",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-ember": "^11.4.7",
-    "eslint-plugin-n": "^15.6.1",
+    "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",
     "lcov-result-merger": "^3.1.0",
     "loader.js": "^4.7.0",
     "mocha": "^10.0.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.8.4",
+    "prettier": "^2.8.7",
     "qunit": "^2.19.4",
     "qunit-dom": "^2.0.0",
     "sass": "^1.53.0",
+    "stylelint": "^15.4.0",
+    "stylelint-config-standard": "^32.0.0",
+    "stylelint-prettier": "^3.0.0",
     "typedoc": "^0.21.9",
     "typedoc-plugin-rename-defaults": "^0.3.0",
     "typescript": "^4.7.4",
-    "webpack": "^5.75.0"
+    "webpack": "^5.78.0"
   },
   "peerDependencies": {
     "ember-source": "^3.28.0 || ^4.0.0"

diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "4.11.0",
+      "version": "4.12.1",
       "blueprints": [
         {
           "name": "addon",

diff --git a/tests/dummy/config/ember-try.js b/tests/dummy/config/ember-try.js
@@ -8,29 +8,26 @@ module.exports = async function () {
     useYarn: true,
     scenarios: [
       {
-        name: 'ember-lts-3.24',
+        name: 'ember-lts-3.28',
         npm: {
           devDependencies: {
-            'ember-source': '~3.24.3',
-            'ember-cli-page-object':
-              'https://github.com/onechiporenko/ember-cli-page-object.git#master',
-            'ember-qunit': '~6.0.0',
+            'ember-source': '~3.28.0',
           },
         },
       },
       {
-        name: 'ember-lts-3.28',
+        name: 'ember-lts-4.4',
         npm: {
           devDependencies: {
-            'ember-source': '~3.28.0',
+            'ember-source': '~4.4.0',
           },
         },
       },
       {
-        name: 'ember-lts-4.4',
+        name: 'ember-lts-4.8',
         npm: {
           devDependencies: {
-            'ember-source': '~4.4.0',
+            'ember-source': '~4.8.0',
           },
         },
       },
@@ -58,24 +55,6 @@ module.exports = async function () {
           },
         },
       },
-      {
-        name: 'ember-classic',
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'application-template-wrapper': true,
-            'default-async-observers': false,
-            'template-only-glimmer-components': false,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            'ember-source': '~3.28.0',
-          },
-          ember: {
-            edition: 'classic',
-          },
-        },
-      },
       embroiderSafe(),
       embroiderOptimized(),
       {

diff --git a/vendor/ember-models-table-floating-filter/bs4.css b/vendor/ember-models-table-floating-filter/bs4.css
@@ -1,6 +1,7 @@
 .float-filter-dropdown-menu .checkbox-wrapper {
   margin-bottom: 0;
 }
+
 .float-filter-dropdown-menu .list-filter-options-wrapper {
   max-height: 160px;
   overflow-y: scroll;

diff --git a/vendor/ember-models-table-floating-filter/bs5.css b/vendor/ember-models-table-floating-filter/bs5.css
@@ -1,6 +1,7 @@
 .float-filter-dropdown-menu .checkbox-wrapper {
   margin-bottom: 0;
 }
+
 .float-filter-dropdown-menu .list-filter-options-wrapper {
   max-height: 160px;
   overflow-y: scroll;

diff --git a/vendor/ember-models-table-floating-filter/plain-html.css b/vendor/ember-models-table-floating-filter/plain-html.css
@@ -1,13 +1,16 @@
 .dropdown {
   float: left;
 }
+
 .dropdown.right {
   position: relative;
   float: right;
 }
+
 .dropdown.right .dropdown-menu {
   right: 0;
 }
+
 .dropdown:hover .dropdown-menu {
   display: block;
 }
@@ -16,24 +19,29 @@
   position: absolute;
   background-color: #f9f9f9;
   min-width: 160px;
-  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2);
+  box-shadow: 0 8px 16px 0 rgb(0 0 0 / 20%);
   z-index: 1;
   right: 0;
 }
+
 .float-filter-dropdown-menu form {
   padding: 12px 16px;
 }
+
 .float-filter-dropdown-menu form select, .float-filter-dropdown-menu form input {
   margin-bottom: 5px;
 }
-.float-filter-dropdown-menu form input[type=checkbox] {
+
+.float-filter-dropdown-menu form input[type="checkbox"] {
   width: auto;
 }
+
 .float-filter-dropdown-menu form .list-filter-options-wrapper {
   max-height: 160px;
   overflow-y: scroll;
   margin: 0 -16px 5px;
 }
+
 .float-filter-dropdown-menu form .list-filter-options-wrapper a {
   display: flex;
   float: none;
@@ -42,6 +50,7 @@
   text-decoration: none;
   text-align: left;
 }
+
 .float-filter-dropdown-menu form .list-filter-options-wrapper a:hover {
   background-color: #ddd;
 }