From 2c07bdfc4f7150418741687990e57965e248f277 Mon Sep 17 00:00:00 2001 From: Phillip Demro Date: Wed, 10 Jan 2018 18:36:45 -0500 Subject: [PATCH] updated for minimum build --- config/config.full.json | 54 +++++++++++++++++++++++++++++++++++++++++ config/config.json | 36 --------------------------- gulpfile.custom.js | 8 +++--- gulpfile.js | 8 ++++++ 4 files changed, 66 insertions(+), 40 deletions(-) create mode 100644 config/config.full.json diff --git a/config/config.full.json b/config/config.full.json new file mode 100644 index 0000000..1043c33 --- /dev/null +++ b/config/config.full.json @@ -0,0 +1,54 @@ +{ + "$schema": "https://dev.office.com/json-schemas/spfx-build/config.2.0.schema.json", + "version": "2.0", + "bundles": { + "hello-world-web-part": { + "components": [ + { + "entrypoint": "./lib/webparts/helloWorld/HelloWorldWebPart.js", + "manifest": "./src/webparts/helloWorld/HelloWorldWebPart.manifest.json" + } + ] + }, + "hello-world-2-web-part": { + "components": [ + { + "entrypoint": "./lib/webparts/helloWorld2/HelloWorld2WebPart.js", + "manifest": "./src/webparts/helloWorld2/HelloWorld2WebPart.manifest.json" + } + ] + }, + "hello-world-extension-application-customizer": { + "components": [ + { + "entrypoint": "./lib/extensions/helloWorldExtension/HelloWorldExtensionApplicationCustomizer.js", + "manifest": "./src/extensions/helloWorldExtension/HelloWorldExtensionApplicationCustomizer.manifest.json" + } + ] + }, + "hello-world-3-web-part": { + "components": [ + { + "entrypoint": "./lib/webparts/helloWorld3/HelloWorld3WebPart.js", + "manifest": "./src/webparts/helloWorld3/HelloWorld3WebPart.manifest.json" + } + ] + }, + "hello-world-2-extension-application-customizer": { + "components": [ + { + "entrypoint": "./lib/extensions/helloWorld2Extension/HelloWorld2ExtensionApplicationCustomizer.js", + "manifest": "./src/extensions/helloWorld2Extension/HelloWorld2ExtensionApplicationCustomizer.manifest.json" + } + ] + } + }, + "externals": {}, + "localizedResources": { + "HelloWorldWebPartStrings": "lib/webparts/helloWorld/loc/{locale}.js", + "HelloWorld2WebPartStrings": "lib/webparts/helloWorld2/loc/{locale}.js", + "HelloWorldExtensionApplicationCustomizerStrings": "lib/extensions/helloWorldExtension/loc/{locale}.js", + "HelloWorld3WebPartStrings": "lib/webparts/helloWorld3/loc/{locale}.js", + "HelloWorld2ExtensionApplicationCustomizerStrings": "lib/extensions/helloWorld2Extension/loc/{locale}.js" + } +} diff --git a/config/config.json b/config/config.json index 1043c33..02132c9 100644 --- a/config/config.json +++ b/config/config.json @@ -2,14 +2,6 @@ "$schema": "https://dev.office.com/json-schemas/spfx-build/config.2.0.schema.json", "version": "2.0", "bundles": { - "hello-world-web-part": { - "components": [ - { - "entrypoint": "./lib/webparts/helloWorld/HelloWorldWebPart.js", - "manifest": "./src/webparts/helloWorld/HelloWorldWebPart.manifest.json" - } - ] - }, "hello-world-2-web-part": { "components": [ { @@ -17,38 +9,10 @@ "manifest": "./src/webparts/helloWorld2/HelloWorld2WebPart.manifest.json" } ] - }, - "hello-world-extension-application-customizer": { - "components": [ - { - "entrypoint": "./lib/extensions/helloWorldExtension/HelloWorldExtensionApplicationCustomizer.js", - "manifest": "./src/extensions/helloWorldExtension/HelloWorldExtensionApplicationCustomizer.manifest.json" - } - ] - }, - "hello-world-3-web-part": { - "components": [ - { - "entrypoint": "./lib/webparts/helloWorld3/HelloWorld3WebPart.js", - "manifest": "./src/webparts/helloWorld3/HelloWorld3WebPart.manifest.json" - } - ] - }, - "hello-world-2-extension-application-customizer": { - "components": [ - { - "entrypoint": "./lib/extensions/helloWorld2Extension/HelloWorld2ExtensionApplicationCustomizer.js", - "manifest": "./src/extensions/helloWorld2Extension/HelloWorld2ExtensionApplicationCustomizer.manifest.json" - } - ] } }, "externals": {}, "localizedResources": { - "HelloWorldWebPartStrings": "lib/webparts/helloWorld/loc/{locale}.js", "HelloWorld2WebPartStrings": "lib/webparts/helloWorld2/loc/{locale}.js", - "HelloWorldExtensionApplicationCustomizerStrings": "lib/extensions/helloWorldExtension/loc/{locale}.js", - "HelloWorld3WebPartStrings": "lib/webparts/helloWorld3/loc/{locale}.js", - "HelloWorld2ExtensionApplicationCustomizerStrings": "lib/extensions/helloWorld2Extension/loc/{locale}.js" } } diff --git a/gulpfile.custom.js b/gulpfile.custom.js index 16fac8a..9396780 100644 --- a/gulpfile.custom.js +++ b/gulpfile.custom.js @@ -3,16 +3,16 @@ const build = require('@microsoft/sp-build-web'); build.tslint.enabled = false; build.tslint.mergeConfig({ sourceMatch: [ - "src/webparts//**/*.ts", - "src/webparts//**/*.tsx", + "src/**/helloWorld2/**/*.ts", + "src/**/helloWorld2/**/*.tsx", ] }); build.typescript.mergeConfig({ sourceMatch: [ //Your webpart files & supporting files - "src/**//**/*.ts", - "src/**//**/*.tsx", + "src/**/helloWorld2/**/*.ts", + "src/**/helloWorld2/**/*.tsx", //Default settings "typings/main/**/*.ts", "typings/main.d.ts", diff --git a/gulpfile.js b/gulpfile.js index 7958fd5..b48172b 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -4,4 +4,12 @@ const gulp = require('gulp'); const build = require('@microsoft/sp-build-web'); build.addSuppression(`Warning - [sass] The local CSS class 'ms-Grid' is not camelCase and will not be type-safe.`); +try { + require('./gulpfile.custom'); +} catch (e) { + if (e.code !== 'MODULE_NOT_FOUND') { + throw e; + } +} + build.initialize(gulp);