Skip to content

Commit

Permalink
merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicole Greene committed Jul 24, 2024
2 parents 9ca460e + ef85be6 commit 63c414e
Show file tree
Hide file tree
Showing 9 changed files with 56,059 additions and 793 deletions.
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,6 @@ Open a third terminal and run
npm run start-local
```

Open your browser and navigate to http://localhost:3000/
Open your browser and navigate to http://localhost:3000/ to view the minified version of the app.

Navigate to http://localhost:3000/dev to view the unminified version of the app.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"scripts": {
"start-local": "node server/server.js",
"fe:css:build": "npx tailwindcss -i ./public/css/steerco-reporting.css -o ./public/dist/production.css --watch --minify",
"fe:js:build:dev": "BUILD_MINIFY=NO rollup -c -w --sourcemap",
"fe:js:build": "rollup -c -w --sourcemap",
"test": "./node_modules/.bin/vitest"
},
Expand Down
55,952 changes: 55,179 additions & 773 deletions public/dist/main.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion public/dist/main.js.map

Large diffs are not rendered by default.

848 changes: 848 additions & 0 deletions public/dist/main.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/dist/main.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/dist/production.css

Large diffs are not rendered by default.

39 changes: 23 additions & 16 deletions rollup.config.mjs
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
import terser from '@rollup/plugin-terser';
import del from 'rollup-plugin-delete';
import { nodeResolve } from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';


const minify = process.env.BUILD_MINIFY !== "NO" ? [terser()] : [];

// rollup.config.mjs
export default {
input: './public/main.js',
output: {
dir: './public/dist',
format: 'es',
plugins: minify
},
plugins: [
export default [
{
input: './public/main.js',
output: {
file: './public/dist/main.js',
format: 'esm'
},
plugins: [
nodeResolve(),
commonjs()
]
},
{
input: './public/main.js',
output: {
file: './public/dist/main.min.js',
format: 'esm'
},
plugins: [
nodeResolve(),
commonjs(),
del({ targets: './public/dist/*'})
]
};
terser()
]
}
];
4 changes: 4 additions & 0 deletions server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ app.get('/', (req, res) => {
res.send(makeIndex(req));
});

app.get('/dev', (req, res) => {
res.send(makeIndex(req, "./dist/main.js"));
});

app.get('/oauth-callback', (req, res) => {
res.send(makeOAuthCallback(req));
});
Expand Down

0 comments on commit 63c414e

Please sign in to comment.