Merge pull request #102 from ember-learn/update-deps

Update to 5.10 and dependencies

.ember-cli

@@ -1,9 +1,7 @@
 {
   /**
-    Ember CLI sends analytics information by default. The data is completely
-    anonymous, but there are times when you might want to disable this behavior.
-
-    Setting `disableAnalytics` to true will prevent any data from being sent.
+    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.
   */
-  "disableAnalytics": false
+  "isTypeScriptProject": false
 }

.eslintignore

@@ -3,23 +3,21 @@
 /vendor/
 
 # compiled output
+/declarations/
 /dist/
 /tmp/
 
-# dependencies
-/bower_components/
-/node_modules/
-
 # misc
 /coverage/
 !.*
 .*/
 .eslintcache
 
+# dependencies
+/node_modules/
+
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try
 
 # ember-cli-mirage
 /mirage/

.eslintrc.js

@@ -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'],
@@ -26,6 +29,7 @@ module.exports = {
       files: [
         './.eslintrc.js',
         './.prettierrc.js',
+        './.stylelintrc.js',
         './.template-lintrc.js',
         './ember-cli-build.js',
         './testem.js',
@@ -41,16 +45,10 @@ 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:
+      // test files
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },

.github/.dependabot.yml

@@ -6,4 +6,4 @@ updates:
     directory: "/"
     # Check the npm registry for updates every week
     schedule:
-      interval: "weekly"
+      interval: "weekly"

.github/workflows/ci.yml

@@ -7,46 +7,36 @@ on:
   pull_request:
 
 env:
-  NODE_VERSION: 14
+  NODE_VERSION: 18
+
+concurrency:
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   lint:
-    name: Lint files
+    name: Lint files and dependencies
     runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:
-      - name: Check out a copy of the repo
-        uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
         with:
-          cache: 'yarn'
+          cache: 'pnpm'
           node-version: ${{ env.NODE_VERSION }}
+      - run: pnpm i --frozen-lockfile
+      - run: pnpm run lint
 
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Lint
-        run: yarn lint
-
-
-  run-tests:
-    name: Test Ember app
+  test-app:
+    name: Test app
     runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:
-      - name: Check out a copy of the repo
-        uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
         with:
-          cache: 'yarn'
+          cache: 'pnpm'
           node-version: ${{ env.NODE_VERSION }}
-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Test
-        run: yarn test
+      - run: pnpm install --frozen-lockfile

.gitignore

@@ -1,28 +1,25 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
 # compiled output
 /dist/
-/tmp/
+/declarations/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc
 /.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
 
 # Env files
 /.env
+/package-lock.json.ember-try
+
+# broccoli-debug
+/DEBUG/

.prettierignore

@@ -1,21 +1,13 @@
 # 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

.prettierrc.js

@@ -1,5 +1,12 @@
 'use strict';
 
 module.exports = {
-  singleQuote: true,
+  overrides: [
+    {
+      files: '*.{js,ts}',
+      options: {
+        singleQuote: true,
+      },
+    },
+  ],
 };

.stylelintignore

@@ -0,0 +1,8 @@
+# unconventional files
+/blueprints/*/files/
+
+# compiled output
+/dist/
+
+# addons
+/.node_modules.ember-try/

.stylelintrc.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
+};

.watchmanconfig

@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp", "dist"]
+  "ignore_dirs": ["dist"]
 }

README.md

@@ -8,67 +8,55 @@ This is an overview app of Ember-related Github activity used by the investigati
 
 You will need the following things properly installed on your computer.
 
-* [Git](https://git-scm.com/)
-* [Node.js](https://nodejs.org/) (with npm)
-* [Ember CLI](https://ember-cli.com/)
-* [Google Chrome](https://google.com/chrome/)
-
-## Installation
-
-This project uses `yarn` to manage npm packages. To check whether you have installed `yarn` already, run the following command in a terminal:
-
-```bash
-# Try running:
-yarn --version
-
-# Output may look something like:
-1.22.5
-```
-
-If you get an error message instead, please try [installing yarn](https://classic.yarnpkg.com/en/docs/install) to see if it fixes the error.
+- [Git](https://git-scm.com/)
+- [Node.js](https://nodejs.org/)
+- [PNPM](https://pnpm.io)
+- [Ember CLI](https://cli.emberjs.com/release/)
+- [Google Chrome](https://google.com/chrome/)
 
 ### Setup
 
 After forking this repo on GitHub, please try the following steps:
 
 - `git clone <your-forked-repository-url>`
 - `cd whats-new-in-emberland`
-- `yarn install`
+- `pnpm i`
 - You will need to [create a GitHub personal access token](https://github.com/settings/tokens). Each token that you create already comes with a suitable set of permissions to read public repos. This set of permissions is enough to run `whats-new-in-emberland`. There's no need for you to select additional permissions in the token generation wizard.
 - Create an `.env` file using the `.env-sample` included in the repo, then add your Github personal access token to the file.
 
 ## Running / Development
 
-* `ember serve`
-* Visit your app at [http://localhost:4200/](http://localhost:4200/).
-* Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
+- `pnpm start`
+- Visit your app at [http://localhost:4200](http://localhost:4200).
+- Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
 ### Code Generators
 
 Make use of the many generators for code, try `ember help generate` for more details
 
 ### Running Tests
 
-* `yarn test`
-* `yarn test --server`
+- `pnpm test`
+- `pnpm test:ember --server`
 
 ### Linting
 
-* `yarn lint`
-* `yarn lint:fix`
+- `pnpm lint`
+- `pnpm lint:fix`
 
 ### Building
 
-* `yarn build` (production)
+- `pnpm ember build` (development)
+- `pnpm build` (production)
 
 ### Deploying
 
 Specify what it takes to deploy your app.
 
 ## Further Reading / Useful Links
 
-* [ember.js](https://emberjs.com/)
-* [ember-cli](https://ember-cli.com/)
-* Development Browser Extensions
-  * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
-  * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
+- [ember.js](https://emberjs.com/)
+- [ember-cli](https://cli.emberjs.com/release/)
+- Development Browser Extensions
+  - [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
+  - [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

app/components/copy-me.hbs

@@ -2,11 +2,6 @@
   {{yield}}
 </span>
 
-<button
-  class="button is-small is-primary"
-  data-test-button="Copy to Clipboard"
-  type="button"
-  {{on "click" this.copyText}}
->
+<EsButton @type="button" @secondary={{true}} @onClicked={{this.copyText}} data-test-button="Copy to Clipboard">
   Copy to Clipboard
-</button>
+</EsButton>

app/components/search-form.hbs

@@ -15,11 +15,5 @@
     />
   </label>
 
-  <button
-    class="button"
-    data-test-button="Search"
-    type="submit"
-  >
-    Search
-  </button>
+  <EsButton @label="Search" data-test-button="Search" @type="submit"/>
 </form>

app/index.html

@@ -2,7 +2,6 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>What's New in Emberland</title>
     <meta name="description" content="Find who contributed to Ember repos for The Ember Times">
     <meta name="viewport" content="width=device-width, initial-scale=1">