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

fix: try to make project build again #153

Draft
wants to merge 8 commits into
base: staging
Choose a base branch
from
Draft

fix: try to make project build again #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
312bceb
fix: dependency resolution issues
spectrachrome Jan 16, 2025
b3ba4b5
chore: add normal deps, create package lock
spectrachrome Jan 16, 2025
1eef1c5
fix: npm dependency resolution
spectrachrome Jan 17, 2025
f3524ee
fix: working state of dependency resolution
spectrachrome Jan 17, 2025
c7f9b31
fix: make this thing start again
spectrachrome Jan 17, 2025
e81a81f
fix: lots of import errors
spectrachrome Jan 17, 2025
1497a59
wip: more dependency adjustments
spectrachrome Jan 22, 2025
8aee06f
chore: revert back to backbone-amd
spectrachrome Jan 22, 2025
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
3 changes: 0 additions & 3 deletions .bowerrc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ node_modules
dist
.tmp
.sass-cache
app/bower_components
app/node_modules
106 changes: 55 additions & 51 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ module.exports = function (grunt) {
'<%= yeoman.app %>/*.html',
'{.tmp,<%= yeoman.app %>}/styles/{,*/}*.css',
'{.tmp,<%= yeoman.app %>}/scripts/**/*.js',
'node_modules/requirejs/require.js',
'<%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
'<%= yeoman.app %>/scripts/config.json',
'<%= yeoman.app %>/templates/{,*/}*.hbs',
Expand Down Expand Up @@ -109,6 +110,7 @@ module.exports = function (grunt) {
return [
lrSnippet,
proxySnippet,
mountFolder(connect, '.'),
mountFolder(connect, '.tmp'),
mountFolder(connect, yeomanConfig.app)
];
Expand Down Expand Up @@ -200,7 +202,7 @@ module.exports = function (grunt) {
imagesDir: '<%= yeoman.app %>/images',
javascriptsDir: '<%= yeoman.app %>/scripts',
fontsDir: '<%= yeoman.app %>/fonts',
importPath: '<%= yeoman.app %>/bower_components',
importPath: '<%= yeoman.app %>/../node_modules',
httpImagesPath: '/images',
httpGeneratedImagesPath: '/images/generated',
httpFontsPath: '/fonts',
Expand Down Expand Up @@ -333,51 +335,53 @@ module.exports = function (grunt) {
files: [
{
expand: true,
cwd: '<%= yeoman.app %>',
cwd: '.',
dest: '<%= yeoman.dist %>',
// If new bower components are installed they have to be added to this list
src: [
'bower_components/requirejs/require.js',
'bower_components/jquery/jquery.min.js',
'bower_components/jquery/jquery.min.map',
'bower_components/jquery-ui/ui/minified/jquery-ui.min.js',
"bower_components/jquery-ui/themes/smoothness/jquery-ui.min.css",
'bower_components/jquery-ui/ui/minified/jquery-ui.slider.min.js',
'bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.min.js',
'bower_components/backbone-amd/backbone-min.js',
'bower_components/backbone-amd/backbone-min.map',
'bower_components/underscore-amd/underscore-min.js',
'bower_components/d3/d3.min.js',
'bower_components/d3.TimeSlider/d3.timeslider.min.js',
'bower_components/FileSaver.js/FileSaver.js',
'bower_components/canvas-toBlob.js/canvas-toBlob.js',
'bower_components/Blob.js/Blob.js',
'bower_components/backbone.marionette/lib/core/amd/backbone.marionette.min.js',
'bower_components/backbone.wreqr/lib/amd/backbone.wreqr.min.js',
'bower_components/backbone.babysitter/lib/amd/backbone.babysitter.min.js',
'bower_components/requirejs-text/text.js',
'bower_components/require-handlebars-plugin/hbs/handlebars.js',
'bower_components/require-handlebars-plugin/hbs/i18nprecompile.js',
'bower_components/require-handlebars-plugin/hbs/json2.js',
'bower_components/require-handlebars-plugin/hbs/underscore.js',
'bower_components/require-handlebars-plugin/hbs.js',
'bower_components/backbone.marionette.handlebars/backbone.marionette.handlebars.min.js',
'bower_components/bootstrap/dist/*/*',
'bower_components/font-awesome/css/*',
'bower_components/lm.js/lm.js',
'bower_components/cesium/Build/Cesium/**',
'bower_components/papaparse/papaparse.min.js',
'bower_components/plotty/dist/plotty.min.js',
'bower_components/sumoselect/jquery.sumoselect.min.js',
'bower_components/w2ui/dist/w2ui-fields.min.js',
'bower_components/w2ui/src/w2popup.js',
'bower_components/w2ui/src/w2utils.js',
'bower_components/msgpack-lite/dist/msgpack.min.js',
'bower_components/graphly/dist/graphly.min.js',
'bower_components/filepond/dist/filepond.js',
'bower_components/anno.js/anno.js',
'bower_components/jquery-scrollintoview/jquery.scrollintoview.min.js',
'bower_components/expr-eval/index.js',
'node_modules/requirejs/require.js',
'node_modules/jquery/dist/jquery.min.js',
'node_modules/jquery/dist/jquery.min.map',
'node_modules/jquery-ui/dist/jquery-ui.min.js',
"node_modules/jquery-ui/dist/themes/smoothness/jquery-ui.min.css",
'node_modules/jquery-ui/ui/minified/jquery-ui.slider.min.js',
'node_modules/jqueryui-touch-punch/jquery.ui.touch-punch.min.js',
'node_modules/backbone/backbone-min.js',
'node_modules/backbone/backbone-min.map',
'node_modules/underscore-amd/underscore-min.js',
'node_modules/d3/d3.min.js',
'node_modules/d3.TimeSlider/d3.timeslider.min.js',
'node_modules/FileSaver.js/FileSaver.js',
'node_modules/canvas-toBlob.js/canvas-toBlob.js',
'node_modules/Blob.js/Blob.js',
'node_modules/backbone.marionette/lib/core/amd/backbone.marionette.min.js',
'node_modules/backbone.wreqr/lib/backbone.wreqr.min.js',
'node_modules/backbone.babysitter/lib/backbone.babysitter.min.js',
'node_modules/modernizr/src/Modernizr.js',
'node_modules/requirejs-text/text.js',
'node_modules/require-handlebars-plugin/hbs/handlebars.js',
'node_modules/require-handlebars-plugin/hbs/i18nprecompile.js',
'node_modules/require-handlebars-plugin/hbs/json2.js',
'node_modules/require-handlebars-plugin/hbs/underscore.js',
'node_modules/require-handlebars-plugin/hbs.js',
'node_modules/backbone.marionette.handlebars/backbone.marionette.handlebars.min.js',
'node_modules/bootstrap/dist/*/*',
'node_modules/font-awesome/css/*',
'node_modules/lm.js/lm.js',
'node_modules/cesium/Build/Cesium/**',
'node_modules/papaparse/papaparse.min.js',
'node_modules/requirejs/require.js',
'node_modules/plotty/dist/plotty.min.js',
'node_modules/sumoselect/jquery.sumoselect.min.js',
'node_modules/w2ui/dist/w2ui-fields.min.js',
'node_modules/w2ui/src/w2popup.js',
'node_modules/w2ui/src/w2utils.js',
'node_modules/msgpack-lite/dist/msgpack.min.js',
'node_modules/graphly/dist/graphly.min.js',
'node_modules/filepond/dist/filepond.js',
'node_modules/anno.js/anno.js',
'node_modules/jquery-scrollintoview/jquery.scrollintoview.min.js',
'node_modules/expr-eval/index.js',
'scripts/vendor/**',
]
},{
Expand All @@ -386,16 +390,16 @@ module.exports = function (grunt) {
cwd: '<%= yeoman.app %>',
dest: '<%= yeoman.dist %>/fonts/',
src: [
'bower_components/*/fonts/*',
'node_modules/*/fonts/*',
]
},{
expand: true,
flatten: true,
cwd: '<%= yeoman.app %>',
dest: '<%= yeoman.dist %>/images/',
src: [
'bower_components/*/images/*',
'bower_components/*/img/*',
'node_modules/*/images/*',
'node_modules/*/img/*',
]
},{
expand: true,
Expand Down Expand Up @@ -435,18 +439,18 @@ module.exports = function (grunt) {
cwd: '<%= yeoman.app %>',
dest: '<%= yeoman.dist %>/styles/images',
src: [
'bower_components/jquery-ui/themes/smoothness/images/*'
'node_modules/jquery-ui/themes/smoothness/images/*'
]
}]
}
},
replace: {
dist: {
src: [
'<%= yeoman.dist %>/bower_components/jquery/jquery.min.js',
'<%= yeoman.dist %>/bower_components/backbone-amd/backbone-min.js',
'<%= yeoman.dist %>/bower_components/require-handlebars-plugin/hbs.js',
'<%= yeoman.dist %>/bower_components/cesium/Build/Cesium/Cesium.js'
'<%= yeoman.dist %>/node_modules/jquery/jquery.min.js',
'<%= yeoman.dist %>/node_modules/backbone/backbone-min.js',
'<%= yeoman.dist %>/node_modules/require-handlebars-plugin/hbs.js',
'<%= yeoman.dist %>/node_modules/cesium/Build/Cesium/Cesium.js'
],
overwrite: true,
replacements: [
Expand Down
23 changes: 12 additions & 11 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
<meta name="viewport" content="width=device-width">
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
<!-- build:css({.tmp,app}) styles/main.css -->
<link rel="stylesheet" href="bower_components/w2ui/dist/w2ui.min.css">
<link rel="stylesheet" href="node_modules/w2ui/dist/w2ui-1.5.min.css">
<link rel="stylesheet" href="styles/main.css" />
<link rel="stylesheet" href="styles/bootstrap.icon-large.min.css" />
<link rel="stylesheet" href="bower_components/jquery-ui/themes/smoothness/jquery-ui.min.css" />
<link rel="stylesheet" href="bower_components/d3.TimeSlider/d3.timeslider.min.css" />
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" />
<link rel="stylesheet" href="bower_components/cesium/Build/Cesium/Widgets/widgets.css" />
<link rel="stylesheet" href="node_modules/jquery-ui/dist/themes/smoothness/jquery-ui.min.css" />
<link rel="stylesheet" href="node_modules/D3.TimeSlider/build/d3.timeslider.css" />
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.min.css" />
<link rel="stylesheet" href="node_modules/cesium/Build/Cesium/Widgets/widgets.css" />
<link rel="stylesheet" href="scripts/vendor/cesium_DrawHelper.css" />
<link rel="stylesheet" href="bower_components/filepond/dist/filepond.css" />
<link rel="stylesheet" href="bower_components/anno.js/anno.css" />
<link rel="stylesheet" href="node_modules/filepond/dist/filepond.css" />
<link rel="stylesheet" href="node_modules/anno.js/anno.css" />

<style type="text/css">
/*Overwrite default collapse size*/
Expand Down Expand Up @@ -70,7 +70,7 @@
<script type="text/javascript">

var CONFIG_URL = "scripts/config.json";
CESIUM_BASE_URL = "bower_components/cesium/Build/Cesium/";
CESIUM_BASE_URL = "node_modules/cesium/Build/Cesium/";
var require = {
baseUrl : "scripts/"
};
Expand All @@ -87,7 +87,8 @@
</script>

<!-- build:js scripts/vendor/modernizr.js -->
<script src="bower_components/modernizr/modernizr.js"></script>
<script src="node_modules/requirejs/require.js"></script>
<script src="node_modules/modernizr/src/Modernizr.js"></script>
<!-- endbuild -->
</head>
<body>
Expand Down Expand Up @@ -172,7 +173,7 @@
</script>

<!-- build:js init.js -->
<script src="bower_components/requirejs/require.js"></script>
<script src="node_modules/requirejs/require.js"></script>
<script src="scripts/init.js"></script>
<!-- endbuild -->

Expand Down
68 changes: 34 additions & 34 deletions app/scripts/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,62 +74,62 @@
},

paths: {
filepond: '../bower_components/filepond/dist/filepond',
msgpack: '../bower_components/msgpack-lite/dist/msgpack.min',
graphly: '../bower_components/graphly/dist/graphly.min',
cesium: "../bower_components/cesium/Build/Cesium/Cesium",
filepond: '../node_modules/filepond/dist/filepond',
msgpack: '../node_modules/msgpack-lite/dist/msgpack.min',
graphly: '../node_modules/graphly/dist/graphly.min',
cesium: "../node_modules/cesium/Build/Cesium/Cesium",
drawhelper: "../scripts/vendor/cesium_DrawHelper",
contrib: 'contrib',
core: 'core',
requirejs: '../bower_components/requirejs/require',
jquery: '../bower_components/jquery/jquery.min',
jqueryui: '../bower_components/jquery-ui/ui/minified/jquery-ui.min',
jqueryuitouch: '../bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.min',
backbone: '../bower_components/backbone-amd/backbone-min',
underscore: '../bower_components/underscore-amd/underscore-min',
d3: '../bower_components/d3/d3.min',
timeslider: '../bower_components/d3.TimeSlider/d3.timeslider.min',
requirejs: '../node_modules/requirejs/require',
jquery: '../node_modules/jquery/dist/jquery.min',
jqueryui: '../node_modules/jquery-ui/dist/jquery-ui.min',
jqueryuitouch: '../node_modules/jqueryui-touch-punch/jquery.ui.touch-punch.min',
backbone: '../node_modules/backbone/backbone-min',
underscore: '../node_modules/underscore-amd/underscore-min',
d3: '../node_modules/d3/d3.min',
timeslider: '../node_modules/d3.TimeSlider/d3.timeslider.min',

'canvas-toBlob': '../bower_components/canvas-toBlob.js/canvas-toBlob',
'Blob': '../bower_components/Blob.js/Blob',
'FileSaver': '../bower_components/FileSaver.js/FileSaver',
'canvas-toBlob': '../node_modules/canvas-toBlob.js/canvas-toBlob',
'Blob': '../node_modules/Blob.js/Blob',
'FileSaver': '../node_modules/FileSaver.js/FileSaver',

lm: '../bower_components/lm.js/lm',
lm: '../node_modules/lm.js/lm',

/* alias all marionette libs */
'backbone.marionette': '../bower_components/backbone.marionette/lib/core/amd/backbone.marionette.min',
'backbone.wreqr': '../bower_components/backbone.wreqr/lib/amd/backbone.wreqr.min',
'backbone.babysitter': '../bower_components/backbone.babysitter/lib/amd/backbone.babysitter.min',
'backbone.marionette': '../node_modules/backbone.marionette/lib/core/amd/backbone.marionette.min',
'backbone.wreqr': '../node_modules/backbone.wreqr/lib/backbone.wreqr.min',
'backbone.babysitter': '../node_modules/backbone.babysitter/lib/backbone.babysitter.min',

/* alias the bootstrap js lib */
bootstrap: '../bower_components/bootstrap/dist/js/bootstrap.min',
bootstrap: '../node_modules/bootstrap/dist/js/bootstrap.min',

/* Alias text.js for template loading and shortcut the templates dir to tmpl */
text: '../bower_components/requirejs-text/text',
text: '../node_modules/requirejs-text/text',
tmpl: "../templates",

/* handlebars from the require handlerbars plugin below */
handlebars: '../bower_components/require-handlebars-plugin/Handlebars',
handlebars: '../node_modules/require-handlebars-plugin/Handlebars',

/* require handlebars plugin - Alex Sexton */
i18nprecompile: '../bower_components/require-handlebars-plugin/hbs/i18nprecompile',
json2: '../bower_components/require-handlebars-plugin/hbs/json2',
hbs: '../bower_components/require-handlebars-plugin/hbs',
i18nprecompile: '../node_modules/require-handlebars-plugin/hbs/i18nprecompile',
json2: '../node_modules/require-handlebars-plugin/hbs/json2',
hbs: '../node_modules/require-handlebars-plugin/hbs',

/* marionette and handlebars plugin */
'marionette.handlebars': '../bower_components/backbone.marionette.handlebars/backbone.marionette.handlebars.min',
'marionette.handlebars': '../node_modules/backbone.marionette.handlebars/backbone.marionette.handlebars.min',

papaparse: '../bower_components/papaparse/papaparse.min',
papaparse: '../node_modules/papaparse/papaparse.min',

sumoselect: '../bower_components/sumoselect/jquery.sumoselect.min',
sumoselect: '../node_modules/sumoselect/jquery.sumoselect.min',

w2ui: '../bower_components/w2ui/dist/w2ui-fields.min',
w2popup: '../bower_components/w2ui/src/w2popup',
w2utils: '../bower_components/w2ui/src/w2utils',
w2ui: '../node_modules/w2ui/dist/w2ui-fields.min',
w2popup: '../node_modules/w2ui/src/w2popup',
w2utils: '../node_modules/w2ui/src/w2utils',

Anno: '../bower_components/anno.js/anno',
'jquery-scrollintoview': '../bower_components/jquery-scrollintoview/jquery.scrollintoview.min',
'expr-eval': '../bower_components/expr-eval/index'
Anno: '../node_modules/anno.js/anno',
'jquery-scrollintoview': '../node_modules/jquery-scrollintoview/jquery.scrollintoview.min',
'expr-eval': '../node_modules/expr-eval/index'
},

hbs: {
Expand Down
Loading