From 6603ed7ddcd4c2e699c0e3a0c737f48b476f8986 Mon Sep 17 00:00:00 2001 From: Steve Gravrock Date: Fri, 3 Sep 2021 15:40:41 -0700 Subject: [PATCH] Don't distribute boot src files [#179017951] --- .github/CONTRIBUTING.md | 1 + grunt/config/compress.js | 2 +- grunt/config/concat.js | 6 +++--- spec/support/jasmine-browser.js | 3 ++- {lib/jasmine-core => src}/boot/boot0.js | 0 {lib/jasmine-core => src}/boot/boot1.js | 0 {lib/jasmine-core => src}/boot/node_boot.js | 0 7 files changed, 7 insertions(+), 5 deletions(-) rename {lib/jasmine-core => src}/boot/boot0.js (100%) rename {lib/jasmine-core => src}/boot/boot1.js (100%) rename {lib/jasmine-core => src}/boot/node_boot.js (100%) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 1210ec89..271dae5b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -38,6 +38,7 @@ Once you've pushed a feature branch to your forked repo, you're ready to open a * `/src` contains all of the source files * `/src/core` - generic source files * `/src/html` - browser-specific files + * `/src/boot` - sources for boot files (see below) * `/spec` contains all of the tests * mirrors the source directory * there are some additional files diff --git a/grunt/config/compress.js b/grunt/config/compress.js index d8905113..551b50b4 100644 --- a/grunt/config/compress.js +++ b/grunt/config/compress.js @@ -32,7 +32,7 @@ module.exports = { src: [ "boot0.js", "boot1.js" ], dest: standaloneLibDir, expand: true, - cwd: libJasmineCore("boot") + cwd: libJasmineCore("") }, { src: [ "SpecRunner.html" ], diff --git a/grunt/config/concat.js b/grunt/config/concat.js index 8c887a7d..23997b48 100644 --- a/grunt/config/concat.js +++ b/grunt/config/concat.js @@ -38,15 +38,15 @@ module.exports = { dest: 'lib/jasmine-core/jasmine.js' }, boot0: { - src: ['lib/jasmine-core/boot/boot0.js'], + src: ['src/boot/boot0.js'], dest: 'lib/jasmine-core/boot0.js' }, boot1: { - src: ['lib/jasmine-core/boot/boot1.js'], + src: ['src/boot/boot1.js'], dest: 'lib/jasmine-core/boot1.js' }, nodeBoot: { - src: ['lib/jasmine-core/boot/node_boot.js'], + src: ['src/boot/node_boot.js'], dest: 'lib/jasmine-core/node_boot.js' }, options: { diff --git a/spec/support/jasmine-browser.js b/spec/support/jasmine-browser.js index 1277d421..04950c16 100644 --- a/spec/support/jasmine-browser.js +++ b/spec/support/jasmine-browser.js @@ -12,7 +12,8 @@ module.exports = { 'core/Suite.js', 'core/**/*.js', 'html/**/*.js', - '**/*.js' + '**/*.js', + '!boot/**.js' ], specDir: 'spec', specFiles: ['**/*[Ss]pec.js', '!npmPackage/**/*'], diff --git a/lib/jasmine-core/boot/boot0.js b/src/boot/boot0.js similarity index 100% rename from lib/jasmine-core/boot/boot0.js rename to src/boot/boot0.js diff --git a/lib/jasmine-core/boot/boot1.js b/src/boot/boot1.js similarity index 100% rename from lib/jasmine-core/boot/boot1.js rename to src/boot/boot1.js diff --git a/lib/jasmine-core/boot/node_boot.js b/src/boot/node_boot.js similarity index 100% rename from lib/jasmine-core/boot/node_boot.js rename to src/boot/node_boot.js