Skip to content

Commit

Permalink
Merge pull request #47 from soxhub/update-infra
Browse files Browse the repository at this point in the history
Update infra
  • Loading branch information
NullVoxPopuli authored Jun 12, 2023
2 parents feaf7f8 + daf51ac commit 6a9e175
Show file tree
Hide file tree
Showing 73 changed files with 1,821 additions and 1,886 deletions.
38 changes: 4 additions & 34 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 7
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 16.x
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- uses: wyvox/action@v1
- name: Lint
run: pnpm lint
- name: Run Tests
Expand All @@ -39,17 +28,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 7
- uses: actions/setup-node@v3
- uses: wyvox/action@v1
with:
node-version: 16.x
cache: pnpm
- name: Install Dependencies
run: pnpm install --no-lockfile
no-lockfile: true
- name: Run Tests
run: pnpm test

Expand All @@ -68,18 +49,7 @@ jobs:
- ember-beta

steps:
- uses: actions/checkout@v3
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 7
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 16.x
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- uses: wyvox/action@v1
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
working-directory: test-apps/embroider-app
10 changes: 1 addition & 9 deletions .github/workflows/fixture-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,5 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 7
- uses: actions/setup-node@v3
with:
node-version: 16.x
cache: pnpm
- run: pnpm install --frozen-lockfile
- uses: wyvox/action@v1
- run: pnpm test:fixture
6 changes: 3 additions & 3 deletions ember-scoped-css/.eslintignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# unconventional js
/blueprints/*/files/
blueprints/*/files/

# compiled output
/dist/
dist/

# misc
/coverage/
coverage/
33 changes: 9 additions & 24 deletions ember-scoped-css/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,37 +1,22 @@
'use strict';

const { configs } = require('@nullvoxpopuli/eslint-configs');

const nodeESM = configs.node();

// accommodates: JS, TS, App, Addon, and V2 Addon
module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2020,
sourceType: 'module',
ecmaFeatures: {
modules: true,
},
},
plugins: ['node'],
extends: [
'eslint:recommended',
'plugin:node/recommended-module'
],
env: {
browser: false,
node: true,
},
rules: {
},
overrides: [
...nodeESM.overrides,

{
files: [
'./test/**/*.js',
],
files: ['./test/**/*.js'],
env: {
mocha: true,
},
rules: {
'node/no-unpublished-import': 0,
}
},
},
],
};
8 changes: 8 additions & 0 deletions ember-scoped-css/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# unconventional js
blueprints/*/files/

# compiled output
dist/

# misc
coverage/
12 changes: 12 additions & 0 deletions ember-scoped-css/.prettierrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
'use strict';

module.exports = {
overrides: [
{
files: '*.{js,ts,cjs,mjs,mts,cts,gts.gjs}',
options: {
singleQuote: true,
},
},
],
};
6 changes: 3 additions & 3 deletions ember-scoped-css/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import appJsUnplugin from './src/app-js-unplugin.js';
import appCssUnplugin from './src/app-css-unplugin.js';
import appJsUnplugin from './src/app-js-unplugin.js';
import appScopedcssWebpack from './src/app-scopedcss-webpack.js';
import scopedCssUnplugin from './src/scoped-css-unplugin.js';

export {
scopedCssUnplugin,
appJsUnplugin,
appCssUnplugin,
appJsUnplugin,
appScopedcssWebpack,
scopedCssUnplugin,
};
Loading

0 comments on commit 6a9e175

Please sign in to comment.