Ember v3.28.0...v5.2.0 (#402)

html-next · Sep 11, 2023 · a52ab83 · a52ab83
1 parent fd92851
commit a52ab83
Show file tree

Hide file tree

Showing 70 changed files with 4,975 additions and 5,736 deletions.
diff --git a/.ember-cli b/.ember-cli
@@ -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
 }
diff --git a/.eslintignore b/.eslintignore
@@ -1,20 +1,15 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
 !.*
+.*/
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try
+
+.eslintrc.js
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,8 +1,15 @@
 module.exports = {
   root: true,
+  parser: '@babel/eslint-parser',
   parserOptions: {
-    ecmaVersion: 2018,
-    sourceType: 'module'
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+    requireConfigFile: false,
+    babelOptions: {
+      plugins: [
+        ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
+      ],
+    },
   },
   plugins: [
     'ember'
@@ -21,26 +28,27 @@ module.exports = {
   rules: {
     'quotes': ['error', 'single', { 'allowTemplateLiterals': true, 'avoidEscape': true }],
 
-    'ember/closure-actions': 'off'
+    'ember/closure-actions': 'off',
+    'ember/no-get': 'off',
+    'ember/no-classic-components': 'off',
+    'ember/require-tagless-components': 'off',
+    'ember/no-classic-classes': 'off',
+    'ember/no-actions-hash': 'off',
   },
   overrides: [
     // node files
     {
       files: [
-        '.eslintrc.js',
-        '.template-lintrc.js',
-        'ember-cli-build.js',
-        'index.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'tests/dummy/config/**/*.js'
-      ],
-      excludedFiles: [
-        'addon/**',
-        'addon-test-support/**',
-        'app/**',
-        'tests/dummy/app/**'
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.stylelintrc.js',
+        './.template-lintrc.js',
+        './ember-cli-build.js',
+        './index.js',
+        './testem.js',
+        './blueprints/*/index.js',
+        './config/**/*.js',
+        './tests/dummy/config/**/*.js',
       ],
       parserOptions: {
         sourceType: 'script'
@@ -49,10 +57,12 @@ module.exports = {
         browser: false,
         node: true
       },
-      plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
-      })
-    }
-  ]
+      extends: ['plugin:n/recommended'],
+    },
+    {
+      // test files
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended'],
+    },
+  ],
 };
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,75 +1,93 @@
-name: Vertical Collection CI
+name: CI
+
 on:
-  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
+  push:
+    branches:
+      - main
+      - master
+  pull_request: {}
+
+concurrency:
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
-    name: Run Tests
+    name: "Tests"
     runs-on: ubuntu-latest
     timeout-minutes: 12
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-
       - name: Use Volta
-        uses: volta-cli/action@v1
-
+        uses: volta-cli/action@v4
       - name: Node Modules Cache
         id: cache-npm
         uses: actions/cache@v3
         with:
           path: '**/node_modules'
           key: ci-yarn-${{ hashFiles('yarn.lock') }}
-
       - name: Install Dependencies
         if: steps.cache-npm.outputs.cache-hit != 'true'
         run: yarn install --frozen-lockfile
-
       - name: Lint
         run: yarn lint
-
       - name: Run Build
         run: . bin/restore-env.sh && yarn run ember build
-
       - name: Run Tests
         uses: nick-fields/retry@v2
         with:
           timeout_minutes: 2
           max_attempts: 5
           command: . bin/restore-env.sh && CI=true yarn run ember test --path=dist
 
-  test-ember-try:
-    name: Run Tests
+  floating:
+    name: "Floating Dependencies"
+    runs-on: ubuntu-latest
+    timeout-minutes: 12
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Volta
+        uses: volta-cli/action@v4
+      - name: Install Dependencies
+        run: yarn install --no-lockfile
+      - name: Run Build
+        run: yarn run ember build
+      - name: Run Tests
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 2
+          max_attempts: 5
+          command: CI=true yarn run ember test --path=dist
+
+  try-scenarios:
+    name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
     timeout-minutes: 12
 
     strategy:
       fail-fast: false
       matrix:
-        ember-version:
-          [
-            ember-lts-3.12,
-            ember-lts-3.16,
-            ember-lts-3.20,
-            ember-lts-3.28,
-            ember-lts-4.4,
-            ember-release,
-            ember-beta,
-            ember-canary,
-          ]
+        try-scenario:
+          - ember-lts-3.28
+          - ember-lts-4.4
+          - ember-lts-4.12
+          - ember-5.2
+          - ember-release
+          - ember-beta
+          - ember-canary
+          - embroider-safe
+          - embroider-optimized
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-
       - name: Use Volta
-        uses: volta-cli/action@v1
-
+        uses: volta-cli/action@v4
       - name: Stash yarn.lock for cache key
         run: cp yarn.lock __cache-key
-
       - name: Node Modules Cache
         id: cache-npm
         uses: actions/cache@v3
@@ -79,21 +97,17 @@ jobs:
             package.json
             yarn.lock
             __env
-          key: ci-yarn-v3-${{ matrix.ember-version }}-${{ hashFiles('config/ember-try.js', '__cache-key') }}
+          key: ci-yarn-v3-${{ matrix.try-scenario }}-${{ hashFiles('config/ember-try.js', '__cache-key') }}
           restore-keys: |
             ci-yarn-${{ hashFiles('yarn.lock') }}
-
       - name: Install Dependencies
         if: steps.cache-npm.outputs.cache-hit != 'true'
         run: yarn install --frozen-lockfile
-
       - name: Ember-Try Setup
         if: steps.cache-npm.outputs.cache-hit != 'true'
-        run: node_modules/.bin/ember try:one ${{ matrix.ember-version }} --skip-cleanup --- bin/stash-env.sh
-
+        run: node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup --- bin/stash-env.sh
       - name: Run Build
         run: . bin/restore-env.sh && yarn run ember build
-
       - name: Run Tests
         uses: nick-fields/retry@v2
         with:

diff --git a/.gitignore b/.gitignore
@@ -1,30 +1,30 @@
-# 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
+/yarn.lock.ember-try
+
+# broccoli-debug
+/DEBUG/
 
 # custom
 .idea/
 .DS_Store
+tests/dummy/app/snippets.js
diff --git a/.npmignore b/.npmignore
@@ -2,26 +2,23 @@
 /dist/
 /tmp/
 
-# dependencies
-/bower_components/
-
 # misc
-/.bowerrc
 /.editorconfig
 /.ember-cli
 /.env*
 /.eslintcache
 /.eslintignore
 /.eslintrc.js
 /.git/
+/.github/
 /.gitignore
 /.prettierignore
 /.prettierrc.js
+/.stylelintignore
+/.stylelintrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
-/bower.json
-/config/ember-try.js
 /CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
@@ -32,8 +29,10 @@
 
 # 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
 
 # custom
 .idea/
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,13 @@
+# unconventional js
+/blueprints/*/files/
+
+# compiled output
+/dist/
+
+# misc
+/coverage/
+!.*
+.*/
+
+# ember-try
+/.node_modules.ember-try/
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports = {
+  overrides: [
+    {
+      files: '*.{js,ts}',
+      options: {
+        singleQuote: true,
+      },
+    },
+  ],
+};
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,8 @@
+'use strict';
+
+module.exports = {
+  extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
+  rules: {
+    'selector-class-pattern': null,
+  }
+};
diff --git a/.watchmanconfig b/.watchmanconfig
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp", "dist"]
+  "ignore_dirs": ["dist"]
 }