diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index eeaf089ad0..b90bd66610 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -46,17 +46,22 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: 14 # Need for npm >=7.7 - cache: 'npm' + node-version: 18 + cache: 'pnpm' + + - name: Setup pnpm + uses: pnpm/action-setup@v3 # docs https://pnpm.io/continuous-integration#github-actions + with: + version: 9 # Optional: specify a pnpm version - name: Install dependencies - run: npm install + run: pnpm install - name: Install Playwright with deps - run: npx playwright install --with-deps + run: pnpx playwright install --with-deps - name: Run tests - run: npm run test:e2e + run: pnpm run test:e2e env: PLAYWRIGHT_TEST_BASE_URL: ${{ needs.test_setup.outputs.preview_url }} diff --git a/package.json b/package.json index b209932939..c9eefa2c6a 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,10 @@ "lerna": "^8.1.2", "pnpm": "^9.0.5" }, + "engineStrict": true, "engines": { - "node": "16.x || 17.x || 18.x" + "node": "18.x || 20.x || 22.x", + "pnpm": ">=9" }, "husky": { "hooks": { diff --git a/packages/webapp/.gitignore b/packages/webapp/.gitignore index e6ba4e32a0..0921e5077c 100644 --- a/packages/webapp/.gitignore +++ b/packages/webapp/.gitignore @@ -21,4 +21,4 @@ npm-debug.log* -dist \ No newline at end of file +dist diff --git a/packages/webapp/craco.config.js b/packages/webapp/craco.config.js deleted file mode 100644 index 4d444d0657..0000000000 --- a/packages/webapp/craco.config.js +++ /dev/null @@ -1,17 +0,0 @@ -const path = require('path'); - -module.exports = { - webpack: { - alias: { - '@': path.resolve(__dirname, 'src'), - }, - configure: { - resolve: { - fallback: { path: require.resolve('path-browserify') }, - }, - }, - }, - devServer: { - allowedHosts: process.env.GITPOD_HOST ? 'all' : 'auto' - }, -}; diff --git a/packages/webapp/public/index.html b/packages/webapp/index.html similarity index 82% rename from packages/webapp/public/index.html rename to packages/webapp/index.html index 1af330a075..f9c8d6824b 100644 --- a/packages/webapp/public/index.html +++ b/packages/webapp/index.html @@ -4,7 +4,7 @@ @@ -13,27 +13,29 @@ name="description" content="Bigcapital Financial Managment Software" /> - + - +