tilfinltd · tilfin · Oct 1, 2023 · Oct 1, 2023 · Oct 1, 2023 · Oct 1, 2023
diff --git a/bin/build.sh b/bin/build.sh
@@ -11,10 +11,10 @@ popup=dist/chrome/js/popup.js
 background=dist/chrome/js/background.js
 supporters=dist/chrome/js/supporters.js
 
-rollup src/options.js --file $options
-rollup src/popup.js --file $popup
-rollup src/background.js --file $background
-rollup src/supporters.js --file $supporters
+rollup src/js/options.js --file $options
+rollup src/js/popup.js --file $popup
+rollup src/js/background.js --file $background
+rollup src/js/supporters.js --file $supporters
 
 \cp -f $options    dist/firefox/js/options.js
 \cp -f $popup      dist/firefox/js/popup.js
@@ -26,9 +26,9 @@ jq -s '.[0] * .[1]' manifest.json manifest_firefox.json > dist/firefox/manifest.
 
 for brw in `ls dist`
 do
-  \cp src/content.js dist/$brw/js/
-  \cp src/attach_target.js dist/$brw/js/
-  \cp -r *.html dist/$brw/
+  \cp src/js/content.js dist/$brw/js/
+  \cp src/js/attach_target.js dist/$brw/js/
+  \cp -r src/*.html dist/$brw/
   \cp -r icons  dist/$brw/
 done
 echo "build done"
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "archive": "npm run build; ./bin/archive.sh",
     "build": "./bin/build.sh",
-    "test": "mocha --timeout 10000 test/lib/*.test.js",
+    "test": "mocha --timeout 10000 src/js/**/*.test.js",
     "test_ci": "",
     "coverage": "codecov"
   },

diff --git a/credits.html → src/credits.html b/credits.html → src/credits.html
diff --git a/src/attach_target.js → src/js/attach_target.js b/src/attach_target.js → src/js/attach_target.js
diff --git a/src/background.js → src/js/background.js b/src/background.js → src/js/background.js
diff --git a/src/content.js → src/js/content.js b/src/content.js → src/js/content.js
diff --git a/src/lib/auto_assume_last_role.js → src/js/lib/auto_assume_last_role.js b/src/lib/auto_assume_last_role.js → src/js/lib/auto_assume_last_role.js
diff --git a/src/lib/color_picker.js → src/js/lib/color_picker.js b/src/lib/color_picker.js → src/js/lib/color_picker.js
diff --git a/src/lib/content.js → src/js/lib/content.js b/src/lib/content.js → src/js/lib/content.js
diff --git a/src/lib/create_role_list_item.js → src/js/lib/create_role_list_item.js b/src/lib/create_role_list_item.js → src/js/lib/create_role_list_item.js
diff --git a/test/lib/create_role_list_item.test.js → src/js/lib/create_role_list_item.test.js b/test/lib/create_role_list_item.test.js → src/js/lib/create_role_list_item.test.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { JSDOM } from 'jsdom';
-import { createRoleListItem } from '../../src/lib/create_role_list_item.js';
+import { createRoleListItem } from './create_role_list_item.js';
 
 describe('createRoleListItem', () => {
   let window;

diff --git a/src/lib/data_profiles_splitter.js → src/js/lib/data_profiles_splitter.js b/src/lib/data_profiles_splitter.js → src/js/lib/data_profiles_splitter.js
diff --git a/test/lib/data_profiles_splitter.test.js → src/js/lib/data_profiles_splitter.test.js b/test/lib/data_profiles_splitter.test.js → src/js/lib/data_profiles_splitter.test.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai'
-import { DataProfilesSplitter } from '../../src/lib/data_profiles_splitter.js'
+import { DataProfilesSplitter } from './data_profiles_splitter.js'
 
 describe('DataProfilesSplitter', () => {
   const dps = new DataProfilesSplitter();

diff --git a/src/lib/load_aws_config.js → src/js/lib/load_aws_config.js b/src/lib/load_aws_config.js → src/js/lib/load_aws_config.js
diff --git a/test/lib/load_aws_config.test.js → src/js/lib/load_aws_config.test.js b/test/lib/load_aws_config.test.js → src/js/lib/load_aws_config.test.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai'
-import { loadAwsConfig } from '../../src/lib/load_aws_config.js'
+import { loadAwsConfig } from './load_aws_config.js'
 
 describe('loadAwsConfig', () => {
   describe('Simple Configuration', () => {

diff --git a/src/lib/lz-string.min.js → src/js/lib/lz-string.min.js b/src/lib/lz-string.min.js → src/js/lib/lz-string.min.js
diff --git a/src/lib/profile_set.js → src/js/lib/profile_set.js b/src/lib/profile_set.js → src/js/lib/profile_set.js
diff --git a/test/lib/profile_set.test.js → src/js/lib/profile_set.test.js b/test/lib/profile_set.test.js → src/js/lib/profile_set.test.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { createProfileSet } from '../../src/lib/profile_set.js';
+import { createProfileSet } from './profile_set.js';
 
 describe('createProfileSet', () => {
   describe('when userInfo is on logged-in', () => {

diff --git a/src/lib/set_icon.js → src/js/lib/set_icon.js b/src/lib/set_icon.js → src/js/lib/set_icon.js
diff --git a/src/lib/storage_repository.js → src/js/lib/storage_repository.js b/src/lib/storage_repository.js → src/js/lib/storage_repository.js
diff --git a/src/lib/verify_jwt.js → src/js/lib/verify_jwt.js b/src/lib/verify_jwt.js → src/js/lib/verify_jwt.js
diff --git a/src/options.js → src/js/options.js b/src/options.js → src/js/options.js
diff --git a/src/popup.js → src/js/popup.js b/src/popup.js → src/js/popup.js
diff --git a/src/supporters.js → src/js/supporters.js b/src/supporters.js → src/js/supporters.js
diff --git a/options.html → src/options.html b/options.html → src/options.html
diff --git a/popup.html → src/popup.html b/popup.html → src/popup.html
diff --git a/supporters.html → src/supporters.html b/supporters.html → src/supporters.html
diff --git a/updated.html → src/updated.html b/updated.html → src/updated.html