Skip to content
This repository was archived by the owner on Apr 17, 2023. It is now read-only.

fix usage as a commonjs module #41

Merged
wtrocki merged 1 commit into from
Jan 31, 2018
Merged

fix usage as a commonjs module #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ tmp/*
*.swp
.fhclocal/
dist/
libs/generated/lawnchair.js
test/sync/testServer
src/modules-cov/*
src-cov/*
Expand Down
22 changes: 2 additions & 20 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,12 @@ module.exports = function(grunt) {
}
},
concat: {
lawnchair: {

@evanshortiss evanshortiss Dec 13, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is no longer required thanks to browserify.

@wtrocki wtrocki Dec 13, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. This is just leftover from js-sdk. Sadly we need to still bundle lawnchair as source code weren't released for the last couple years and we made some fixes directly upstream to maintain it :)

src: [
"libs/lawnchair/lawnchair.js",
"libs/lawnchair/lawnchairWindowNameStorageAdapter.js",
"libs/lawnchair/lawnchairLocalStorageAdapter.js",
"libs/lawnchair/lawnchairWebkitSqlAdapter.js",
"libs/lawnchair/lawnchairIndexDbAdapter.js",
"libs/lawnchair/lawnchairHtml5FileSystem.js",
"libs/lawnchair/lawnchairMemoryAdapter.js"
],
dest: "libs/generated/lawnchair.js"
},
crypto: {
src:[
"libs/cryptojs/cryptojs-core.js",
"libs/cryptojs/cryptojs-enc-base64.js",

@evanshortiss evanshortiss Dec 13, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most of these were referenced but no longer exist.

"libs/cryptojs/cryptojs-cipher-core.js",
"libs/cryptojs/cryptojs-aes.js",
"libs/cryptojs/cryptojs-md5.js",
"libs/cryptojs/cryptojs-sha1.js",
"libs/cryptojs/cryptojs-x64-core.js",
"libs/cryptojs/cryptojs-sha256.js",
"libs/cryptojs/cryptojs-sha512.js",
"libs/cryptojs/cryptojs-sha3.js"
"libs/cryptojs/cryptojs-x64-core.js"
],
dest: "libs/generated/crypto.js"
}
Expand Down Expand Up @@ -144,7 +126,7 @@ module.exports = function(grunt) {
//run tests in phatomjs
grunt.registerTask('test', ['jshint:all', 'browserify:dist', 'browserify:require', 'browserify:test', 'connect:server', 'mocha_phantomjs:test']);

grunt.registerTask('concat-core-sdk', ['jshint', 'concat:lawnchair', 'concat:crypto', 'browserify:dist']);
grunt.registerTask('concat-core-sdk', ['jshint', 'concat:crypto', 'browserify:dist']);

grunt.registerTask('build', ['concat-core-sdk', 'uglify:dist']);

Expand Down
Loading