Skip to content

Commit

Permalink
upgrade to ember-cli@3 latest / node 12.x+
Browse files Browse the repository at this point in the history
  • Loading branch information
pdud committed May 3, 2022
1 parent 8dc59b8 commit d6b1add
Show file tree
Hide file tree
Showing 41 changed files with 7,963 additions and 2,828 deletions.
1 change: 0 additions & 1 deletion .editorconfig
Expand Up @@ -4,7 +4,6 @@

root = true


[*]
end_of_line = lf
charset = utf-8
Expand Down
22 changes: 22 additions & 0 deletions .eslintignore
@@ -0,0 +1,22 @@
# 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
74 changes: 39 additions & 35 deletions .eslintrc.js
@@ -1,62 +1,66 @@
'use strict';

module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
},
},
plugins: [
'ember'
],
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true
},
rules: {
browser: true,
},
rules: {},
overrides: [
// node files
{
files: [
'ember-cli-build.js',
'index.js',
'testem.js',
'config/**/*.js',
'tests/dummy/config/**/*.js',
'./.eslintrc.js',
'./.prettierrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./index.js',
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./tests/dummy/config/**/*.js',
'node-tests/**/*.js',
'lib/**/*.js'
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
'lib/**/*.js',
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
},
env: {
browser: false,
node: true
node: true,
},
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
})
}, {
files: [
'node-tests/**/*.js'
],
extends: ['plugin:node/recommended'],
},
{
files: ['node-tests/**/*.js'],
env: {
node: true,
mocha: true
},
plugins: ['mocha'],
extends: ['plugin:mocha/recommended', 'plugin:node/recommended'],
rules: {
'node/no-unpublished-require': 'off'
}
}
]
'node/no-unpublished-require': 'off',
},
},
{
// Test files:
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
],
};
28 changes: 8 additions & 20 deletions .github/workflows/ci.yml
Expand Up @@ -9,7 +9,7 @@ on:
- '*'

env:
NODE_VERSION: '4.x'
NODE_VERSION: '12.x'

jobs:
lint:
Expand Down Expand Up @@ -42,24 +42,20 @@ jobs:
${{ runner.os }}-${{ env.NODE_VERSION }}-
- name: Install Dependencies
run: |
npm install --global yarn@1.12.3
yarn install --frozen-lockfile
run: yarn install --frozen-lockfile
if: |
steps.cache-dependencies.outputs.cache-hit != 'true'
- name: Lint
run: |
npm install --global yarn@1.12.3
yarn lint:js
run: yarn lint
test:
name: Tests
runs-on: ubuntu-latest
continue-on-error: true
needs: lint
strategy:
matrix:
node-version: [4.x, 6.x, 7.x]
node-version: [12.x, 14.x, 16.x]
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -86,15 +82,11 @@ jobs:
${{ runner.os }}-${{ matrix.node-version }}-
- name: Install Dependencies
run: |
npm install --global yarn@1.12.3
yarn install --frozen-lockfile
run: yarn install --frozen-lockfile
if: |
steps.cache-dependencies.outputs.cache-hit != 'true'
- name: Test
run: |
npm install --global yarn@1.12.3
yarn nodetest
run: yarn nodetest

test-floating:
name: Floating Dependencies
Expand All @@ -120,11 +112,7 @@ jobs:
\${{ runner.os }}-\${{ env.NODE_VERSION }}-
- name: Install Dependencies
run: |
npm install --global yarn@1.12.3
yarn install --no-lockfile --non-interactive
run: yarn install --no-lockfile --non-interactive

- name: Test
run: |
npm install --global yarn@1.12.3
yarn nodetest
run: yarn nodetest
25 changes: 14 additions & 11 deletions .gitignore
@@ -1,23 +1,26 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/dist/
/tmp/

# dependencies
/node_modules
/bower_components
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/*
/coverage/
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
32 changes: 0 additions & 32 deletions .jshintrc

This file was deleted.

51 changes: 33 additions & 18 deletions .npmignore
@@ -1,21 +1,36 @@
/bower_components
# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
/.eslintcache
/.eslintignore
/.eslintrc.js
/.git/
/.gitignore
/.prettierignore
/.prettierrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/dist
/tests
/tmp
**/.gitkeep
.bowerrc
.editorconfig
.ember-cli
.eslintrc.js
.gitignore
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
/tests/
/yarn-error.log
/yarn.lock
.gitkeep

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
21 changes: 21 additions & 0 deletions .prettierignore
@@ -0,0 +1,21 @@
# 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
5 changes: 5 additions & 0 deletions .prettierrc.js
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
singleQuote: true,
};
5 changes: 5 additions & 0 deletions .template-lintrc.js
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
extends: 'recommended',
};

0 comments on commit d6b1add

Please sign in to comment.