Skip to content

Commit

Permalink
Merge 39bb847 into 2ac6b51
Browse files Browse the repository at this point in the history
  • Loading branch information
LautaroPetaccio committed Jan 19, 2024
2 parents 2ac6b51 + 39bb847 commit 972ef1d
Show file tree
Hide file tree
Showing 102 changed files with 15,666 additions and 23,618 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
working-directory: ./webapp
steps:
- uses: actions/checkout@master
- name: Use Node.js 16.x
- name: Use Node.js 18.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 18.x
- name: Install
run: npm ci --legacy-peer-deps
- name: Audit signatures
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Publish
uses: menduz/oddish-action@master
with:
cwd: ./webapp/build
cwd: ./webapp/dist
deterministic-snapshot: true
registry-url: "https://registry.npmjs.org"
access: public
Expand All @@ -55,6 +55,6 @@ jobs:
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
with:
sourcemaps: ${{ github.workspace }}/webapp/build
sourcemaps: ${{ github.workspace }}/webapp/dist
version: "${{ vars.SENTRY_RELEASE_PREFIX }}@${{ github.event.release.tag_name }}"
url_prefix: "~"
10 changes: 6 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ jobs:
working-directory: ./webapp
steps:
- uses: actions/checkout@master
- name: Use Node.js 16.x
uses: actions/setup-node@v1
- name: Use Node.js 18.x
uses: actions/setup-node@v4.0.1
with:
node-version: 16.x
node-version: 18.x
cache: "npm"
cache-dependency-path: webapp/package-lock.json
- name: Install
run: npm ci --legacy-peer-deps
run: npm install --legacy-peer-deps
- name: Test
run: npm run test:coverage
- name: report coverage
Expand Down
4 changes: 4 additions & 0 deletions webapp/.env.default
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
VITE_REACT_APP_DCL_DEFAULT_ENV=dev
GEN_STATIC_LOCAL=true
VITE_BASE_URL=/
VITE_REACT_APP_WEBSITE_VERSION="0.0.0-development"
3 changes: 0 additions & 3 deletions webapp/.env.example

This file was deleted.

37 changes: 0 additions & 37 deletions webapp/config-overrides.js

This file was deleted.

31 changes: 31 additions & 0 deletions webapp/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
<link
href="https://fonts.googleapis.com/css?family=Inconsolata&display=swap"
rel="stylesheet"
/>
<meta
name="viewport"
content="width=device-width,initial-scale=1,shrink-to-fit=no"
/>
<meta name="theme-color" content="#000000" />
<meta name="description" content="Decentraland - Marketplace" />
<link
rel="sitemap"
type="application/xml"
title="Sitemap"
href="/sitemap.xml"
/>
<link rel="manifest" href="/manifest.json" />
<title>Decentraland - Marketplace</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<script type="module" src="/src/node.ts"></script>
<script type="module" src="/src/index.tsx"></script>
</body>
</html>
32 changes: 32 additions & 0 deletions webapp/jest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/* eslint-disable */
import type { Config } from 'jest'

export default async (): Promise<Config> => {
return {
verbose: true,
testEnvironment: 'jsdom',
setupFiles: ['<rootDir>/src/tests/beforeSetupTests.ts'],
setupFilesAfterEnv: ['<rootDir>/src/tests/afterSetupTest.ts'],
transform: {
'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
'<rootDir>/src/tests/config/fileTransformer.cjs',
'^.+\\.(t|j)sx?$': [
'@swc/jest',
{
jsc: {
transform: {
react: {
runtime: 'automatic'
}
}
}
}
]
},
testRegex: '(/__tests__/.*|(\\.|/)(spec))\\.[jt]sx?$',
moduleNameMapper: {
'\\.(css|less)$': 'identity-obj-proxy'
},
transformIgnorePatterns: ['node_modules/?!@0xsquid|eccrypto|libsodium-wrappers-sumo']
}
}
Loading

0 comments on commit 972ef1d

Please sign in to comment.