Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feat-ls-2155-indexer' into feat-…
Browse files Browse the repository at this point in the history
…ls-2155-indexer

# Conflicts:
#	package.json
  • Loading branch information
ildarH committed Aug 23, 2024
2 parents 7ad4ce8 + 2134ed5 commit c041876
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"scripts": {
"dev": "NODE_ENV=development vite --open --mode development",
"build": "rm -rf dist && vite build",
"build": "rm -rf dist && vite build --mode production",
"build:gh-pages": "rm -rf docs && vite build -c 'vite.github.config.js'",
"serve": "vite preview",
"build:serve": "yarn build && yarn serve",
Expand Down
5 changes: 1 addition & 4 deletions vite.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineConfig, loadEnv } from 'vite';
import { defineConfig } from 'vite';

import vue from '@vitejs/plugin-vue';
import { resolve } from 'path';
Expand All @@ -11,8 +11,6 @@ import dts from 'vite-plugin-dts';
import _package from './package.json';

const { version } = _package;
const NODE_ENV = process.env.NODE_ENV || 'development';
const env = loadEnv(NODE_ENV, process.cwd(), '');

export default defineConfig({
plugins: [
Expand Down Expand Up @@ -64,7 +62,6 @@ export default defineConfig({
'process.env.NODE_ENV': '"production"',
'process.env.VUE_APP_CORRECT_CHAIN': '"mainnet"',
'process.env.VERSION': `"${version}"`,
'process.env.VITE_APP_APTOS_NODE_API_TOKEN': `"${env.VITE_APP_APTOS_NODE_API_TOKEN}"`,
// For testnet environment:
// 'process.env.VUE_APP_MODULES_ACCOUNT': '"0x190d44266241744264b964a37b8f09863167a12d3e70cda39376cfb4e3561e12"',
// 'process.env.VUE_APP_MODULES_V05_ACCOUNT': '"0x45ef7a3a1221e7c10d190a550aa30fa5bc3208ed06ee3661ec0afa3d8b418580"',
Expand Down
6 changes: 1 addition & 5 deletions vite.github.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {defineConfig, loadEnv} from 'vite';
import { defineConfig } from 'vite';

import vue from '@vitejs/plugin-vue';

Expand All @@ -8,9 +8,6 @@ import svgLoader from 'vite-svg-loader';

import dts from 'vite-plugin-dts';

const NODE_ENV = process.env.NODE_ENV || 'development';
const env = loadEnv(NODE_ENV, process.cwd(), '');

export default defineConfig({
plugins: [
vue({
Expand Down Expand Up @@ -45,7 +42,6 @@ export default defineConfig({
define: {
'process.env.NODE_ENV': '"production"',
'process.env.VUE_APP_CORRECT_CHAIN': '"mainnet"',
'process.env.VITE_APP_APTOS_NODE_API_TOKEN': `"${env.VITE_APP_APTOS_NODE_API_TOKEN}"`,
},

base: '/liquidswap-widget/',
Expand Down

0 comments on commit c041876

Please sign in to comment.