Skip to content

Commit

Permalink
Merge pull request #41 from Gavant/addon-v2
Browse files Browse the repository at this point in the history
Work on v2 conversion
  • Loading branch information
bakerac4 authored Jul 11, 2022
2 parents 3ced29c + f9c3ca4 commit 88feac1
Show file tree
Hide file tree
Showing 84 changed files with 5,481 additions and 3,083 deletions.
50 changes: 25 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,47 +15,46 @@ jobs:
test:
name: 'Tests'
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
- uses: volta-cli/action@v1
with:
node-version: 14.x
cache: yarn
node-version: 16.x
yarn-version: 1.x
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Lint
run: yarn lint
run: yarn install --frozen-lockfile --non-interactive
- name: Lint Addon
run: yarn workspace @gavant/ember-floating-labels run lint
- name: Lint Test App
run: yarn workspace test-app run lint
- name: Run Tests
run: yarn test:ember
run: yarn workspace test-app run test

floating:
name: 'Floating Dependencies'
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: volta-cli/action@v1
with:
node-version: 14.x
cache: yarn
node-version: 16.x
yarn-version: 1.x
- name: Install Dependencies
run: yarn install --no-lockfile
run: yarn install --no-lockfile --non-interactive
- name: Run Tests
run: yarn test:ember
run: yarn workspace test-app run test

try-scenarios:
name: ${{ matrix.try-scenario }}
name: ${{ matrix.ember-try-scenario }}
runs-on: ubuntu-latest
needs: 'test'

strategy:
fail-fast: false
matrix:
try-scenario:
ember-try-scenario:
- ember-lts-3.24
- ember-lts-3.28
- ember-lts-4.0
- ember-release
- ember-beta
- ember-canary
Expand All @@ -65,12 +64,13 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
- uses: volta-cli/action@v1
with:
node-version: 14.x
cache: yarn
node-version: 16.x
yarn-version: 1.x
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
run: yarn install --frozen-lockfile --non-interactive
- name: Test
env:
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
run: yarn workspace test-app run ember try:one $EMBER_TRY_SCENARIO
37 changes: 17 additions & 20 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
dist/
tmp/
tsconfig.tsbuildinfo

# dependencies
/bower_components/
/node_modules/
node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log
.vscode
.env*
.pnp*
.sass-cache
.eslintcache
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
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
4 changes: 3 additions & 1 deletion .prettierrc → .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
'use strict';

module.exports = {
"arrowParens": "always",
"bracketSpacing": true,
"printWidth": 120,
Expand Down
16 changes: 0 additions & 16 deletions .release-it.json

This file was deleted.

3 changes: 0 additions & 3 deletions .watchmanconfig

This file was deleted.

1 change: 0 additions & 1 deletion app/components/fl-input.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/fl-select.js

This file was deleted.

1 change: 0 additions & 1 deletion app/components/fl-textarea.js

This file was deleted.

19 changes: 0 additions & 19 deletions config/release.js

This file was deleted.

25 changes: 0 additions & 25 deletions ember-cli-build.js

This file was deleted.

22 changes: 22 additions & 0 deletions floating-labels/.eslintignore
Original file line number Diff line number Diff line change
@@ -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
51 changes: 51 additions & 0 deletions floating-labels/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
'use strict';

module.exports = {
root: true,
parser: '@typescript-eslint/parser',
plugins: ['ember', '@typescript-eslint', 'prettier'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:@typescript-eslint/recommended',
'prettier',
'plugin:prettier/recommended'
],
env: {
browser: true
},

rules: {
'ember/no-jquery': 'error',
'@typescript-eslint/no-inferrable-types': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/no-empty-function': 'off',
'@typescript-eslint/no-empty-interface': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off'
},
overrides: [
// node files
{
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./addon-main.js',
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js'
],
parserOptions: {
sourceType: 'script'
},
env: {
browser: false,
node: true
},
plugins: ['node'],
extends: ['plugin:node/recommended']
}
]
};
File renamed without changes.
4 changes: 4 additions & 0 deletions floating-labels/addon-main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
'use strict';

const { addonV1Shim } = require('@embroider/addon-shim');
module.exports = addonV1Shim(__dirname);
12 changes: 12 additions & 0 deletions floating-labels/babel.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"plugins": [
["@babel/plugin-transform-typescript",
{
"allowDeclareFields": true
}],
"@embroider/addon-dev/template-colocation-plugin",
["@babel/plugin-proposal-decorators", { "legacy": true }],
"@babel/plugin-proposal-class-properties"
],
"presets": ["@babel/preset-typescript"]
}
File renamed without changes.
Loading

0 comments on commit 88feac1

Please sign in to comment.