Skip to content

Commit

Permalink
Revert "feat: Add support for Yarn only. (#1256)"
Browse files Browse the repository at this point in the history
This reverts commit 0721850.
  • Loading branch information
yamelsenih authored Oct 5, 2021
1 parent 0721850 commit 5cd33e4
Show file tree
Hide file tree
Showing 10 changed files with 20,048 additions and 1,033 deletions.
3 changes: 1 addition & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ A clear and concise description of what you expected to happen.
- Your OS:
- Web Browser:
- Node.js version:
- Yarn version:
- adempiere-vue version: <!-- 4.4.0. -->
- adempiere-vue version:

#### Additional context
Add any other context about the problem here.
10 changes: 5 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache: 'npm'

- name: Set tag version into config file
run: sed -i "s|releaseNoForDocumentation|${{ github.event.release.tag_name }}|g" config/default.json

- name: Install packages
run: yarn ci

run: npm ci
- name: Run test
run: npm test
- name: Compile dist
run: yarn build:prod
run: npm run build:prod --if-present

- name: Upload dist app
uses: actions/upload-artifact@v2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/push-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache: 'npm'

- name: Set tag version into config file
run: sed -i "s|releaseNoForDocumentation|${{ github.event.release.tag_name }}|g" config/default.json

- name: Install packages
run: yarn ci

run: npm ci
- name: Run test
run: npm test
- name: Compile dist
run: yarn build:prod
run: npm run build:prod --if-present

- name: Upload dist app
uses: actions/upload-artifact@v2
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,4 @@ config/certs/*.pem
.classpath
.project

.talismanrc

package-lock.json
.talismanrc
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

16 changes: 8 additions & 8 deletions README.es.md
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,10 @@ git clone -b develop [email protected]:adempiere/adempiere-vue.git
cd adempiere-vue

# instale las dependencias
yarn install
npm install

# corra el proyecto como desarrollador
yarn dev
npm run dev
```

Automáticamente se abrirá el siguiente enlace en su navegador http://localhost:9527
Expand All @@ -269,26 +269,26 @@ Automáticamente se abrirá el siguiente enlace en su navegador http://localhost

```bash
# Construcción para entornos de prueba
yarn build:stage
npm run build:stage

# Construcción para entornos de producción
yarn build:prod
npm run build:prod
```

## Avanzado

```bash
# Vista previa con efectos de entorno
yarn preview
npm run preview

# Vista previa con efectos + análisis de recursos estáticos
yarn preview --report
npm run preview -- --report

# Chequeo de formato de código
yarn lint
npm run lint

# Chequeo de formato de código y auto-corrección
yarn lint --fix
npm run lint -- --fix
```

Vaya a [Documentación](https://adempiere.github.io/adempiere-vue/es/guide/essentials/deploy.html#compilar) para mayor información.
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,10 @@ git clone -b develop [email protected]:adempiere/adempiere-vue-.git
cd adempiere-vue

# install dependency
yarn install
npm install

# develop
yarn dev
npm run dev
```

This will automatically open http://localhost:9527
Expand All @@ -287,26 +287,26 @@ This will automatically open http://localhost:9527

```bash
# build for test environment
yarn build:stage
npm run build:stage

# build for production environment
yarn build:prod
npm run build:prod
```

## Advanced

```bash
# preview the release environment effect
yarn preview
npm run preview

# preview the release environment effect + static resource analysis
yarn preview --report
npm run preview -- --report

# code format check
yarn lint
npm run lint

# code format check and auto fix
yarn lint --fix
npm run lint -- --fix
```

Refer to [Documentation](https://adempiere.github.io/adempiere-vue/guide/essentials/deploy.html#build) for more information
Expand Down
Loading

0 comments on commit 5cd33e4

Please sign in to comment.