Merge pull request #596 from simonihmig/align-blueprint

Align v2 addon boilerplate with latest blueprint
simonihmig · Nov 15, 2022 · 31adcb3 · 31adcb3
2 parents e6eaaaf + dc0b2e8
commit 31adcb3
Show file tree

Hide file tree

Showing 20 changed files with 463 additions and 258 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,80 +3,77 @@ name: CI
 on:
   push:
     branches:
+      - main
       - master
       - renovate/*
-    tags:
-      - '*'
-  pull_request:
-  schedule:
-    - cron:  '0 4 * * 5' # Fridays at 4am
+  pull_request: {}
+
+concurrency:
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
-    name: Tests
+    name: 'Tests'
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Setup node.js
+      - uses: actions/checkout@v3
+      - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14
-      - name: Install dependencies
-        uses: bahmutov/npm-install@v1
+          node-version: 14.x
+          cache: yarn
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
       - name: Lint
         run: yarn lint
-      - name: Test
+      - name: Run Tests
         run: yarn test
 
-# re-enable this when the socket.io issue has been resolved.
-# `bahmutov/npm-install` does not work with yarn resolutions here, as yarn is not used due to https://github.com/bahmutov/npm-install/issues/95
-#  test-no-lock:
-#    name: Floating Dependencies
-#    runs-on: ubuntu-latest
-#    needs:
-#      - test
-#    steps:
-#      - name: Checkout code
-#        uses: actions/checkout@v2
-#      - name: Setup node.js
-#        uses: actions/setup-node@v2
-#        with:
-#          node-version: 12
-#      - name: Install dependencies
-#        uses: bahmutov/npm-install@v1
-#        with:
-#          useLockFile: false
-#      - name: Test
-#        run: yarn test:ember
+  floating:
+    name: 'Floating Dependencies'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14.x
+          cache: yarn
+      - name: Install Dependencies
+        run: yarn install --no-lockfile
+      - name: Run Tests
+        run: yarn test
 
-  test-try:
-    name: Additional Tests
+  try-scenarios:
+    name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
-    needs:
-      - test
+    needs: 'test'
+
     strategy:
+      fail-fast: false
       matrix:
-        scenario:
+        try-scenario:
           - ember-lts-3.24
+          - ember-lts-3.28
+          - ember-lts-4.4
           - ember-release
           - ember-beta
           - ember-canary
-          - ember-default-with-jquery
           - ember-classic
           - embroider-safe
           - embroider-optimized
-      fail-fast: false
+
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Setup node.js
+      - uses: actions/checkout@v3
+      - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14
-      - name: Install dependencies
-        uses: bahmutov/npm-install@v1
-      - name: Test
-        run: yarn ember try:one ${{ matrix.scenario }}
+          node-version: 14.x
+          cache: yarn
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+      - name: Run Tests
+        run: yarn ember try:one ${{ matrix.try-scenario }}
         working-directory: test-app
diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json
@@ -0,0 +1,21 @@
+{
+  "schemaVersion": "1.0.0",
+  "packages": [
+    {
+      "name": "@embroider/addon-blueprint",
+      "version": "1.3.0",
+      "blueprints": [
+        {
+          "name": "@embroider/addon-blueprint",
+          "isBaseBlueprint": true,
+          "options": [
+            "--yarn",
+            "--ci-provider=github",
+            "--release-it",
+            "--typescript"
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/ember-stargate/.eslintignore b/ember-stargate/.eslintignore
@@ -1,22 +1,8 @@
 # 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
-/package.json.ember-try
diff --git a/ember-stargate/.eslintrc.js b/ember-stargate/.eslintrc.js
@@ -4,13 +4,9 @@ module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
   parserOptions: {
-    ecmaVersion: 2021,
-    sourceType: 'module',
-    ecmaFeatures: {
-      legacyDecorators: true,
-    },
+    ecmaVersion: 'latest',
   },
-  plugins: ['ember', '@typescript-eslint'],
+  plugins: ['ember'],
   extends: [
     'eslint:recommended',
     'plugin:ember/recommended',
@@ -39,7 +35,12 @@ module.exports = {
     },
     // node files
     {
-      files: ['.eslintrc.js', '.template-lintrc.js', 'addon-main.js'],
+      files: [
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.template-lintrc.js',
+        './addon-main.js',
+      ],
       parserOptions: {
         sourceType: 'script',
       },
@@ -50,10 +51,5 @@ module.exports = {
       plugins: ['node'],
       extends: ['plugin:node/recommended'],
     },
-    {
-      // Test files:
-      files: ['tests/**/*-test.{js,ts}'],
-      extends: ['plugin:qunit/recommended'],
-    },
   ],
 };
diff --git a/ember-stargate/.gitignore b/ember-stargate/.gitignore
@@ -0,0 +1,25 @@
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+dist/
+
+# dependencies
+node_modules/
+
+# misc
+/.env*
+/.pnp*
+/.pnpm-debug.log
+/.sass-cache
+.eslintcache
+/connect.lock
+/coverage/
+/libpeerconnection.log
+/npm-debug.log*
+/testem.log
+/yarn-error.log
+
+# ember-try
+/.node_modules.ember-try/
+/package.json.ember-try
+/yarn.lock.ember-try
diff --git a/ember-stargate/CHANGELOG.md b/ember-stargate/CHANGELOG.md
diff --git a/ember-stargate/LICENSE.md b/ember-stargate/LICENSE.md
@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) 2020
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.