-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #55 from chuckdumont/master
Upgrade to dojo-webpack-plugin 2.3.2 and Dojo 1.13.0
- Loading branch information
Showing
4 changed files
with
81 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,74 @@ | ||
| /* | ||
| * (C) Copyright IBM Corp. 2012, 2016 All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| var DojoWebpackPlugin = require("dojo-webpack-plugin"); | ||
| var CopyWebpackPlugin = require("copy-webpack-plugin"); | ||
| /* | ||
| * (C) Copyright IBM Corp. 2012, 2016 All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| var DojoWebpackPlugin = require("dojo-webpack-plugin"); | ||
| var CopyWebpackPlugin = require("copy-webpack-plugin"); | ||
|
|
||
| var path = require("path"); | ||
| var webpack = require("webpack"); | ||
|
|
||
| module.exports = { | ||
| context: __dirname, | ||
| entry: "js/bootstrap", | ||
| output: { | ||
| path: path.join(__dirname, "release"), | ||
| publicPath: "release/", | ||
| pathinfo: true, | ||
| filename: "bundle.js" | ||
| }, | ||
| module: { | ||
| loaders: [ | ||
| { test: /\.(png)|(gif)$/, loader: "url-loader?limit=100000" } | ||
| ] | ||
| }, | ||
| plugins: [ | ||
| new DojoWebpackPlugin({ | ||
| loaderConfig: require("./js/loaderConfig"), | ||
| environment: {dojoRoot: "release"}, // used at run time for non-packed resources (e.g. blank.gif) | ||
| buildEnvironment: {dojoRoot: "node_modules"}, // used at build time | ||
| locales: ["en"] | ||
| }), | ||
|
|
||
| // Copy non-packed resources needed by the app to the release directory | ||
| new CopyWebpackPlugin([{ | ||
| context: "node_modules", | ||
| from: "dojo/resources/blank.gif", | ||
| to: "dojo/resources" | ||
| }]), | ||
|
|
||
| // For plugins registered after the DojoAMDPlugin, data.request has been normalized and | ||
| // resolved to an absMid and loader-config maps and aliases have been applied | ||
| new webpack.NormalModuleReplacementPlugin(/^dojox\/gfx\/renderer!/, "dojox/gfx/canvas"), | ||
| new webpack.NormalModuleReplacementPlugin( | ||
| /^css!/, function(data) { | ||
| data.request = data.request.replace(/^css!/, "!style-loader!css-loader!less-loader!") | ||
| } | ||
| ), | ||
|
|
||
| var path = require("path"); | ||
| var webpack = require("webpack"); | ||
|
|
||
| module.exports = { | ||
| context: __dirname, | ||
| entry: "js/bootstrap", | ||
| output: { | ||
| path: path.join(__dirname, "release"), | ||
| publicPath: "release/", | ||
| pathinfo: true, | ||
| filename: "bundle.js" | ||
| }, | ||
| module: { | ||
| loaders: [ | ||
| { test: /\.(png)|(gif)$/, loader: "url-loader?limit=100000" } | ||
| ] | ||
| }, | ||
| plugins: [ | ||
| new DojoWebpackPlugin({ | ||
| loaderConfig: require("./js/loaderConfig"), | ||
| environment: {dojoRoot: "release"}, // used at run time for non-packed resources (e.g. blank.gif) | ||
| buildEnvironment: {dojoRoot: "node_modules"}, // used at build time | ||
| locales: ["en"] | ||
| }), | ||
|
|
||
| // Copy non-packed resources needed by the app to the release directory | ||
| new CopyWebpackPlugin([{ | ||
| context: "node_modules", | ||
| from: "dojo/resources/blank.gif", | ||
| to: "dojo/resources" | ||
| }]), | ||
|
|
||
| // For plugins registered after the DojoAMDPlugin, data.request has been normalized and | ||
| // resolved to an absMid and loader-config maps and aliases have been applied | ||
| new webpack.NormalModuleReplacementPlugin(/^dojox\/gfx\/renderer!/, "dojox/gfx/canvas"), | ||
| new webpack.NormalModuleReplacementPlugin( | ||
| /^css!/, function(data) { | ||
| data.request = data.request.replace(/^css!/, "!style-loader!css-loader!less-loader!") | ||
| } | ||
| ), | ||
|
|
||
| new webpack.optimize.UglifyJsPlugin({ | ||
| output: {comments: false}, | ||
| compress: {warnings: false}, | ||
| sourceMap: true | ||
| }) | ||
| ], | ||
| resolveLoader: { | ||
| modules: ["node_modules"] | ||
| }, | ||
| devtool: "#source-map", | ||
| node: { | ||
| process: false, | ||
| global: false | ||
| } | ||
| }; | ||
| new webpack.optimize.UglifyJsPlugin({ | ||
| output: {comments: false}, | ||
| compress: {warnings: false}, | ||
| sourceMap: true | ||
| }) | ||
| ], | ||
| resolveLoader: { | ||
| modules: ["node_modules"] | ||
| }, | ||
| devtool: "#source-map", | ||
| node: { | ||
| process: false, | ||
| global: false | ||
| } | ||
| }; |