Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename JS bundles to match corresponding source directory #633

Merged
merged 1 commit into from
Dec 19, 2017
Merged

Rename JS bundles to match corresponding source directory #633

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
4 changes: 2 additions & 2 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ var appBundles = [{
transforms: ['babel'],
},{
// The sidebar application for displaying and editing annotations.
name: 'app',
name: 'sidebar',
transforms: ['babel', 'coffee'],
entry: './src/sidebar/index',
},{
// The annotation layer which handles displaying highlights, presenting
// annotation tools on the page and instantiating the sidebar application.
name: 'injector',
name: 'annotator',
entry: './src/annotator/index',
transforms: ['babel', 'coffee'],
}];
Expand Down
4 changes: 2 additions & 2 deletions src/boot/boot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function bootHypothesisClient(doc, config) {
'scripts/jquery.bundle.js',

// Main entry point for the client
'scripts/injector.bundle.js',
'scripts/annotator.bundle.js',

'styles/icomoon.css',
'styles/annotator.css',
Expand All @@ -87,7 +87,7 @@ function bootSidebarApp(doc, config) {
'scripts/unorm.bundle.js',

// The sidebar app
'scripts/app.bundle.js',
'scripts/sidebar.bundle.js',

'styles/angular-csp.css',
'styles/angular-toastr.css',
Expand Down
8 changes: 4 additions & 4 deletions src/boot/test/boot-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('bootstrap', function () {
// Annotation layer
'scripts/polyfills.bundle.js',
'scripts/jquery.bundle.js',
'scripts/injector.bundle.js',
'scripts/annotator.bundle.js',
'styles/annotator.css',
'styles/icomoon.css',
'styles/pdfjs-overrides.css',
Expand All @@ -31,7 +31,7 @@ describe('bootstrap', function () {
'scripts/showdown.bundle.js',
'scripts/polyfills.bundle.js',
'scripts/unorm.bundle.js',
'scripts/app.bundle.js',
'scripts/sidebar.bundle.js',

'styles/angular-csp.css',
'styles/angular-toastr.css',
Expand Down Expand Up @@ -70,7 +70,7 @@ describe('bootstrap', function () {
it('loads assets for the annotation layer', function () {
runBoot();
var expectedAssets = [
'scripts/injector.bundle.1234.js',
'scripts/annotator.bundle.1234.js',
'scripts/jquery.bundle.1234.js',
'scripts/polyfills.bundle.1234.js',
'styles/annotator.1234.css',
Expand Down Expand Up @@ -119,11 +119,11 @@ describe('bootstrap', function () {
runBoot();
var expectedAssets = [
'scripts/angular.bundle.1234.js',
'scripts/app.bundle.1234.js',
'scripts/katex.bundle.1234.js',
'scripts/polyfills.bundle.1234.js',
'scripts/raven.bundle.1234.js',
'scripts/showdown.bundle.1234.js',
'scripts/sidebar.bundle.1234.js',
'scripts/unorm.bundle.1234.js',
'styles/angular-csp.1234.css',
'styles/angular-toastr.1234.css',
Expand Down