Skip to content

Commit

Permalink
feat(app-shell): add temp user license agreement to app installer
Browse files Browse the repository at this point in the history
closes AUTH-534
  • Loading branch information
shlokamin committed Jun 27, 2024
1 parent 1ecc05b commit 7438afb
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions app-shell/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ clean:
.PHONY: lib
lib: export NODE_ENV := production
lib:
echo "Building app shell JS bundle (electron layer)"
vite build

.PHONY: deps
Expand Down
1 change: 1 addition & 0 deletions app-shell/build/license_en.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
we're open source yo
2 changes: 2 additions & 0 deletions app-shell/electron-builder.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,14 @@ module.exports = async () => ({
},
nsis: {
oneClick: false,
license: 'build/license_en.txt',
},
linux: {
target: ['AppImage'],
executableName: 'opentrons',
category: 'Science',
icon: project === 'robot-stack' ? 'build/icon.icns' : 'build/three.icns',
license: 'build/license_en.txt',
},
publish: publishConfig,
generateUpdatesFilesForAllChannels: true,
Expand Down
4 changes: 2 additions & 2 deletions app-shell/src/config/__tests__/migrate.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ describe('config migration', () => {
expect(result).toEqual(MOCK_CONFIG_V22)
})
it('should keep version 22', () => {
const v21Config = MOCK_CONFIG_V22
const result = migrate(v21Config)
const v22Config = MOCK_CONFIG_V22
const result = migrate(v22Config)

expect(result.version).toBe(NEWEST_VERSION)
expect(result).toEqual(MOCK_CONFIG_V22)
Expand Down
1 change: 1 addition & 0 deletions app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ clean:
.PHONY: dist
dist: export NODE_ENV := production
dist:
echo "Building app JS bundle (browser layer)"
vite build

# development
Expand Down

0 comments on commit 7438afb

Please sign in to comment.