diff --git a/.gitignore b/.gitignore index 59bc4656..dd9bc0be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ -# NPM and Yarn +# NPM / Yarn / Pnpm npm-debug.log yarn-error.log +pnpm-lock.yaml node_modules/ # Build artifacts and asset stuff @@ -50,4 +51,4 @@ DerivedData VendorLib/clang/lib/arc VendorLib/clang/lib/c++ -.idea \ No newline at end of file +.idea diff --git a/public/assets/favicon.ico b/assets/favicon.ico similarity index 100% rename from public/assets/favicon.ico rename to assets/favicon.ico diff --git a/public/assets/font/fontawesome-webfont.eot b/assets/font/fontawesome-webfont.eot similarity index 100% rename from public/assets/font/fontawesome-webfont.eot rename to assets/font/fontawesome-webfont.eot diff --git a/public/assets/font/fontawesome-webfont.svg b/assets/font/fontawesome-webfont.svg similarity index 100% rename from public/assets/font/fontawesome-webfont.svg rename to assets/font/fontawesome-webfont.svg diff --git a/public/assets/font/fontawesome-webfont.ttf b/assets/font/fontawesome-webfont.ttf similarity index 100% rename from public/assets/font/fontawesome-webfont.ttf rename to assets/font/fontawesome-webfont.ttf diff --git a/public/assets/font/fontawesome-webfont.woff b/assets/font/fontawesome-webfont.woff similarity index 100% rename from public/assets/font/fontawesome-webfont.woff rename to assets/font/fontawesome-webfont.woff diff --git a/public/assets/learnGitBranching.png b/assets/learnGitBranching.png similarity index 100% rename from public/assets/learnGitBranching.png rename to assets/learnGitBranching.png diff --git a/gulpfile.js b/gulpfile.js index 424f9c30..8cafb4cf 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -112,7 +112,7 @@ var buildIndex = function(done) { if (process.env.CI) { writeFileSync('build/index.html', outputIndex); - copyRecursiveSync('public/assets', 'build/assets'); + copyRecursiveSync('assets', 'build/assets'); } else { writeFileSync('index.html', outputIndex); } diff --git a/package.json b/package.json index 618925b2..a2e4f851 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "prompt": "^1.2.2", "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", - "vite": "^5.0.12" + "vite": "^4.0.12" }, "dependencies": { "backbone": "^1.4.0", @@ -50,5 +50,8 @@ "react": "^17.0.2", "react-dom": "^17.0.2", "underscore": "^1.13.2" + }, + "engines": { + "node": "16.20.2" } }